mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-24 15:06:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Updated libraries to use new GST_DEBUG instead of DEBUG.

Browse source 
Original commit message from CVS:
Updated libraries to use new GST_DEBUG instead of DEBUG.
This commit is contained in:
Erik Walthinsen 2001-01-01 03:16:19 +00:00
parent 1e04cefaf2
commit b2a9bc3e6b
9 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/colorspace/gstcolorspace.c
View file

@ -46,7 +46,7 @@ GstColorSpaceConverter *gst_colorspace_converter_new(gint width, gint height, Gs
new->color_tables = NULL; new->color_tables = NULL;
new->convert = 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(srcspace)) {
if (GST_COLORSPACE_IS_RGB_TYPE(destspace)) { if (GST_COLORSPACE_IS_RGB_TYPE(destspace)) {
new->convert = gst_colorspace_rgb2rgb_get_converter(new, srcspace, destspace); new->convert = gst_colorspace_rgb2rgb_get_converter(new, srcspace, destspace);

10
libs/colorspace/rgb2rgb.c
View file

@ -110,7 +110,7 @@ static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigne
gint size; gint size;
gchar temp; 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; size = space->outsize/3;
@ -130,7 +130,7 @@ static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigne
src+=3; 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) 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; gint size;
gchar temp; 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; size = space->outsize/4;
@ -159,7 +159,7 @@ static void gst_colorspace_rgb32_to_bgr32(GstColorSpaceConverter *space, unsigne
src+=4; 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) 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 *srcptr = (guint32 *) src;
guint32 *destptr = (guint32 *) dest; 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; size = space->outsize/4;

18
libs/colorspace/yuv2rgb.c
View file

@ -81,7 +81,7 @@ static GstColorSpaceYUVTables * gst_colorspace_init_yuv(long depth,
long red_mask, long green_mask, long blue_mask); long red_mask, long green_mask, long blue_mask);
GstColorSpaceConvertFunction gst_colorspace_yuv2rgb_get_converter(GstColorSpaceConverter *space, GstColorSpaceType src, GstColorSpaceType dest) { 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) { switch(src) {
case GST_COLORSPACE_YUV420P: case GST_COLORSPACE_YUV420P:
space->insize = space->width*space->height+space->width*space->height/2; 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) static void gst_colorspace_yuv420P_to_bgr32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest)
{ {
int size; int size;
DEBUG("gst_colorspace_yuv420P_to_bgr32\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr32\n");
size = space->width * space->height; 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) static void gst_colorspace_yuv420P_to_rgb32(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest)
{ {
int size; int size;
DEBUG("gst_colorspace_yuv420P_to_rgb32\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb32\n");
size = space->width * space->height; 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) { static void gst_colorspace_yuv420P_to_bgr24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
int size; int size;
DEBUG("gst_colorspace_yuv420P_to_bgr24\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr24\n");
size = space->width * space->height; 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) { static void gst_colorspace_yuv420P_to_rgb24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
int size; int size;
DEBUG("gst_colorspace_yuv420P_to_rgb24\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb24\n");
size = space->width * space->height; 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) { static void gst_colorspace_yuv420P_to_rgb16(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
int size; int size;
DEBUG("gst_colorspace_yuv420P_to_rgb16\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_rgb16\n");
size = space->width * space->height; 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) { static void gst_colorspace_yuv420P_to_bgr32_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
int size; 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; 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) { static void gst_colorspace_yuv420P_to_bgr16_mmx(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest) {
int size; 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; size = space->width * space->height;
@ -244,7 +244,7 @@ static void gst_colorspace_yuv420P_to_bgr16_mmx(GstColorSpaceConverter *space, u
dest, dest,
space->height, space->height,
space->width); space->width);
DEBUG("gst_colorspace_yuv420P_to_bgr16_mmx done\n"); GST_DEBUG (0,"gst_colorspace_yuv420P_to_bgr16_mmx done\n");
} }
#endif #endif

10
libs/getbits/gstgetbits_generic.c
View file

@ -52,7 +52,7 @@ unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits) {
gb->ptr += (gb->bits>>3); gb->ptr += (gb->bits>>3);
gb->bits &= 0x7; gb->bits &= 0x7;
DEBUG("getbits%d, %08x\n", bits, rval); GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
return rval>>7; 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->ptr += (gb->bits>>3);
gb->bits &= 0x7; gb->bits &= 0x7;
DEBUG("getbits%d, %08x\n", bits, rval); GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
return 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->ptr += (gb->bits>>3);
gb->bits &= 0x7; gb->bits &= 0x7;
DEBUG("getbits%d, %08x\n", bits, rval); GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
return rval; return rval;
} }
@ -99,7 +99,7 @@ unsigned long _gst_showbits_int(gst_getbits_t *gb, unsigned long bits) {
rval <<= gb->bits; rval <<= gb->bits;
rval >>= (32-bits); rval >>= (32-bits);
DEBUG("showbits%d, %08x\n", bits, rval); GST_DEBUG (0,"showbits%d, %08x\n", bits, rval);
return rval; return rval;
} }
@ -107,7 +107,7 @@ void _gst_flushbits_int(gst_getbits_t *gb, unsigned long bits) {
gb->bits += bits; gb->bits += bits;
gb->ptr += (gb->bits>>3); gb->ptr += (gb->bits>>3);
gb->bits &= 0x7; 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) { void _gst_getbits_back_int(gst_getbits_t *gb, unsigned long bits) {

10
libs/riff/gstriffencode.c
View file

@ -48,7 +48,7 @@ GstRiff *gst_riff_encoder_new(guint32 type) {
GstRiff *riff; GstRiff *riff;
gst_riff_list *list; 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)); riff = (GstRiff *)g_malloc(sizeof(GstRiff));
g_return_val_if_fail(riff != NULL, NULL); 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); 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); 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 || g_return_val_if_fail(riff->state == GST_RIFF_STATE_HASAVIH ||
riff->state == GST_RIFF_STATE_HASSTRF, GST_RIFF_EINVAL); 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); 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); 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); 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; 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); ADD_CHUNK(riff, chunk_type, size);

