Updated libraries to use new GST_DEBUG instead of DEBUG.

Original commit message from CVS:
Updated libraries to use new GST_DEBUG instead of DEBUG.

diff --git a/libs/colorspace/gstcolorspace.c b/libs/colorspace/gstcolorspace.c
index c8056f6..e36ae37 100644 (file)
--- a/libs/colorspace/gstcolorspace.c
+++ b/libs/colorspace/gstcolorspace.c
@@ -46,7 +46,7 @@ GstColorSpaceConverter *gst_colorspace_converter_new(gint width, gint height, Gs
   new->color_tables = NULL;
   new->convert = NULL;
 
-  DEBUG("gst_colorspace: new\n");
+  GST_DEBUG (0,"gst_colorspace: new\n");
   if (GST_COLORSPACE_IS_RGB_TYPE(srcspace)) {
     if (GST_COLORSPACE_IS_RGB_TYPE(destspace)) {
       new->convert =  gst_colorspace_rgb2rgb_get_converter(new, srcspace, destspace);

diff --git a/libs/colorspace/rgb2rgb.c b/libs/colorspace/rgb2rgb.c
index c8a10b2..2b853de 100644 (file)
--- a/libs/colorspace/rgb2rgb.c
+++ b/libs/colorspace/rgb2rgb.c
@@ -110,7 +110,7 @@ static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigne
   gint size;
   gchar temp;
 
-  DEBUG("gst_colorspace_rgb24_to_bgr24 %p %p %d\n", src, dest, space->outsize);
+  GST_DEBUG (0,"gst_colorspace_rgb24_to_bgr24 %p %p %d\n", src, dest, space->outsize);
 
   size = space->outsize/3;
 
@@ -130,7 +130,7 @@ static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigne
       src+=3;
     }
   }
-  DEBUG("gst_colorspace_rgb24_to_bgr24 end\n");
+  GST_DEBUG (0,"gst_colorspace_rgb24_to_bgr24 end\n");
 }
 
 static void gst_colorspace_rgb32_to_bgr32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
@@ -138,7 +138,7 @@ static void gst_colorspace_rgb32_to_bgr32(GstColorSpaceConverter *space, unsigne
   gint size;
   gchar temp;
 
-  DEBUG("gst_colorspace_rgb32_to_bgr32 %p %p %d\n", src, dest, space->outsize);
+  GST_DEBUG (0,"gst_colorspace_rgb32_to_bgr32 %p %p %d\n", src, dest, space->outsize);
 
   size = space->outsize/4;
 
@@ -159,7 +159,7 @@ static void gst_colorspace_rgb32_to_bgr32(GstColorSpaceConverter *space, unsigne
       src+=4;
     }
   }
