summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorErik Walthinsen <omega@temple-baptist.org>2001-01-02 08:13:34 +0000
committerErik Walthinsen <omega@temple-baptist.org>2001-01-02 08:13:34 +0000
commitae0d5d18890ec47120183145c0a04aaa9cfb6fb2 (patch)
treea5f3b5e79f2f0de3359ca77e20468ef6cb4704a1 /libs
parent18132480f4ddf69dc714b916e7879b59f86ed41d (diff)
Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which inv...
Original commit message from CVS: Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which involved fixing some of the plugins. The configure.in script was re-arranged and cleaned up so, and a check for libtool 1.3.5 was added to autogen.sh. Added checks for Gtk and GNOME. Some plugins were removed from the list of things to build for various reasons. Added GST_DEBUG_FORCE_DISABLE in gstgetbits, since that's time critical and even an if() from a DEBUG can significantly increase runtimes.
Diffstat (limited to 'libs')
-rw-r--r--libs/colorspace/gstcolorspace.h3
-rw-r--r--libs/colorspace/rgb2rgb.c6
-rw-r--r--libs/getbits/Makefile.am2
-rw-r--r--libs/getbits/gstgetbits.c2
-rw-r--r--libs/getbits/gstgetbits.h2
-rw-r--r--libs/getbits/gstgetbits_generic.c12
-rw-r--r--libs/idct/Makefile.am2
-rw-r--r--libs/riff/gstriffencode.c4
-rw-r--r--libs/riff/gstriffparse.c7
-rw-r--r--libs/videoscale/gstvideoscale.c8
10 files changed, 23 insertions, 25 deletions
diff --git a/libs/colorspace/gstcolorspace.h b/libs/colorspace/gstcolorspace.h
index b8b89a97cd..e5210df909 100644
--- a/libs/colorspace/gstcolorspace.h
+++ b/libs/colorspace/gstcolorspace.h
@@ -22,8 +22,7 @@
#define __GST_COLORSPACE_H__
#include <gdk/gdk.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstplugin.h>
+#include <gst/gst.h>
#include "yuv2rgb.h"
diff --git a/libs/colorspace/rgb2rgb.c b/libs/colorspace/rgb2rgb.c
index 2b853de8e7..43f06ce943 100644
--- a/libs/colorspace/rgb2rgb.c
+++ b/libs/colorspace/rgb2rgb.c
@@ -17,10 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
-//#define DEBUG_ENABLED
+#include <string.h>
-#include <gst/gst.h>
-#include <gstcolorspace.h>
+//#define DEBUG_ENABLED
+#include "gstcolorspace.h"
static void gst_colorspace_rgb_to_rgb_identity(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest);
static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest);
diff --git a/libs/getbits/Makefile.am b/libs/getbits/Makefile.am
index ad833e5cef..eaf6d675c2 100644
--- a/libs/getbits/Makefile.am
+++ b/libs/getbits/Makefile.am
@@ -16,7 +16,7 @@ libgstgetbitsinclude_HEADERS = gstgetbits.h
noinst_HEADERS = gstgetbits.h gstgetbits_inl.h
-bin_PROGRAMS = gbtest
+check_PROGRAMS = gbtest
gbtest_SOURCES = gbtest.c
gbtest_LDADD = libgstgetbits.la $(top_srcdir)/gst/libgst.la
diff --git a/libs/getbits/gstgetbits.c b/libs/getbits/gstgetbits.c
index e36c7bba6e..1a066875da 100644
--- a/libs/getbits/gstgetbits.c
+++ b/libs/getbits/gstgetbits.c
@@ -1,5 +1,3 @@
-#include <glib.h>
-
#include "gstgetbits.h"
/* Defined in gstgetbits_i386.s */
diff --git a/libs/getbits/gstgetbits.h b/libs/getbits/gstgetbits.h
index 96400adb57..7e56796c39 100644
--- a/libs/getbits/gstgetbits.h
+++ b/libs/getbits/gstgetbits.h
@@ -3,6 +3,8 @@
#include <stdio.h>
+// getbits is critical, we need to forcibly disable DEBUG
+#define GST_DEBUG_FORCE_DISABLE
#include <gst/gst.h>
/* disabled for now */
diff --git a/libs/getbits/gstgetbits_generic.c b/libs/getbits/gstgetbits_generic.c
index cfd7a5f787..4e39ad91f2 100644
--- a/libs/getbits/gstgetbits_generic.c
+++ b/libs/getbits/gstgetbits_generic.c
@@ -1,5 +1,3 @@
-#include <glib.h>
-
#include "gstgetbits.h"
unsigned long _gst_getbits_int_cb(gst_getbits_t *gb, unsigned long bits);
@@ -52,7 +50,7 @@ unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits) {
gb->ptr += (gb->bits>>3);
gb->bits &= 0x7;
- GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
+ GST_DEBUG (0,"getbits%ld, %08x\n", bits, rval);
return rval>>7;
}
@@ -70,7 +68,7 @@ unsigned long _gst_getbits_int(gst_getbits_t *gb, unsigned long bits) {
gb->ptr += (gb->bits>>3);
gb->bits &= 0x7;
- GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
+ GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval);
return rval;
}
@@ -86,7 +84,7 @@ unsigned long _gst_getbits_fast_int(gst_getbits_t *gb, unsigned long bits) {
gb->ptr += (gb->bits>>3);
gb->bits &= 0x7;
- GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
+ GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval);
return rval;
}
@@ -99,7 +97,7 @@ unsigned long _gst_showbits_int(gst_getbits_t *gb, unsigned long bits) {
rval <<= gb->bits;
rval >>= (32-bits);
- GST_DEBUG (0,"showbits%d, %08x\n", bits, rval);
+ GST_DEBUG (0,"showbits%ld, %08lx\n", bits, rval);
return rval;
}
@@ -107,7 +105,7 @@ void _gst_flushbits_int(gst_getbits_t *gb, unsigned long bits) {
gb->bits += bits;
gb->ptr += (gb->bits>>3);
gb->bits &= 0x7;
- GST_DEBUG (0,"flushbits%d\n", bits);
+ GST_DEBUG (0,"flushbits%ld\n", bits);
}
void _gst_getbits_back_int(gst_getbits_t *gb, unsigned long bits) {
diff --git a/libs/idct/Makefile.am b/libs/idct/Makefile.am
index f3fabc7867..afcc080905 100644
--- a/libs/idct/Makefile.am
+++ b/libs/idct/Makefile.am
@@ -19,7 +19,7 @@ libgstidct_la_SOURCES = \
libgstidctincludedir = $(includedir)/gst/libs/gstidct
libgstidctinclude_HEADERS = gstidct.h
-bin_PROGRAMS = ieeetest
+check_PROGRAMS = ieeetest
ieeetest_SOURCES = ieeetest.c
ieeetest_LDADD = libgstidct.la $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
diff --git a/libs/riff/gstriffencode.c b/libs/riff/gstriffencode.c
index d80a667713..425e85d28c 100644
--- a/libs/riff/gstriffencode.c
+++ b/libs/riff/gstriffencode.c
@@ -17,10 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#include <string.h>
//#define DEBUG_ENABLED
-#include <gst/gst.h>
-#include <gstriff.h>
+#include "gstriff.h"
#define GST_RIFF_ENCODER_BUF_SIZE 1024
diff --git a/libs/riff/gstriffparse.c b/libs/riff/gstriffparse.c
index 3f70e3215c..50a264295e 100644
--- a/libs/riff/gstriffparse.c
+++ b/libs/riff/gstriffparse.c
@@ -17,8 +17,9 @@
* Boston, MA 02111-1307, USA.
*/
+#include <string.h>
+
//#define DEBUG_ENABLED
-#include <gst/gst.h>
#include <gstriff.h>
GstRiff*
@@ -124,7 +125,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
if (riff->nextlikely & 0x01) riff->nextlikely++;
- GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08x\n",riff->nextlikely, last, off);
+ GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx\n",riff->nextlikely, last, off);
/* loop while the next likely chunk header is in this buffer */
while ((riff->nextlikely+12) <= last) {
gulong *words = (gulong *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off );
@@ -198,7 +199,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
}
if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) {
guint left = last - riff->nextlikely;
- GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08x\n",riff->nextlikely,
+ GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx\n",riff->nextlikely,
last, left, off);
riff->dataleft = g_malloc(left);
diff --git a/libs/videoscale/gstvideoscale.c b/libs/videoscale/gstvideoscale.c
index beaa281426..8ec43fa4ee 100644
--- a/libs/videoscale/gstvideoscale.c
+++ b/libs/videoscale/gstvideoscale.c
@@ -18,11 +18,11 @@
*/
//#define DEBUG_ENABLED
+#include <stdlib.h>
#include <math.h>
-#include <gst/gst.h>
-
-#include <gstvideoscale.h>
+#include "gstvideoscale.h"
+//FIXME
#include <gst/meta/videoraw.h>
static void gst_videoscale_scale_yuv(GstVideoScale *scale, unsigned char *src, unsigned char *dest);
@@ -281,7 +281,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int
pos += inc;
}
*eip++ = RETURN;
- GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, eip-copy_row);
+ GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, (void*)(eip-copy_row));
}