26
libs/riff/gstriffparse.c
View file

@ -55,12 +55,12 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
size = GST_BUFFER_SIZE(buf); size = GST_BUFFER_SIZE(buf);
last = off + size; 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) { if (riff->dataleft) {
gulong newsize; 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; newsize = riff->dataleft_size + size;
riff->dataleft = g_realloc(riff->dataleft, newsize); riff->dataleft = g_realloc(riff->dataleft, newsize);
memcpy(riff->dataleft+riff->dataleft_size, GST_BUFFER_DATA(buf), size); 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 we have an incomplete chunk from the previous buffer
if (riff->incomplete_chunk) { if (riff->incomplete_chunk) {
guint leftover; 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; leftover = riff->incomplete_chunk->size - riff->incomplete_chunk_size;
if (leftover <= 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,
riff->incomplete_chunk_size+leftover); riff->incomplete_chunk_size+leftover);
memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), 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; riff->incomplete_chunk = NULL;
} }
else { 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); memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), size);
riff->incomplete_chunk_size += size; riff->incomplete_chunk_size += size;
return 0; return 0;
@ -124,7 +124,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
if (riff->nextlikely & 0x01) riff->nextlikely++; 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 */ /* loop while the next likely chunk header is in this buffer */
while ((riff->nextlikely+12) <= last) { while ((riff->nextlikely+12) <= last) {
gulong *words = (gulong *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); 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) { while (riff->chunks) {
chunk = g_list_nth_data(riff->chunks, 0); 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); chunk->offset, chunk->size);
if (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 // we have the end of the chunk on the stack, remove it
riff->chunks = g_list_remove(riff->chunks, chunk); riff->chunks = g_list_remove(riff->chunks, chunk);
} }
else break; 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)); chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk));
g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM); 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) { 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; riff->nextlikely += 12;
// we push the list chunk on our 'stack' // we push the list chunk on our 'stack'
riff->chunks = g_list_prepend(riff->chunks,chunk); riff->chunks = g_list_prepend(riff->chunks,chunk);
@ -169,7 +169,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
} }
else { 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], riff->nextlikely, words[0],
gst_riff_id_to_fourcc(words[0]),words[1]); 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) { if (riff->nextlikely > last) {
guint left = size - (riff->nextlikely - chunk->size - off); 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); chunk->data = g_malloc(chunk->size);
memcpy(chunk->data, (gchar *)(words+2), left); memcpy(chunk->data, (gchar *)(words+2), left);
riff->incomplete_chunk = chunk; 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) { if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) {
guint left = last - riff->nextlikely; 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); last, left, off);
riff->dataleft = g_malloc(left); riff->dataleft = g_malloc(left);