-  DEBUG("gst_colorspace_rgb32_to_bgr32 end\n");
+  GST_DEBUG (0,"gst_colorspace_rgb32_to_bgr32 end\n");
 }
 
 static void gst_colorspace_rgb555_to_rgb565(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
@@ -168,7 +168,7 @@ static void gst_colorspace_rgb555_to_rgb565(GstColorSpaceConverter *space, unsig
   guint32 *srcptr = (guint32 *) src;
   guint32 *destptr = (guint32 *) dest;
 
-  DEBUG("gst_colorspace_rgb555_to_rgb565 %p %p %d\n", src, dest, space->outsize);
+  GST_DEBUG (0,"gst_colorspace_rgb555_to_rgb565 %p %p %d\n", src, dest, space->outsize);
 
   size = space->outsize/4;
 

diff --git a/libs/colorspace/yuv2rgb.c b/libs/colorspace/yuv2rgb.c
index 0fe9deb..077837a 100644 (file)
--- a/libs/colorspace/yuv2rgb.c
+++ b/libs/colorspace/yuv2rgb.c
@@ -81,7 +81,7 @@ static GstColorSpaceYUVTables * gst_colorspace_init_yuv(long depth,
                                                long red_mask, long green_mask, long blue_mask);
 
 GstColorSpaceConvertFunction gst_colorspace_yuv2rgb_get_converter(GstColorSpaceConverter *space, GstColorSpaceType src, GstColorSpaceType dest) {
-  DEBUG("gst_colorspace_yuv2rgb_get_converter %d %d\n", src, dest);
+  GST_DEBUG (0,"gst_colorspace_yuv2rgb_get_converter %d %d\n", src, dest);
   switch(src) {
     case GST_COLORSPACE_YUV420P:
       space->insize = space->width*space->height+space->width*space->height/2;
@@ -136,7 +136,7 @@ GstColorSpaceConvertFunction gst_colorspace_yuv2rgb_get_converter(GstColorSpaceC
 static void gst_colorspace_yuv420P_to_bgr32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_bgr32\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr32\n");
 
   size = space->width * space->height;
 
@@ -153,7 +153,7 @@ static void gst_colorspace_yuv420P_to_bgr32(GstColorSpaceConverter *space, unsig
 static void gst_colorspace_yuv420P_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) 
 {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_rgb32\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb32\n");
 
   size = space->width * space->height;
 
@@ -169,7 +169,7 @@ static void gst_colorspace_yuv420P_to_rgb32(GstColorSpaceConverter *space, unsig
 
 static void gst_colorspace_yuv420P_to_bgr24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_bgr24\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr24\n");
 
   size = space->width * space->height;
 
@@ -184,7 +184,7 @@ static void gst_colorspace_yuv420P_to_bgr24(GstColorSpaceConverter *space, unsig
 
 static void gst_colorspace_yuv420P_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_rgb24\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb24\n");
 
   size = space->width * space->height;
 
@@ -200,7 +200,7 @@ static void gst_colorspace_yuv420P_to_rgb24(GstColorSpaceConverter *space, unsig
 
 static void gst_colorspace_yuv420P_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_rgb16\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb16\n");
 
   size = space->width * space->height;
 
@@ -218,7 +218,7 @@ static void gst_colorspace_yuv420P_to_rgb16(GstColorSpaceConverter *space, unsig
 
 static void gst_colorspace_yuv420P_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_rgb32_mmx\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb32_mmx\n");
 
   size = space->width * space->height;
 
@@ -233,7 +233,7 @@ static void gst_colorspace_yuv420P_to_bgr32_mmx(GstColorSpaceConverter *space, u
 }
 static void gst_colorspace_yuv420P_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_bgr16_mmx \n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr16_mmx \n");
 
   size = space->width * space->height;
 
@@ -244,7 +244,7 @@ static void gst_colorspace_yuv420P_to_bgr16_mmx(GstColorSpaceConverter *space, u
                         dest,
                        space->height,
                        space->width);
-  DEBUG("gst_colorspace_yuv420P_to_bgr16_mmx done\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr16_mmx done\n");
 
 }
 #endif

diff --git a/libs/getbits/gstgetbits_generic.c b/libs/getbits/gstgetbits_generic.c
index a94a71a..cfd7a5f 100644 (file)
--- a/libs/getbits/gstgetbits_generic.c
+++ b/libs/getbits/gstgetbits_generic.c
@@ -52,7 +52,7 @@ unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits) {
   gb->ptr += (gb->bits>>3);
   gb->bits &= 0x7;
 
-  DEBUG("getbits%d, %08x\n", bits, rval);
+  GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
   return rval>>7;
 }
 
@@ -70,7 +70,7 @@ unsigned long _gst_getbits_int(gst_getbits_t *gb, unsigned long bits) {
   gb->ptr += (gb->bits>>3);
   gb->bits &= 0x7;
 
-  DEBUG("getbits%d, %08x\n", bits, rval);
+  GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
   return rval;
 }
 
@@ -86,7 +86,7 @@ unsigned long _gst_getbits_fast_int(gst_getbits_t *gb, unsigned long bits) {
   gb->ptr += (gb->bits>>3);
   gb->bits &= 0x7;
 
-  DEBUG("getbits%d, %08x\n", bits, rval);
+  GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
   return rval;
 }
 
@@ -99,7 +99,7 @@ unsigned long _gst_showbits_int(gst_getbits_t *gb, unsigned long bits) {
   rval <<= gb->bits;
   rval >>= (32-bits);
 
-  DEBUG("showbits%d, %08x\n", bits, rval);
+  GST_DEBUG (0,"showbits%d, %08x\n", bits, rval);
   return rval;
 }
 
@@ -107,7 +107,7 @@ void _gst_flushbits_int(gst_getbits_t *gb, unsigned long bits) {
   gb->bits += bits;
   gb->ptr += (gb->bits>>3);
   gb->bits &= 0x7;
-  DEBUG("flushbits%d\n", bits);
+  GST_DEBUG (0,"flushbits%d\n", bits);
 }
 
 void _gst_getbits_back_int(gst_getbits_t *gb, unsigned long bits) {

diff --git a/libs/riff/gstriffencode.c b/libs/riff/gstriffencode.c
index d22e1aa..d80a667 100644 (file)
--- a/libs/riff/gstriffencode.c
+++ b/libs/riff/gstriffencode.c
@@ -48,7 +48,7 @@ GstRiff *gst_riff_encoder_new(guint32 type) {
   GstRiff *riff;
   gst_riff_list *list;
 
-  DEBUG("gst_riff_encoder: making %4.4s encoder\n", (char *)&type);
+  GST_DEBUG (0,"gst_riff_encoder: making %4.4s encoder\n", (char *)&type);
   riff = (GstRiff *)g_malloc(sizeof(GstRiff));
   g_return_val_if_fail(riff != NULL, NULL);
 
@@ -76,7 +76,7 @@ gint gst_riff_encoder_avih(GstRiff *riff, gst_riff_avih *head, gulong size) {
 
   g_return_val_if_fail(riff->state == GST_RIFF_STATE_INITIAL, GST_RIFF_EINVAL);
 
-  DEBUG("gst_riff_encoder: add avih\n");
+  GST_DEBUG (0,"gst_riff_encoder: add avih\n");
 
   ADD_LIST(riff, 0xB8, GST_RIFF_LIST_hdrl);
 
@@ -96,7 +96,7 @@ gint gst_riff_encoder_strh(GstRiff *riff, guint32 fcc_type, gst_riff_strh *head,
   g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASAVIH ||
                       riff->state == GST_RIFF_STATE_HASSTRF, GST_RIFF_EINVAL);
 
-  DEBUG("gst_riff_encoder: add strh type %08x (%4.4s)\n", fcc_type, (char *)&fcc_type);
+  GST_DEBUG (0,"gst_riff_encoder: add strh type %08x (%4.4s)\n", fcc_type, (char *)&fcc_type);
 
   ADD_LIST(riff, 108, GST_RIFF_LIST_strl);
 
@@ -117,7 +117,7 @@ gint gst_riff_encoder_strf(GstRiff *riff, void *format, gulong size) {
 
   g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASSTRH, GST_RIFF_EINVAL);
 
-  DEBUG("gst_riff_encoder: add strf\n");
+  GST_DEBUG (0,"gst_riff_encoder: add strf\n");
 
   ADD_CHUNK(riff, GST_RIFF_TAG_strf, size);
 
@@ -140,7 +140,7 @@ gint gst_riff_encoder_chunk(GstRiff *riff, guint32 chunk_type, void *chunkdata,
     riff->state = GST_RIFF_STATE_MOVI;
   }
 
-  DEBUG("gst_riff_encoder: add chunk type %08x (%4.4s)\n", chunk_type, (char *)&chunk_type);
+  GST_DEBUG (0,"gst_riff_encoder: add chunk type %08x (%4.4s)\n", chunk_type, (char *)&chunk_type);
   
   ADD_CHUNK(riff, chunk_type, size);
 

diff --git a/libs/riff/gstriffparse.c b/libs/riff/gstriffparse.c
index f1ae567..3f70e32 100644 (file)
--- a/libs/riff/gstriffparse.c
+++ b/libs/riff/gstriffparse.c
@@ -55,12 +55,12 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
   size = GST_BUFFER_SIZE(buf);
   last = off + size;
 
-  DEBUG("gst_riff_parser: offset new buffer 0x%08lx size 0x%08x\n", off, GST_BUFFER_SIZE(buf));
+  GST_DEBUG (0,"gst_riff_parser: offset new buffer 0x%08lx size 0x%08x\n", off, GST_BUFFER_SIZE(buf));
 
   if (riff->dataleft) {
     gulong newsize;
 
-    DEBUG("gst_riff_parser: recovering left data\n");
+    GST_DEBUG (0,"gst_riff_parser: recovering left data\n");
     newsize = riff->dataleft_size + size;
     riff->dataleft = g_realloc(riff->dataleft, newsize);
     memcpy(riff->dataleft+riff->dataleft_size, GST_BUFFER_DATA(buf), size);
@@ -99,10 +99,10 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
   // if we have an incomplete chunk from the previous buffer
   if (riff->incomplete_chunk) {
     guint leftover;
-    DEBUG("gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size);
+    GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size);
     leftover = riff->incomplete_chunk->size - riff->incomplete_chunk_size;
     if (leftover <= size) {
-      DEBUG("gst_riff_parser: we can fill it from %08x with %08x bytes = %08x\n", 
+      GST_DEBUG (0,"gst_riff_parser: we can fill it from %08x with %08x bytes = %08x\n", 
                riff->incomplete_chunk_size, leftover, 
                riff->incomplete_chunk_size+leftover);
       memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), leftover);
@@ -115,7 +115,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
       riff->incomplete_chunk = NULL;
     }
     else {
-      DEBUG("gst_riff_parser: we cannot fill it %08x >= %08lx\n", leftover, size);
+      GST_DEBUG (0,"gst_riff_parser: we cannot fill it %08x >= %08lx\n", leftover, size);
       memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), size);
       riff->incomplete_chunk_size += size;
       return 0;
@@ -124,7 +124,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
 
   if (riff->nextlikely & 0x01) riff->nextlikely++;
 
-  DEBUG("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 %08x\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 );
@@ -133,17 +133,17 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
     while (riff->chunks) {
       chunk = g_list_nth_data(riff->chunks, 0);
 
-      DEBUG("gst_riff_parser: next 0x%08x  offset 0x%08lx size 0x%08x\n",riff->nextlikely, 
+      GST_DEBUG (0,"gst_riff_parser: next 0x%08x  offset 0x%08lx size 0x%08x\n",riff->nextlikely, 
                      chunk->offset, chunk->size);
       if (riff->nextlikely >= chunk->offset+chunk->size) {
-        DEBUG("gst_riff_parser: found END LIST\n");
+        GST_DEBUG (0,"gst_riff_parser: found END LIST\n");
         // we have the end of the chunk on the stack, remove it
         riff->chunks = g_list_remove(riff->chunks, chunk);
       }
       else break;
     }
 
-    DEBUG("gst_riff_parser: next likely chunk is at offset 0x%08x\n",riff->nextlikely);
+    GST_DEBUG (0,"gst_riff_parser: next likely chunk is at offset 0x%08x\n",riff->nextlikely);
 
     chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk));
     g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM);
@@ -158,7 +158,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
 
 
     if (chunk->id == GST_RIFF_TAG_LIST) {
-      DEBUG("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form));
+      GST_DEBUG (0,"found LIST %s\n", gst_riff_id_to_fourcc(chunk->form));
       riff->nextlikely += 12;  
       // we push the list chunk on our 'stack'
       riff->chunks = g_list_prepend(riff->chunks,chunk);
@@ -169,7 +169,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
     }
     else {
 
-      DEBUG("gst_riff_parser: chunk id offset %08x is 0x%08lx '%s' and is 0x%08lx long\n",
+      GST_DEBUG (0,"gst_riff_parser: chunk id offset %08x is 0x%08lx '%s' and is 0x%08lx long\n",
                riff->nextlikely, words[0],
                gst_riff_id_to_fourcc(words[0]),words[1]);
 
@@ -178,7 +178,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
       if (riff->nextlikely > last) {
         guint left = size - (riff->nextlikely - chunk->size - off);
 
-        DEBUG("make incomplete buffer %08x\n", left);
+        GST_DEBUG (0,"make incomplete buffer %08x\n", left);
         chunk->data = g_malloc(chunk->size);
         memcpy(chunk->data, (gchar *)(words+2), left);
             riff->incomplete_chunk = chunk;
@@ -198,7 +198,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;
-    DEBUG("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 %08x\n",riff->nextlikely, 
                    last, left, off);
 
     riff->dataleft = g_malloc(left);

diff --git a/libs/videoscale/gstvideoscale.c b/libs/videoscale/gstvideoscale.c
index ba1cb59..beaa281 100644 (file)
--- a/libs/videoscale/gstvideoscale.c
+++ b/libs/videoscale/gstvideoscale.c
@@ -72,22 +72,22 @@ GstVideoScale *gst_videoscale_new(gint sw, gint sh, gint dw, gint dh, GstColorSp
   switch (method) {
     case GST_VIDEOSCALE_POINT_SAMPLE:
       new->scaler = gst_videoscale_scale_point_sample;
-      DEBUG("videoscale: scaling method POINT_SAMPLE\n");
+      GST_DEBUG (0,"videoscale: scaling method POINT_SAMPLE\n");
       break;
     case GST_VIDEOSCALE_NEAREST:
       generate_rowbytes(new->copy_row, sw, dw, scale_bytes);
       new->scaler = gst_videoscale_scale_nearest;
-      DEBUG("videoscale: scaling method NEAREST\n");
+      GST_DEBUG (0,"videoscale: scaling method NEAREST\n");
       break;
     case GST_VIDEOSCALE_BILINEAR:
       new->scaler = gst_videoscale_scale_plane_slow;
       new->filter = gst_videoscale_bilinear;
-      DEBUG("videoscale: scaling method BILINEAR\n");
+      GST_DEBUG (0,"videoscale: scaling method BILINEAR\n");
       break;
     case GST_VIDEOSCALE_BICUBIC:
       new->scaler = gst_videoscale_scale_plane_slow;
       new->filter = gst_videoscale_bicubic;
-      DEBUG("videoscale: scaling method BICUBIC\n");
+      GST_DEBUG (0,"videoscale: scaling method BICUBIC\n");
       break;
     default:
       g_print("videoscale: unsupported scaling method %d\n", method);
@@ -109,11 +109,11 @@ static void gst_videoscale_scale_rgb(GstVideoScale *scale, unsigned char *src, u
   int sh = scale->source_height;
   int dw = scale->dest_width;
   int dh = scale->dest_height;
-  DEBUG("videoscale: scaling RGB %dx%d to %dx%d\n", sw, sh, dw, dh);
+  GST_DEBUG (0,"videoscale: scaling RGB %dx%d to %dx%d\n", sw, sh, dw, dh);
 
   dw = ((dw + 1) & ~1) << 1;
   sw = sw<<1;
-  DEBUG("videoscale: %p %p\n", src, dest);
+  GST_DEBUG (0,"videoscale: %p %p\n", src, dest);
   scale->scaler(scale, src, dest, sw, sh, dw, dh);
 }
 
@@ -124,7 +124,7 @@ static void gst_videoscale_scale_yuv(GstVideoScale *scale, unsigned char *src, u
   int dw = scale->dest_width;
   int dh = scale->dest_height;
   
-  DEBUG("videoscale: scaling YUV420P %dx%d to %dx%d\n", sw, sh, dw, dh);
+  GST_DEBUG (0,"videoscale: scaling YUV420P %dx%d to %dx%d\n", sw, sh, dw, dh);
 
   scale->scaler(scale, src, dest, sw, sh, dw, dh);
 
@@ -181,7 +181,7 @@ static unsigned char gst_videoscale_bicubic(unsigned char *src, double x, double
   double t1, t2, t3, t4;
   double a1, a2, a3, a4;
 
-  DEBUG("videoscale: scaling bicubic %dx%d\n", sw, sh);
+  GST_DEBUG (0,"videoscale: scaling bicubic %dx%d\n", sw, sh);
 
   a1 = -a*(1-a)*(1-a);
   a2 = (1-2*a*a+a*a*a);
@@ -212,17 +212,17 @@ static void gst_videoscale_scale_plane_slow(GstVideoScale *scale, unsigned char
   double xr, yr;
   int x, y;
 
-  DEBUG("videoscale: scale plane slow %dx%d %dx%d %g %g %p %p\n", sw, sh, dw, dh, zoomx, zoomy, src, dest);
+  GST_DEBUG (0,"videoscale: scale plane slow %dx%d %dx%d %g %g %p %p\n", sw, sh, dw, dh, zoomx, zoomy, src, dest);
 
   for (y=0; y<dh; y++) {
     yr = ((double)y)/zoomy;
     for (x=0; x<dw; x++) {
       xr = ((double)x)/zoomx;
 
-      DEBUG("videoscale: scale plane slow %g %g %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)));
+      GST_DEBUG (0,"videoscale: scale plane slow %g %g %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)));
 
       if (floor(xr) == xr && floor(yr) == yr){
-        DEBUG("videoscale: scale plane %g %g %p %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)), dest);
+        GST_DEBUG (0,"videoscale: scale plane %g %g %p %p\n", xr, yr, (src+(int)(x)+(int)((y)*sw)), dest);
        *dest++ = RC(xr, yr);
       }
       else {
@@ -248,7 +248,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int
   unsigned char *eip;
   unsigned char load, store;
 
-  DEBUG("videoscale: setup scaling %p\n", copy_row);
+  GST_DEBUG (0,"videoscale: setup scaling %p\n", copy_row);
 
   switch (bpp) {
     case 1:
@@ -281,7 +281,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int
     pos += inc;
   }
   *eip++ = RETURN;
-  DEBUG("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, eip-copy_row);
 }
 
 
@@ -292,7 +292,7 @@ static void gst_videoscale_scale_point_sample(GstVideoScale *scale, unsigned cha
   int sum, xcount, ycount, loop;
   unsigned char *srcp, *srcp2;
   
-  DEBUG("videoscale: scaling nearest %p %p %d\n", src, dest, dw);
+  GST_DEBUG (0,"videoscale: scaling nearest %p %p %d\n", src, dest, dw);
 
 
   ypos = 0x10000;
@@ -339,7 +339,7 @@ static void gst_videoscale_scale_nearest(GstVideoScale *scale, unsigned char *sr
   
   scale->temp = scale->copy_row;
   
-  DEBUG("videoscale: scaling nearest %p %p %p %d\n", scale->copy_row, src, dest, dw);
+  GST_DEBUG (0,"videoscale: scaling nearest %p %p %p %d\n", scale->copy_row, src, dest, dw);
 
 
   pos = 0x10000;
@@ -365,5 +365,5 @@ static void gst_videoscale_scale_nearest(GstVideoScale *scale, unsigned char *sr
 
     pos += inc;
   }
-  DEBUG("videoscale: scaling nearest done %p\n", scale->copy_row);
+  GST_DEBUG (0,"videoscale: scaling nearest done %p\n", scale->copy_row);
 }

diff --git a/libs/videoscale/rgb2rgb.c b/libs/videoscale/rgb2rgb.c
index b9c605f..62d8600 100644 (file)
--- a/libs/videoscale/rgb2rgb.c
+++ b/libs/videoscale/rgb2rgb.c
@@ -63,13 +63,13 @@ static GstBuffer *gst_colorspace_rgb24_to_bgr24(GstBuffer *src, GstColorSpacePar
   gchar temp;
   gchar *data;
 
-  DEBUG("gst_colorspace_rgb24_to_bgr24 %d\n", GST_BUFFER_SIZE(src));
+  GST_DEBUG (0,"gst_colorspace_rgb24_to_bgr24 %d\n", GST_BUFFER_SIZE(src));
 
   size = GST_BUFFER_SIZE(src)/3;
 
   if (params != NULL && params->outbuf != NULL) {
     data = params->outbuf;
-    DEBUG("gst_colorspace: to buffer %p\n", data);
+    GST_DEBUG (0,"gst_colorspace: to buffer %p\n", data);
   }
   else {
     data = GST_BUFFER_DATA(src);
@@ -81,7 +81,7 @@ static GstBuffer *gst_colorspace_rgb24_to_bgr24(GstBuffer *src, GstColorSpacePar
     data[2] = temp;
     data+=3;
   }
-  DEBUG("gst_colorspace_rgb24_to_bgr24 end %d\n", GST_BUFFER_SIZE(src));
+  GST_DEBUG (0,"gst_colorspace_rgb24_to_bgr24 end %d\n", GST_BUFFER_SIZE(src));
 
   return src;
 }

diff --git a/libs/videoscale/yuv2rgb.c b/libs/videoscale/yuv2rgb.c
index 8f6ec32..23aad69 100644 (file)
--- a/libs/videoscale/yuv2rgb.c
+++ b/libs/videoscale/yuv2rgb.c
@@ -77,7 +77,7 @@ static GstColorSpaceYUVTables * gst_colorspace_init_yuv(long depth,
                                                long red_mask, long green_mask, long blue_mask);
 
 GstColorSpaceConverter gst_colorspace_yuv2rgb_get_converter(GstColorSpace src, GstColorSpace dest) {
-  DEBUG("gst_colorspace_yuv2rgb_get_converter %d\n", dest);
+  GST_DEBUG (0,"gst_colorspace_yuv2rgb_get_converter %d\n", dest);
   switch(src) {
     case GST_COLORSPACE_YUV420P:
       switch(dest) {
@@ -112,7 +112,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr32(GstBuffer *src, GstColorSpaceP
   int size;
   GstBuffer *buf = NULL;
   guchar *out;
-  DEBUG("gst_colorspace_yuv420P_to_bgr32\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr32\n");
 
   g_return_val_if_fail(params != NULL, NULL);
 
@@ -147,7 +147,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_rgb32(GstBuffer *src, GstColorSpaceP
   int size;
   GstBuffer *buf = NULL;
   guchar *out;
-  DEBUG("gst_colorspace_yuv420P_to_rgb32\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb32\n");
 
   g_return_val_if_fail(params != NULL, NULL);
 
@@ -182,7 +182,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr24(GstBuffer *src, GstColorSpaceP
   int size;
   GstBuffer *buf = NULL;
   guchar *out;
-  DEBUG("gst_colorspace_yuv420P_to_bgr24\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr24\n");
 
   g_return_val_if_fail(params != NULL, NULL);
 
@@ -216,7 +216,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_rgb24(GstBuffer *src, GstColorSpaceP
   int size;
   GstBuffer *buf = NULL;
   guchar *out;
-  DEBUG("gst_colorspace_yuv420P_to_rgb24\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb24\n");
 
   g_return_val_if_fail(params != NULL, NULL);
 
@@ -249,7 +249,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_rgb24(GstBuffer *src, GstColorSpaceP
 static GstBuffer *gst_colorspace_yuv420P_to_rgb16(GstBuffer *src, GstColorSpaceParameters *params) {
   static GstColorSpaceYUVTables *color_tables = NULL;
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_rgb16\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb16\n");
 
   g_return_val_if_fail(params != NULL, NULL);
   g_return_val_if_fail(params->visual != NULL, NULL);
@@ -278,7 +278,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr32_mmx(GstBuffer *src, GstColorSp
   int size;
   GstBuffer *buf = NULL;
   guchar *out;
-  DEBUG("gst_colorspace_yuv420P_to_rgb32_mmx\n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb32_mmx\n");
 
   g_return_val_if_fail(params != NULL, NULL);
 
@@ -306,7 +306,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr32_mmx(GstBuffer *src, GstColorSp
 }
 static GstBuffer *gst_colorspace_yuv420P_to_bgr16_mmx(GstBuffer *src, GstColorSpaceParameters *params) {
   int size;
-  DEBUG("gst_colorspace_yuv420P_to_bgr16_mmx \n");
+  GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr16_mmx \n");
 
   g_return_val_if_fail(params != NULL, NULL);