From 1d6862cb69701e14c6c01e3bdf6f7a165271f3d3 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 24 Mar 2002 22:07:03 +0000 Subject: filter newlines out of GST_DEBUG statements to reflect new core behavior fixes to adder's caps, again Original commit message from CVS: * filter newlines out of GST_DEBUG statements to reflect new core behavior * fixes to adder's caps, again --- gst-libs/gst/riff/riffencode.c | 10 +++++----- gst-libs/gst/riff/riffparse.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'gst-libs/gst') diff --git a/gst-libs/gst/riff/riffencode.c b/gst-libs/gst/riff/riffencode.c index a1bcba7e..967f7b17 100644 --- a/gst-libs/gst/riff/riffencode.c +++ b/gst-libs/gst/riff/riffencode.c @@ -48,7 +48,7 @@ GstRiff *gst_riff_encoder_new(guint32 type) { GstRiff *riff; gst_riff_list *list; - GST_DEBUG (0,"gst_riff_encoder: making %4.4s encoder\n", (char *)&type); + GST_DEBUG (0,"gst_riff_encoder: making %4.4s encoder", (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); - GST_DEBUG (0,"gst_riff_encoder: add avih\n"); + GST_DEBUG (0,"gst_riff_encoder: add avih"); 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); - GST_DEBUG (0,"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)", 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); - GST_DEBUG (0,"gst_riff_encoder: add strf\n"); + GST_DEBUG (0,"gst_riff_encoder: add strf"); 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; } - GST_DEBUG (0,"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)", chunk_type, (char *)&chunk_type); ADD_CHUNK(riff, chunk_type, size); diff --git a/gst-libs/gst/riff/riffparse.c b/gst-libs/gst/riff/riffparse.c index de76c23c..d5e45440 100644 --- a/gst-libs/gst/riff/riffparse.c +++ b/gst-libs/gst/riff/riffparse.c @@ -56,12 +56,12 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) size = GST_BUFFER_SIZE(buf); last = off + size; - GST_DEBUG (0,"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", off, GST_BUFFER_SIZE(buf)); if (riff->dataleft) { gulong newsize; - GST_DEBUG (0,"gst_riff_parser: recovering left data\n"); + GST_DEBUG (0,"gst_riff_parser: recovering left data"); newsize = riff->dataleft_size + size; riff->dataleft = g_realloc(riff->dataleft, newsize); memcpy(riff->dataleft+riff->dataleft_size, GST_BUFFER_DATA(buf), size); @@ -100,10 +100,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; - GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size); + GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled", riff->incomplete_chunk_size); leftover = riff->incomplete_chunk->size - riff->incomplete_chunk_size; if (leftover <= size) { - GST_DEBUG (0,"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", riff->incomplete_chunk_size, leftover, riff->incomplete_chunk_size+leftover); memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), leftover); @@ -116,7 +116,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) riff->incomplete_chunk = NULL; } else { - GST_DEBUG (0,"gst_riff_parser: we cannot fill it %08x >= %08lx\n", leftover, size); + GST_DEBUG (0,"gst_riff_parser: we cannot fill it %08x >= %08lx", leftover, size); memcpy(riff->incomplete_chunk->data+riff->incomplete_chunk_size, GST_BUFFER_DATA(buf), size); riff->incomplete_chunk_size += size; return 0; @@ -125,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 %08lx\n",riff->nextlikely, last, off); + GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx",riff->nextlikely, last, off); /* loop while the next likely chunk header is in this buffer */ while ((riff->nextlikely+12) <= last) { guint32 *words = (guint32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); @@ -134,17 +134,17 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) while (riff->chunks) { chunk = g_list_nth_data(riff->chunks, 0); - GST_DEBUG (0,"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",riff->nextlikely, chunk->offset, chunk->size); if (riff->nextlikely >= chunk->offset+chunk->size) { - GST_DEBUG (0,"gst_riff_parser: found END LIST\n"); + GST_DEBUG (0,"gst_riff_parser: found END LIST"); /* we have the end of the chunk on the stack, remove it */ riff->chunks = g_list_remove(riff->chunks, chunk); } else break; } - GST_DEBUG (0,"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",riff->nextlikely); chunk = (GstRiffChunk *)g_malloc(sizeof(GstRiffChunk)); g_return_val_if_fail(chunk != NULL, GST_RIFF_ENOMEM); @@ -159,7 +159,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) if (chunk->id == GST_RIFF_TAG_LIST) { - GST_DEBUG (0,"found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); + GST_DEBUG (0,"found LIST %s", 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); @@ -170,7 +170,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) } else { - GST_DEBUG (0,"gst_riff_parser: chunk id offset %08x is 0x%08x '%s' and is 0x%08x long\n", + GST_DEBUG (0,"gst_riff_parser: chunk id offset %08x is 0x%08x '%s' and is 0x%08x long", riff->nextlikely, GUINT32_FROM_LE (words[0]), gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); @@ -179,7 +179,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) if (riff->nextlikely > last) { guint left = size - (riff->nextlikely - chunk->size - off); - GST_DEBUG (0,"make incomplete buffer %08x\n", left); + GST_DEBUG (0,"make incomplete buffer %08x", left); chunk->data = g_malloc(chunk->size); memcpy(chunk->data, (gchar *)(words+2), left); riff->incomplete_chunk = chunk; @@ -199,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 %08lx\n",riff->nextlikely, + GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx",riff->nextlikely, last, left, off); riff->dataleft = g_malloc(left); -- cgit v1.2.1