32
libs/videoscale/gstvideoscale.c
View file

@ -72,22 +72,22 @@ GstVideoScale *gst_videoscale_new(gint sw, gint sh, gint dw, gint dh, GstColorSp
switch (method) { switch (method) {
case GST_VIDEOSCALE_POINT_SAMPLE: case GST_VIDEOSCALE_POINT_SAMPLE:
new->scaler = gst_videoscale_scale_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; break;
case GST_VIDEOSCALE_NEAREST: case GST_VIDEOSCALE_NEAREST:
generate_rowbytes(new->copy_row, sw, dw, scale_bytes); generate_rowbytes(new->copy_row, sw, dw, scale_bytes);
new->scaler = gst_videoscale_scale_nearest; new->scaler = gst_videoscale_scale_nearest;
DEBUG("videoscale: scaling method NEAREST\n"); GST_DEBUG (0,"videoscale: scaling method NEAREST\n");
break; break;
case GST_VIDEOSCALE_BILINEAR: case GST_VIDEOSCALE_BILINEAR:
new->scaler = gst_videoscale_scale_plane_slow; new->scaler = gst_videoscale_scale_plane_slow;
new->filter = gst_videoscale_bilinear; new->filter = gst_videoscale_bilinear;
DEBUG("videoscale: scaling method BILINEAR\n"); GST_DEBUG (0,"videoscale: scaling method BILINEAR\n");
break; break;
case GST_VIDEOSCALE_BICUBIC: case GST_VIDEOSCALE_BICUBIC:
new->scaler = gst_videoscale_scale_plane_slow; new->scaler = gst_videoscale_scale_plane_slow;
new->filter = gst_videoscale_bicubic; new->filter = gst_videoscale_bicubic;
DEBUG("videoscale: scaling method BICUBIC\n"); GST_DEBUG (0,"videoscale: scaling method BICUBIC\n");
break; break;
default: default:
g_print("videoscale: unsupported scaling method %d\n", method); 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 sh = scale->source_height;
int dw = scale->dest_width; int dw = scale->dest_width;
int dh = scale->dest_height; 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; dw = ((dw + 1) & ~1) << 1;
sw = sw<<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); 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 dw = scale->dest_width;
int dh = scale->dest_height; 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); 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 t1, t2, t3, t4;
double a1, a2, a3, a4; 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); a1 = -a*(1-a)*(1-a);
a2 = (1-2*a*a+a*a*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; double xr, yr;
int x, y; 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++) { for (y=0; y<dh; y++) {
yr = ((double)y)/zoomy; yr = ((double)y)/zoomy;
for (x=0; x<dw; x++) { for (x=0; x<dw; x++) {
xr = ((double)x)/zoomx; 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){ 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); *dest++ = RC(xr, yr);
} }
else { 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 *eip;
unsigned char load, store; unsigned char load, store;
DEBUG("videoscale: setup scaling %p\n", copy_row); GST_DEBUG (0,"videoscale: setup scaling %p\n", copy_row);
switch (bpp) { switch (bpp) {
case 1: case 1:
@ -281,7 +281,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int
pos += inc; pos += inc;
} }
*eip++ = RETURN; *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; int sum, xcount, ycount, loop;
unsigned char *srcp, *srcp2; 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; ypos = 0x10000;
@ -339,7 +339,7 @@ static void gst_videoscale_scale_nearest(GstVideoScale *scale, unsigned char *sr
scale->temp = scale->copy_row; 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; pos = 0x10000;
@ -365,5 +365,5 @@ static void gst_videoscale_scale_nearest(GstVideoScale *scale, unsigned char *sr
pos += inc; pos += inc;
} }
DEBUG("videoscale: scaling nearest done %p\n", scale->copy_row); GST_DEBUG (0,"videoscale: scaling nearest done %p\n", scale->copy_row);
} }

