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/mpeg1sys/buffer.c | 56 ++++++++++++++++++------------------- gst/mpeg1sys/gstmpeg1systemencode.c | 22 +++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) (limited to 'gst/mpeg1sys') diff --git a/gst/mpeg1sys/buffer.c b/gst/mpeg1sys/buffer.c index d1ecd59b..08f72035 100644 --- a/gst/mpeg1sys/buffer.c +++ b/gst/mpeg1sys/buffer.c @@ -126,7 +126,7 @@ void mpeg1mux_buffer_queue(Mpeg1MuxBuffer *mb, GstBuffer *buf) { mb->length += GST_BUFFER_SIZE(buf); } - GST_DEBUG (0,"queuing buffer %lu\n", mb->length); + GST_DEBUG (0,"queuing buffer %lu", mb->length); if (mb->buffer_type == BUFFER_TYPE_VIDEO) { mpeg1mux_buffer_update_video_info(mb); } @@ -140,7 +140,7 @@ gulong mpeg1mux_buffer_update_queued(Mpeg1MuxBuffer *mb, guint64 scr) { Mpeg1MuxTimecode *tc; gulong total_queued = 0; - GST_DEBUG (0,"queued in buffer on SCR=%llu\n", scr); + GST_DEBUG (0,"queued in buffer on SCR=%llu", scr); queued_list = g_list_first(mb->queued_list); while (queued_list) { @@ -151,12 +151,12 @@ gulong mpeg1mux_buffer_update_queued(Mpeg1MuxBuffer *mb, guint64 scr) { queued_list = g_list_first(mb->queued_list); } else { - GST_DEBUG (0,"queued in buffer %ld, %llu\n", tc->original_length, tc->DTS); + GST_DEBUG (0,"queued in buffer %ld, %llu", tc->original_length, tc->DTS); total_queued += tc->original_length; queued_list = g_list_next(queued_list); } } - GST_DEBUG (0,"queued in buffer %lu\n", total_queued); + GST_DEBUG (0,"queued in buffer %lu", total_queued); return total_queued; } @@ -167,7 +167,7 @@ void mpeg1mux_buffer_shrink(Mpeg1MuxBuffer *mb, gulong size) { gulong consumed = 0; gulong count; - GST_DEBUG (0,"shrinking buffer %lu\n", size); + GST_DEBUG (0,"shrinking buffer %lu", size); g_assert(mb->length >= size); @@ -188,16 +188,16 @@ void mpeg1mux_buffer_shrink(Mpeg1MuxBuffer *mb, gulong size) { else { consumed += tc->length; while (size >= consumed) { - GST_DEBUG (0,"removing timecode: %llu %llu %lu %lu\n", tc->DTS, tc->PTS, tc->length, consumed); + GST_DEBUG (0,"removing timecode: %llu %llu %lu %lu", tc->DTS, tc->PTS, tc->length, consumed); mb->timecode_list = g_list_remove_link(mb->timecode_list, timecode_list); mb->queued_list = g_list_append(mb->queued_list, tc); timecode_list = g_list_first(mb->timecode_list); tc = (Mpeg1MuxTimecode *) timecode_list->data; consumed += tc->length; - GST_DEBUG (0,"next timecode: %llu %llu %lu %lu\n", tc->DTS, tc->PTS, tc->length, consumed); + GST_DEBUG (0,"next timecode: %llu %llu %lu %lu", tc->DTS, tc->PTS, tc->length, consumed); } mb->new_frame = TRUE; - GST_DEBUG (0,"leftover frame size from %lu to %lu \n", tc->length, consumed-size); + GST_DEBUG (0,"leftover frame size from %lu to %lu ", tc->length, consumed-size); tc->length = consumed - size; } @@ -210,7 +210,7 @@ void mpeg1mux_buffer_shrink(Mpeg1MuxBuffer *mb, gulong size) { mb->info.audio.PTS = tc->PTS; mb->next_frame_time = tc->PTS; } - GST_DEBUG (0,"next frame time timecode: %llu %lu\n", mb->next_frame_time, tc->length); + GST_DEBUG (0,"next frame time timecode: %llu %lu", mb->next_frame_time, tc->length); /* check buffer consistency */ timecode_list = g_list_first(mb->timecode_list); @@ -238,7 +238,7 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { gst_getbits_t gb; - GST_DEBUG (0,"mpeg1mux::update_video_info %lu %lu\n", mb->base, mb->scan_pos); + GST_DEBUG (0,"mpeg1mux::update_video_info %lu %lu", mb->base, mb->scan_pos); if (mb->base == 0 && mb->scan_pos == 0) { if ((SYNCWORD_START<<8)+*(mb->buffer+3) == SEQUENCE_HEADER) { @@ -258,7 +258,7 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { mb->info.video.secs_per_frame = 1. / picture_rates[mb->info.video.picture_rate]; mb->info.video.decoding_order=0; mb->info.video.group_order=0; - GST_DEBUG (0,"mpeg1mux::update_video_info: secs per frame %g\n", mb->info.video.secs_per_frame); + GST_DEBUG (0,"mpeg1mux::update_video_info: secs per frame %g", mb->info.video.secs_per_frame); } else { g_print("mpeg1mux::update_video_info: Invalid MPEG Video header\n"); @@ -267,16 +267,16 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { while (offset < mb->length-6) { if (!have_sync) { guchar byte = *(data+offset); - /*GST_DEBUG (0,"mpeg1mux::update_video_info: found #%d at %lu\n",byte,offset); */ + /*GST_DEBUG (0,"mpeg1mux::update_video_info: found #%d at %lu",byte,offset); */ offset++; /* if it's zero, increment the zero count */ if (byte == 0) { sync_zeros++; - /*GST_DEBUG (0,"mpeg1mux::update_video_info: found zero #%d at %lu\n",sync_zeros,offset-1); */ + /*GST_DEBUG (0,"mpeg1mux::update_video_info: found zero #%d at %lu",sync_zeros,offset-1); */ } /* if it's a one and we have two previous zeros, we have sync */ else if ((byte == 1) && (sync_zeros >= 2)) { - GST_DEBUG (0,"mpeg1mux::update_video_info: synced at %lu\n",offset-1); + GST_DEBUG (0,"mpeg1mux::update_video_info: synced at %lu",offset-1); have_sync = TRUE; sync_zeros = 0; } @@ -285,21 +285,21 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { /* then snag the chunk ID */ } else if (id == 0) { id = *(data+offset); - GST_DEBUG (0,"mpeg1mux::update_video_info: got id 0x%02lX\n",id); + GST_DEBUG (0,"mpeg1mux::update_video_info: got id 0x%02lX",id); id = (SYNCWORD_START<<8)+id; switch (id) { case SEQUENCE_HEADER: - GST_DEBUG (0,"mpeg1mux::update_video_info: sequence header\n"); + GST_DEBUG (0,"mpeg1mux::update_video_info: sequence header"); break; case GROUP_START: - GST_DEBUG (0,"mpeg1mux::update_video_info: group start\n"); + GST_DEBUG (0,"mpeg1mux::update_video_info: group start"); mb->info.video.group_order=0; break; case PICTURE_START: /* skip the first access unit */ if (mb->info.video.decoding_order != 0) { Mpeg1MuxTimecode *tc; - GST_DEBUG (0,"mpeg1mux::update_video_info: PTS %llu, DTS %llu, length %lu\n", mb->info.video.current_PTS, + GST_DEBUG (0,"mpeg1mux::update_video_info: PTS %llu, DTS %llu, length %lu", mb->info.video.current_PTS, mb->info.video.current_DTS, offset - mb->current_start-3); tc = (Mpeg1MuxTimecode *) g_malloc(sizeof(Mpeg1MuxTimecode)); @@ -321,7 +321,7 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { temp= (*(data+offset+1)<<8)+*(data+offset+2); temporal_reference = (temp & 0xffc0) >> 6; mb->info.video.current_type = (temp & 0x0038) >> 3; - GST_DEBUG (0,"mpeg1mux::update_video_info: picture start temporal_ref:%d type:%s Frame\n", temporal_reference, + GST_DEBUG (0,"mpeg1mux::update_video_info: picture start temporal_ref:%d type:%s Frame", temporal_reference, picture_types[mb->info.video.current_type-1]); mb->info.video.current_DTS = mb->info.video.decoding_order * mb->info.video.secs_per_frame * CLOCKS; @@ -335,7 +335,7 @@ static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb) { offset++; break; case SEQUENCE_END: - GST_DEBUG (0,"mpeg1mux::update_video_info: sequence end\n"); + GST_DEBUG (0,"mpeg1mux::update_video_info: sequence end"); break; } /* prepare for next sync */ @@ -360,7 +360,7 @@ static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb) { Mpeg1MuxTimecode *tc; - GST_DEBUG (0,"mpeg1mux::update_audio_info %lu %lu\n", mb->base, mb->scan_pos); + GST_DEBUG (0,"mpeg1mux::update_audio_info %lu %lu", mb->base, mb->scan_pos); if (mb->base == 0 && mb->scan_pos == 0) { id = GULONG_FROM_BE(*((gulong *)(data))); @@ -386,7 +386,7 @@ static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb) { } mb->info.audio.framesize = bpf; - GST_DEBUG (0,"mpeg1mux::update_audio_info: samples per second %d\n", samplerate_index); + GST_DEBUG (0,"mpeg1mux::update_audio_info: samples per second %d", samplerate_index); gst_getbits_init(&gb, NULL, NULL); gst_getbits_newbuf(&gb, data, mb->length); @@ -407,13 +407,13 @@ static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb) { mb->info.audio.original_copy = gst_getbits1(&gb); mb->info.audio.emphasis = gst_getbits2(&gb); - GST_DEBUG (0,"mpeg1mux::update_audio_info: layer %d\n", mb->info.audio.layer); - GST_DEBUG (0,"mpeg1mux::update_audio_info: bit_rate %d\n", mb->info.audio.bit_rate); - GST_DEBUG (0,"mpeg1mux::update_audio_info: frequency %d\n", mb->info.audio.frequency); + GST_DEBUG (0,"mpeg1mux::update_audio_info: layer %d", mb->info.audio.layer); + GST_DEBUG (0,"mpeg1mux::update_audio_info: bit_rate %d", mb->info.audio.bit_rate); + GST_DEBUG (0,"mpeg1mux::update_audio_info: frequency %d", mb->info.audio.frequency); mb->info.audio.samples_per_second = (double)dfrequency [mb->info.audio.frequency]; - GST_DEBUG (0,"mpeg1mux::update_audio_info: samples per second %g\n", mb->info.audio.samples_per_second); + GST_DEBUG (0,"mpeg1mux::update_audio_info: samples per second %g", mb->info.audio.samples_per_second); mb->info.audio.decoding_order=0; @@ -425,7 +425,7 @@ static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb) { mb->info.audio.current_PTS = mb->info.audio.decoding_order * samples [mb->info.audio.layer] / mb->info.audio.samples_per_second * 90. + startup_delay; - GST_DEBUG (0,"mpeg1mux::update_audio_info: PTS %llu, length %u\n", mb->info.audio.current_PTS, mb->info.audio.framesize); + GST_DEBUG (0,"mpeg1mux::update_audio_info: PTS %llu, length %u", mb->info.audio.current_PTS, mb->info.audio.framesize); tc->PTS = mb->info.audio.current_PTS; tc->DTS = mb->info.audio.current_PTS; mb->timecode_list = g_list_append(mb->timecode_list, tc); @@ -472,7 +472,7 @@ static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb) { mb->info.audio.samples_per_second * 90. ; tc->DTS = tc->PTS = mb->info.audio.current_PTS; - GST_DEBUG (0,"mpeg1mux::update_audio_info: PTS %llu, %llu length %lu\n", mb->info.audio.current_PTS, tc->PTS, tc->length); + GST_DEBUG (0,"mpeg1mux::update_audio_info: PTS %llu, %llu length %lu", mb->info.audio.current_PTS, tc->PTS, tc->length); mb->timecode_list = g_list_append(mb->timecode_list, tc); mb->info.audio.decoding_order++; diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index c6758854..a995791c 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -216,7 +216,7 @@ gst_system_encode_pick_streams (GList *mta, GstMPEG1SystemEncode *system_encode) { guint64 lowest = ~1; - GST_DEBUG (0, "pick_streams: %lld, %lld\n", system_encode->video_buffer->next_frame_time, + GST_DEBUG (0, "pick_streams: %lld, %lld", system_encode->video_buffer->next_frame_time, system_encode->audio_buffer->next_frame_time); if (system_encode->which_streams & STREAMS_VIDEO) { @@ -277,7 +277,7 @@ gst_system_encode_update_mta (GstMPEG1SystemEncode *system_encode, GList *mta, g GList *streams = g_list_first(mta); Mpeg1MuxBuffer *mb = (Mpeg1MuxBuffer *)streams->data; - GST_DEBUG (0,"system_encode::multiplex: update mta\n"); + GST_DEBUG (0,"system_encode::multiplex: update mta"); mpeg1mux_buffer_shrink(mb, size); @@ -314,7 +314,7 @@ gst_system_setup_multiplex (GstMPEG1SystemEncode *system_encode) (double)(system_encode->packets_per_pack-1.))) / (double)(system_encode->packets_per_pack) ); system_encode->data_rate = ceil(system_encode->dmux_rate/50.)*50; - GST_DEBUG (0,"system_encode::multiplex: data_rate %u, video_rate: %u, audio_rate: %u\n", system_encode->data_rate, + GST_DEBUG (0,"system_encode::multiplex: data_rate %u, video_rate: %u, audio_rate: %u", system_encode->data_rate, system_encode->video_rate, system_encode->audio_rate); system_encode->video_delay = (double)system_encode->video_delay_ms*(double)(CLOCKS/1000); @@ -326,7 +326,7 @@ gst_system_setup_multiplex (GstMPEG1SystemEncode *system_encode) video_tc = MPEG1MUX_BUFFER_FIRST_TIMECODE(system_encode->video_buffer); audio_tc = MPEG1MUX_BUFFER_FIRST_TIMECODE(system_encode->audio_buffer); - GST_DEBUG (0,"system_encode::video tc %lld, audio tc %lld:\n", video_tc->DTS, audio_tc->DTS); + GST_DEBUG (0,"system_encode::video tc %lld, audio tc %lld:", video_tc->DTS, audio_tc->DTS); system_encode->delay = ((double)system_encode->sectors_delay + ceil((double)video_tc->length/(double)system_encode->min_packet_data) + @@ -340,7 +340,7 @@ gst_system_setup_multiplex (GstMPEG1SystemEncode *system_encode) system_encode->video_delay = 0; system_encode->delay = 0; - GST_DEBUG (0,"system_encode::multiplex: delay %g, mux_rate: %lu\n", system_encode->delay, system_encode->mux_rate); + GST_DEBUG (0,"system_encode::multiplex: delay %g, mux_rate: %lu", system_encode->delay, system_encode->mux_rate); } static void @@ -360,7 +360,7 @@ gst_system_encode_multiplex(GstMPEG1SystemEncode *system_encode) g_mutex_lock(system_encode->lock); while (gst_system_encode_have_data(system_encode)) { - GST_DEBUG (0,"system_encode::multiplex: multiplexing\n"); + GST_DEBUG (0,"system_encode::multiplex: multiplexing"); if (!system_encode->have_setup) { gst_system_setup_multiplex(system_encode); @@ -396,7 +396,7 @@ gst_system_encode_multiplex(GstMPEG1SystemEncode *system_encode) tc = MPEG1MUX_BUFFER_FIRST_TIMECODE(mb); if (mb->new_frame) { - GST_DEBUG (0,"system_encode::multiplex: new frame\n"); + GST_DEBUG (0,"system_encode::multiplex: new frame"); if (tc->frame_type == FRAME_TYPE_AUDIO || tc->frame_type == FRAME_TYPE_IFRAME || tc->frame_type == FRAME_TYPE_PFRAME) { timestamps = TIMESTAMPS_PTS; } @@ -457,7 +457,7 @@ gst_system_encode_multiplex(GstMPEG1SystemEncode *system_encode) system_encode->bytes_output += GST_BUFFER_SIZE(outbuf); gst_pad_push(system_encode->srcpad,outbuf); - GST_DEBUG (0,"system_encode::multiplex: writing %02x\n", mb->stream_id); + GST_DEBUG (0,"system_encode::multiplex: writing %02x", mb->stream_id); } gst_info("system_encode::multiplex: data left in video buffer %lu\n", MPEG1MUX_BUFFER_SPACE(system_encode->video_buffer)); @@ -483,18 +483,18 @@ gst_system_encode_chain (GstPad *pad, GstBuffer *buf) data = GST_BUFFER_DATA(buf); size = GST_BUFFER_SIZE(buf); - GST_DEBUG (0,"system_encode::chain: system_encode: have buffer of size %lu\n",size); + GST_DEBUG (0,"system_encode::chain: system_encode: have buffer of size %lu",size); padname = GST_OBJECT_NAME (pad); if (strncmp(padname, "audio_", 6) == 0) { channel = atoi(&padname[6]); - GST_DEBUG (0,"gst_system_encode_chain: got audio buffer in from audio channel %02d\n", channel); + GST_DEBUG (0,"gst_system_encode_chain: got audio buffer in from audio channel %02d", channel); mpeg1mux_buffer_queue(system_encode->audio_buffer, buf); } else if (strncmp(padname, "video_", 6) == 0) { channel = atoi(&padname[6]); - GST_DEBUG (0,"gst_system_encode_chain: got video buffer in from video channel %02d\n", channel); + GST_DEBUG (0,"gst_system_encode_chain: got video buffer in from video channel %02d", channel); mpeg1mux_buffer_queue(system_encode->video_buffer, buf); -- cgit v1.2.1