6
libs/videoscale/rgb2rgb.c
View file

@ -63,13 +63,13 @@ static GstBuffer *gst_colorspace_rgb24_to_bgr24(GstBuffer *src, GstColorSpacePar
gchar temp; gchar temp;
gchar *data; 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; size = GST_BUFFER_SIZE(src)/3;
if (params != NULL && params->outbuf != NULL) { if (params != NULL && params->outbuf != NULL) {
data = params->outbuf; data = params->outbuf;
DEBUG("gst_colorspace: to buffer %p\n", data); GST_DEBUG (0,"gst_colorspace: to buffer %p\n", data);
} }
else { else {
data = GST_BUFFER_DATA(src); data = GST_BUFFER_DATA(src);
@ -81,7 +81,7 @@ static GstBuffer *gst_colorspace_rgb24_to_bgr24(GstBuffer *src, GstColorSpacePar
data[2] = temp; data[2] = temp;
data+=3; 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; return src;
} }

16
libs/videoscale/yuv2rgb.c
View file

@ -77,7 +77,7 @@ static GstColorSpaceYUVTables * gst_colorspace_init_yuv(long depth,
long red_mask, long green_mask, long blue_mask); long red_mask, long green_mask, long blue_mask);
GstColorSpaceConverter gst_colorspace_yuv2rgb_get_converter(GstColorSpace src, GstColorSpace dest) { 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) { switch(src) {
case GST_COLORSPACE_YUV420P: case GST_COLORSPACE_YUV420P:
switch(dest) { switch(dest) {
@ -112,7 +112,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr32(GstBuffer *src, GstColorSpaceP
int size; int size;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guchar *out; 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); g_return_val_if_fail(params != NULL, NULL);
@ -147,7 +147,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_rgb32(GstBuffer *src, GstColorSpaceP
int size; int size;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guchar *out; 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); g_return_val_if_fail(params != NULL, NULL);
@ -182,7 +182,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_bgr24(GstBuffer *src, GstColorSpaceP
int size; int size;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guchar *out; 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); g_return_val_if_fail(params != NULL, NULL);
@ -216,7 +216,7 @@ static GstBuffer *gst_colorspace_yuv420P_to_rgb24(GstBuffer *src, GstColorSpaceP
int size; int size;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guchar *out; 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); 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 GstBuffer *gst_colorspace_yuv420P_to_rgb16(GstBuffer *src, GstColorSpaceParameters *params) {
static GstColorSpaceYUVTables *color_tables = NULL; static GstColorSpaceYUVTables *color_tables = NULL;
int size; 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 != NULL, NULL);
g_return_val_if_fail(params->visual != 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; int size;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
guchar *out; 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); 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) { static GstBuffer *gst_colorspace_yuv420P_to_bgr16_mmx(GstBuffer *src, GstColorSpaceParameters *params) {
int size; 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); g_return_val_if_fail(params != NULL, NULL);