summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/chart/gstchart.c20
-rw-r--r--gst/flx/gstflxdec.c2
-rw-r--r--gst/modplug/gstmodplug.cc2
-rw-r--r--gst/mpeg1sys/buffer.c56
-rw-r--r--gst/mpeg1sys/gstmpeg1systemencode.c22
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c24
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.c12
-rw-r--r--gst/mpegaudioparse/gstmp3types.c6
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c38
-rw-r--r--gst/playondemand/filter.func8
-rw-r--r--gst/smooth/gstsmooth.c2
-rw-r--r--gst/smoothwave/gstsmoothwave.c12
12 files changed, 102 insertions, 102 deletions
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c
index 331652e9..2d362d73 100644
--- a/gst/chart/gstchart.c
+++ b/gst/chart/gstchart.c
@@ -239,7 +239,7 @@ gst_chart_sinkconnect (GstPad *pad, GstCaps *caps)
chart->samplerate = gst_caps_get_int (caps, "rate");
chart->samples_between_frames = chart->samplerate / chart->framerate;
- GST_DEBUG (0, "CHART: new sink caps: rate %d\n",
+ GST_DEBUG (0, "CHART: new sink caps: rate %d",
chart->samplerate);
/*gst_chart_sync_parms (chart); */
/* */
@@ -260,7 +260,7 @@ draw_chart_16bpp(guchar * output, gint width, gint height,
guint16 *colstart;
gint16 * in;
- GST_DEBUG (0, "CHART: drawing frame to %p, width = %d, height = %d, src_data = %p, src_size = %d\n",
+ GST_DEBUG (0, "CHART: drawing frame to %p, width = %d, height = %d, src_data = %p, src_size = %d",
output, width, height, src_data, src_size);
for (colstart = (guint16 *)output, in = (gint16 *)src_data, i = 0;
@@ -319,14 +319,14 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin)
chart = GST_CHART(GST_OBJECT_PARENT (pad));
g_return_if_fail (chart != NULL);
- GST_DEBUG (0, "CHART: chainfunc called\n");
+ GST_DEBUG (0, "CHART: chainfunc called");
samples_in = GST_BUFFER_SIZE (bufin) / sizeof(gint16);
datain = (gint16 *) (GST_BUFFER_DATA (bufin));
- GST_DEBUG (0, "input buffer has %d samples\n", samples_in);
+ GST_DEBUG (0, "input buffer has %d samples", samples_in);
if (chart->next_time <= GST_BUFFER_TIMESTAMP (bufin)) {
chart->next_time = GST_BUFFER_TIMESTAMP (bufin);
- GST_DEBUG (0, "in: %lld\n", GST_BUFFER_TIMESTAMP (bufin));
+ GST_DEBUG (0, "in: %lld", GST_BUFFER_TIMESTAMP (bufin));
}
chart->samples_since_last_frame += samples_in;
@@ -341,7 +341,7 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin)
dataout = g_malloc (sizeout);
GST_BUFFER_SIZE(bufout) = sizeout;
GST_BUFFER_DATA(bufout) = dataout;
- GST_DEBUG (0, "CHART: made new buffer: size %d, width %d, height %d\n",
+ GST_DEBUG (0, "CHART: made new buffer: size %d, width %d, height %d",
sizeout, chart->width, chart->height);
/* take data and draw to new buffer */
@@ -355,7 +355,7 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin)
/* Check if we need to renegotiate size. */
if (chart->first_buffer) {
- GST_DEBUG (0, "making new pad\n");
+ GST_DEBUG (0, "making new pad");
if (!gst_pad_try_set_caps (chart->srcpad,
GST_CAPS_NEW (
"chartsrc",
@@ -377,17 +377,17 @@ gst_chart_chain (GstPad *pad, GstBuffer *bufin)
chart->first_buffer = FALSE;
}
- GST_DEBUG (0, "CHART: outputting buffer\n");
+ GST_DEBUG (0, "CHART: outputting buffer");
/* output buffer */
GST_BUFFER_FLAG_SET (bufout, GST_BUFFER_READONLY);
gst_pad_push (chart->srcpad, bufout);
}
} else {
- GST_DEBUG (0, "CHART: skipping buffer\n");
+ GST_DEBUG (0, "CHART: skipping buffer");
gst_buffer_unref(bufin);
}
- GST_DEBUG (0, "CHART: exiting chainfunc\n");
+ GST_DEBUG (0, "CHART: exiting chainfunc");
}
static void
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 98dda1f3..eeeb9c5a 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -465,7 +465,7 @@ gst_flxdec_loop (GstElement *element)
g_return_if_fail (element != NULL);
g_return_if_fail (GST_IS_FLXDEC(element));
- GST_DEBUG (0, "entering loop function\n");
+ GST_DEBUG (0, "entering loop function");
flxdec = GST_FLXDEC(element);
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index f03fe12b..5c1b50bf 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -387,7 +387,7 @@ GstModPlug *modplug;
modplug = GST_MODPLUG (element);
- GST_DEBUG (0,"state pending %d\n", GST_STATE_PENDING (element));
+ GST_DEBUG (0,"state pending %d", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */
/* if (GST_STATE_PENDING (element) == GST_STATE_READY)
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);
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index 4ca8e3f9..d56f09dc 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -207,7 +207,7 @@ mp1videoparse_find_next_gop (Mp1VideoParse *mp1videoparse, GstBuffer *buf)
static void
gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse)
{
- GST_DEBUG (0,"mp1videoparse: flushing\n");
+ GST_DEBUG (0,"mp1videoparse: flushing");
if (mp1videoparse->partialbuf) {
gst_buffer_unref(mp1videoparse->partialbuf);
mp1videoparse->partialbuf= NULL;
@@ -269,17 +269,17 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
data = GST_BUFFER_DATA(mp1videoparse->partialbuf);
size = GST_BUFFER_SIZE(mp1videoparse->partialbuf);
- GST_DEBUG (0,"mp1videoparse: received buffer of %ld bytes %lld\n",size, GST_BUFFER_TIMESTAMP(buf));
+ GST_DEBUG (0,"mp1videoparse: received buffer of %ld bytes %lld",size, GST_BUFFER_TIMESTAMP(buf));
head = GULONG_FROM_BE(*((gulong *)data));
- GST_DEBUG (0,"mp1videoparse: head is %08lx\n", head);
+ GST_DEBUG (0,"mp1videoparse: head is %08lx", head);
if (!mp1videoparse_valid_sync(head) || mp1videoparse->need_resync) {
sync_pos = mp1videoparse_find_next_gop(mp1videoparse, mp1videoparse->partialbuf);
if (sync_pos != -1) {
mp1videoparse->need_resync = FALSE;
- GST_DEBUG (0,"mp1videoparse: found new gop at %d\n", sync_pos);
+ GST_DEBUG (0,"mp1videoparse: found new gop at %d", sync_pos);
if (sync_pos != 0) {
temp = gst_buffer_create_sub(mp1videoparse->partialbuf, sync_pos, size-sync_pos);
@@ -292,7 +292,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
}
}
else {
- GST_DEBUG (0,"mp1videoparse: could not sync\n");
+ GST_DEBUG (0,"mp1videoparse: could not sync");
gst_buffer_unref(mp1videoparse->partialbuf);
mp1videoparse->partialbuf = NULL;
return;
@@ -306,7 +306,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
sync_state = 0;
have_sync = FALSE;
- GST_DEBUG (0,"mp1videoparse: searching sync\n");
+ GST_DEBUG (0,"mp1videoparse: searching sync");
while (offset < size-1) {
sync_byte = *(data + offset);
@@ -315,7 +315,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
sync_state++;
}
else if ((sync_byte == 1) && (sync_state >=2)) {
- GST_DEBUG (0,"mp1videoparse: code 0x000001%02x\n",data[offset+1]);
+ GST_DEBUG (0,"mp1videoparse: code 0x000001%02x",data[offset+1]);
if (data[offset+1] == (PICTURE_START_CODE & 0xff)) {
mp1videoparse->picture_in_buffer++;
if (mp1videoparse->picture_in_buffer == 1) {
@@ -327,7 +327,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
break;
}
else {
- GST_DEBUG (0,"mp1videoparse: %d in buffer\n", mp1videoparse->picture_in_buffer);
+ GST_DEBUG (0,"mp1videoparse: %d in buffer", mp1videoparse->picture_in_buffer);
g_assert_not_reached();
}
}
@@ -341,7 +341,7 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
if (have_sync) {
offset -= 2;
- GST_DEBUG (0,"mp1videoparse: synced at %ld code 0x000001%02x\n",offset,data[offset+3]);
+ GST_DEBUG (0,"mp1videoparse: synced at %ld code 0x000001%02x",offset,data[offset+3]);
outbuf = gst_buffer_create_sub(mp1videoparse->partialbuf, 0, offset+4);
g_assert(outbuf != NULL);
@@ -352,9 +352,9 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
mp1videoparse->in_flush = FALSE;
}
- GST_DEBUG (0,"mp1videoparse: pushing %d bytes %llu\n", GST_BUFFER_SIZE(outbuf), GST_BUFFER_TIMESTAMP(outbuf));
+ GST_DEBUG (0,"mp1videoparse: pushing %d bytes %llu", GST_BUFFER_SIZE(outbuf), GST_BUFFER_TIMESTAMP(outbuf));
gst_pad_push(outpad, outbuf);
- GST_DEBUG (0,"mp1videoparse: pushing done\n");
+ GST_DEBUG (0,"mp1videoparse: pushing done");
mp1videoparse->picture_in_buffer = 0;
temp = gst_buffer_create_sub(mp1videoparse->partialbuf, offset, size-offset);
@@ -374,7 +374,7 @@ gst_mp1videoparse_change_state (GstElement *element)
g_return_val_if_fail(GST_IS_MP1VIDEOPARSE(element),GST_STATE_FAILURE);
mp1videoparse = GST_MP1VIDEOPARSE(element);
- GST_DEBUG (0,"mp1videoparse: state pending %d\n", GST_STATE_PENDING(element));
+ GST_DEBUG (0,"mp1videoparse: state pending %d", GST_STATE_PENDING(element));
* if going down into NULL state, clear out buffers *
if (GST_STATE_PENDING(element) == GST_STATE_READY) {
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 2fd853c5..4aebfa6c 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -197,7 +197,7 @@ gst_mpeg2subt_parse_header (GstMpeg2Subt *mpeg2subt)
mpeg2subt->color[2] = yuv_color[buffer [i+2] >> 4];
mpeg2subt->color[3] = yuv_color[buffer [i+2] & 0xf];
mpeg2subt->color[4] = yuv_color[0xf];
- GST_DEBUG (0,"mpeg2subt: colors %d %d %d %d\n", mpeg2subt->color[0],mpeg2subt->color[1],mpeg2subt->color[2],mpeg2subt->color[3]);
+ GST_DEBUG (0,"mpeg2subt: colors %d %d %d %d", mpeg2subt->color[0],mpeg2subt->color[1],mpeg2subt->color[2],mpeg2subt->color[3]);
i += 3;
break;
case 0x04: /* transparency palette */
@@ -205,7 +205,7 @@ gst_mpeg2subt_parse_header (GstMpeg2Subt *mpeg2subt)
mpeg2subt->trans[2] = buffer [i+1] & 0xf;
mpeg2subt->trans[1] = buffer [i+2] >> 4;
mpeg2subt->trans[0] = buffer [i+2] & 0xf;
- GST_DEBUG (0,"mpeg2subt: transparency %d %d %d %d\n", mpeg2subt->trans[0],mpeg2subt->trans[1],mpeg2subt->trans[2],mpeg2subt->trans[3]);
+ GST_DEBUG (0,"mpeg2subt: transparency %d %d %d %d", mpeg2subt->trans[0],mpeg2subt->trans[1],mpeg2subt->trans[2],mpeg2subt->trans[3]);
i += 3;
break;
case 0x05: /* image coordinates */
@@ -225,7 +225,7 @@ gst_mpeg2subt_parse_header (GstMpeg2Subt *mpeg2subt)
*/
mpeg2subt->duration = (((buffer[i+1] << 8) + buffer[i+2]) * 25)/90;
- GST_DEBUG (0,"duration %d\n", mpeg2subt->duration);
+ GST_DEBUG (0,"duration %d", mpeg2subt->duration);
if ( (buffer[i+3] != buffer[mpeg2subt->data_size+2])
|| (buffer[i+4] != buffer[mpeg2subt->data_size+3]) )
@@ -279,7 +279,7 @@ gst_mpeg2subt_merge_title (GstMpeg2Subt *mpeg2subt, GstBuffer *buf)
offset[1] = mpeg2subt->offset[1];
#define get_nibble() get_nibble (buffer, offset, id, &aligned)
- GST_DEBUG (0,"mpeg2subt: merging subtitle\n");
+ GST_DEBUG (0,"mpeg2subt: merging subtitle");
while ((offset[1] < mpeg2subt->data_size + 2) && (y < height))
{
@@ -361,7 +361,7 @@ gst_mpeg2subt_chain_subtitle (GstPad *pad, GstBuffer *buf)
mpeg2subt->have_title = FALSE;
}
- GST_DEBUG (0,"presentation time %llu\n", GST_BUFFER_TIMESTAMP(buf));
+ GST_DEBUG (0,"presentation time %llu", GST_BUFFER_TIMESTAMP(buf));
/* deal with partial frame from previous buffer */
if (mpeg2subt->partialbuf) {
@@ -381,7 +381,7 @@ gst_mpeg2subt_chain_subtitle (GstPad *pad, GstBuffer *buf)
if (mpeg2subt->packet_size == size) {
- GST_DEBUG (0,"mpeg2subt: subtitle packet size %d, current size %ld\n", mpeg2subt->packet_size, size);
+ GST_DEBUG (0,"mpeg2subt: subtitle packet size %d, current size %ld", mpeg2subt->packet_size, size);
mpeg2subt->data_size = GUINT16_FROM_BE(*(guint16 *)(data+2));
diff --git a/gst/mpegaudioparse/gstmp3types.c b/gst/mpegaudioparse/gstmp3types.c
index fd1fb91a..670cfba7 100644
--- a/gst/mpegaudioparse/gstmp3types.c
+++ b/gst/mpegaudioparse/gstmp3types.c
@@ -37,7 +37,7 @@ mp3_typefind(GstBuffer *buf, gpointer private)
data = GST_BUFFER_DATA(buf);
- GST_DEBUG (0,"mp3typefind: typefind\n");
+ GST_DEBUG (0,"mp3typefind: typefind");
/* check for ID3 Tag first and forward ID3 length */
if (!memcmp (data, "ID3", 3))
@@ -51,11 +51,11 @@ mp3_typefind(GstBuffer *buf, gpointer private)
((skip & 0x007f0000) >> 2) |
((skip & 0x00007f00) >> 1) |
((skip & 0x0000007f) >> 0)) + 4;
- GST_DEBUG (0, "mp3typefind: detected ID3 Tag with %u bytes\n", skip + 6);
+ GST_DEBUG (0, "mp3typefind: detected ID3 Tag with %u bytes", skip + 6);
/* return if buffer is not big enough */
if (GST_BUFFER_SIZE (buf) < skip + 10)
{
- GST_DEBUG (0, "mp3typefind: buffer too small (%d) to go on typefinding\n", skip + 6);
+ GST_DEBUG (0, "mp3typefind: buffer too small (%d) to go on typefinding", skip + 6);
return NULL;
}
data += skip;
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 96640d68..65f1b279 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -242,7 +242,7 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad));
- GST_DEBUG (0,"mp3parse: received buffer of %d bytes\n",GST_BUFFER_SIZE(buf));
+ GST_DEBUG (0,"mp3parse: received buffer of %d bytes",GST_BUFFER_SIZE(buf));
last_ts = GST_BUFFER_TIMESTAMP(buf);
@@ -273,12 +273,12 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
while (offset < size-4) {
int skipped = 0;
- GST_DEBUG (0,"mp3parse: offset %ld, size %ld \n",offset, size);
+ GST_DEBUG (0,"mp3parse: offset %ld, size %ld ",offset, size);
/* search for a possible start byte */
for (;((data[offset] != 0xff) && (offset < size));offset++) skipped++;
if (skipped && !mp3parse->in_flush) {
- GST_DEBUG (0,"mp3parse: **** now at %ld skipped %d bytes\n",offset,skipped);
+ GST_DEBUG (0,"mp3parse: **** now at %ld skipped %d bytes",offset,skipped);
}
/* construct the header word */
header = GULONG_FROM_BE(*((gulong *)(data+offset)));
@@ -305,12 +305,12 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
if ((size-offset)<(bpf+4)) { if (mp3parse->in_flush) break; } /* wait until we have the the entire current frame as well as the next frame header */
header2 = GULONG_FROM_BE(*((gulong *)(data+offset+bpf)));
- GST_DEBUG(0,"mp3parse: header=%08lX, header2=%08lX, bpf=%d\n", header, header2, bpf );
+ GST_DEBUG(0,"mp3parse: header=%08lX, header2=%08lX, bpf=%d", header, header2, bpf );
#define HDRMASK ~( (0xF<<12)/*bitrate*/ | (1<<9)/*padding*/ | (3<<4)/*mode extension*/ ) /* mask the bits which are allowed to differ between frames */
if ( (header2&HDRMASK) != (header&HDRMASK) ) { /* require 2 matching headers in a row */
- GST_DEBUG(0,"mp3parse: next header doesn't match (header=%08lX, header2=%08lX, bpf=%d)\n", header, header2, bpf );
+ GST_DEBUG(0,"mp3parse: next header doesn't match (header=%08lX, header2=%08lX, bpf=%d)", header, header2, bpf );
offset++; /* This frame is invalid. Start looking for a valid frame at the next position in the stream */
continue;
}
@@ -319,7 +319,7 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
/* if we don't have the whole frame... */
if ((size - offset) < bpf) {
- GST_DEBUG (0,"mp3parse: partial buffer needed %ld < %d \n",(size-offset), bpf);
+ GST_DEBUG (0,"mp3parse: partial buffer needed %ld < %d ",(size-offset), bpf);
break;
} else {
@@ -327,7 +327,7 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
offset += bpf;
if (mp3parse->skip == 0) {
- GST_DEBUG (0,"mp3parse: pushing buffer of %d bytes\n",GST_BUFFER_SIZE(outbuf));
+ GST_DEBUG (0,"mp3parse: pushing buffer of %d bytes",GST_BUFFER_SIZE(outbuf));
if (mp3parse->in_flush) {
/* FIXME do some sort of flush event */
mp3parse->in_flush = FALSE;
@@ -336,21 +336,21 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf)
gst_pad_push(mp3parse->srcpad,outbuf);
}
else {
- GST_DEBUG (0,"mp3parse: skipping buffer of %d bytes\n",GST_BUFFER_SIZE(outbuf));
+ GST_DEBUG (0,"mp3parse: skipping buffer of %d bytes",GST_BUFFER_SIZE(outbuf));
gst_buffer_unref(outbuf);
mp3parse->skip--;
}
}
} else {
offset++;
- if (!mp3parse->in_flush) GST_DEBUG (0,"mp3parse: *** wrong header, skipping byte (FIXME?)\n");
+ if (!mp3parse->in_flush) GST_DEBUG (0,"mp3parse: *** wrong header, skipping byte (FIXME?)");
}
}
/* if we have processed this block and there are still */
/* bytes left not in a partial block, copy them over. */
if (size-offset > 0) {
glong remainder = (size - offset);
- GST_DEBUG (0,"mp3parse: partial buffer needed %ld for trailing bytes\n",remainder);
+ GST_DEBUG (0,"mp3parse: partial buffer needed %ld for trailing bytes",remainder);
outbuf = gst_buffer_create_sub(mp3parse->partialbuf,offset,remainder);
gst_buffer_unref(mp3parse->partialbuf);
@@ -408,28 +408,28 @@ bpf_from_header (GstMPEGAudioParse *parse, unsigned long header)
static gboolean
head_check (unsigned long head)
{
- GST_DEBUG (0,"checking mp3 header 0x%08lx\n",head);
+ GST_DEBUG (0,"checking mp3 header 0x%08lx",head);
/* if it's not a valid sync */
if ((head & 0xffe00000) != 0xffe00000) {
- GST_DEBUG (0,"invalid sync\n");return FALSE; }
+ GST_DEBUG (0,"invalid sync");return FALSE; }
/* if it's an invalid MPEG version */
if (((head >> 19) & 3) == 0x1) {
- GST_DEBUG (0,"invalid MPEG version\n");return FALSE; }
+ GST_DEBUG (0,"invalid MPEG version");return FALSE; }
/* if it's an invalid layer */
if (!((head >> 17) & 3)) {
- GST_DEBUG (0,"invalid layer\n");return FALSE; }
+ GST_DEBUG (0,"invalid layer");return FALSE; }
/* if it's an invalid bitrate */
if (((head >> 12) & 0xf) == 0x0) {
- GST_DEBUG (0,"invalid bitrate\n");return FALSE; }
+ GST_DEBUG (0,"invalid bitrate");return FALSE; }
if (((head >> 12) & 0xf) == 0xf) {
- GST_DEBUG (0,"invalid bitrate\n");return FALSE; }
+ GST_DEBUG (0,"invalid bitrate");return FALSE; }
/* if it's an invalid samplerate */
if (((head >> 10) & 0x3) == 0x3) {
- GST_DEBUG (0,"invalid samplerate\n");return FALSE; }
+ GST_DEBUG (0,"invalid samplerate");return FALSE; }
if ((head & 0xffff0000) == 0xfffe0000) {
- GST_DEBUG (0,"invalid sync\n");return FALSE; }
+ GST_DEBUG (0,"invalid sync");return FALSE; }
if (head & 0x00000002) {
- GST_DEBUG (0,"invalid emphasis\n");return FALSE; }
+ GST_DEBUG (0,"invalid emphasis");return FALSE; }
return TRUE;
}
diff --git a/gst/playondemand/filter.func b/gst/playondemand/filter.func
index 2c11717b..a1128e20 100644
--- a/gst/playondemand/filter.func
+++ b/gst/playondemand/filter.func
@@ -9,7 +9,7 @@ num_filter = filter->buffer_size / sizeof(_TYPE_);
/* see if we've got any events coming through ... */
do {
- GST_DEBUG(0, "--- going to events\n");
+ GST_DEBUG(0, "--- going to events");
while (! filter->eos && GST_IS_EVENT(in)) {
if (GST_EVENT_TYPE(in) == GST_EVENT_EOS) {
@@ -24,7 +24,7 @@ do {
/******************************************************************************/
/* first handle data from the input buffer. */
- GST_DEBUG(0, "--- done with events, going to input\n");
+ GST_DEBUG(0, "--- done with events, going to input");
/* only update the input if there hasn't been an eos yet. */
if (! filter->eos) {
@@ -70,7 +70,7 @@ do {
/******************************************************************************/
/* now handle output data. */
- GST_DEBUG(0, "--- done with input, going to output\n");
+ GST_DEBUG(0, "--- done with input, going to output");
data_out = (_TYPE_ *) GST_BUFFER_DATA(out);
num_out = GST_BUFFER_SIZE(out) / sizeof(_TYPE_);
@@ -102,7 +102,7 @@ do {
}
}
- GST_DEBUG(0, "--- done with output, pushing buffer %p\n", out);
+ GST_DEBUG(0, "--- done with output, pushing buffer %p", out);
gst_pad_push(filter->srcpad, out);
diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c
index d88fde08..7dc5c7e3 100644
--- a/gst/smooth/gstsmooth.c
+++ b/gst/smooth/gstsmooth.c
@@ -233,7 +233,7 @@ gst_smooth_chain (GstPad *pad, GstBuffer *buf)
data = GST_BUFFER_DATA (buf);
size = GST_BUFFER_SIZE (buf);
- GST_DEBUG (0,"smooth: have buffer of %d\n", GST_BUFFER_SIZE (buf));
+ GST_DEBUG (0,"smooth: have buffer of %d", GST_BUFFER_SIZE (buf));
outbuf = gst_buffer_new();
GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (buf));
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 4fa855a4..48d32c4b 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -124,12 +124,12 @@ gst_smoothwave_init (GstSmoothWave *smoothwave)
/* gtk_widget_set_default_colormap (gdk_rgb_get_cmap()); */
/* gtk_widget_set_default_visual (gdk_rgb_get_visual()); */
-/* GST_DEBUG (0,"creating palette\n"); */
+/* GST_DEBUG (0,"creating palette"); */
for (i=0;i<256;i++)
palette[i] = (i << 16) || (i << 8);
-/* GST_DEBUG (0,"creating cmap\n"); */
+/* GST_DEBUG (0,"creating cmap"); */
smoothwave->cmap = gdk_rgb_cmap_new(palette,256);
-/* GST_DEBUG (0,"created cmap\n"); */
+/* GST_DEBUG (0,"created cmap"); */
/* gtk_widget_set_default_colormap (smoothwave->cmap); */
smoothwave->image = gtk_drawing_area_new();
@@ -175,7 +175,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
qheight = smoothwave->height/4;
-/* GST_DEBUG (0,"traversing %d\n",smoothwave->width); */
+/* GST_DEBUG (0,"traversing %d",smoothwave->width); */
for (i=0;i<MAX(smoothwave->width,samplecount);i++) {
gint16 y1 = (gint32)(samples[i*2] * qheight) / 32768 +
qheight;
@@ -194,8 +194,8 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
ptr++;
}
-/* GST_DEBUG (0,"drawing\n"); */
-/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);\n",
+/* GST_DEBUG (0,"drawing"); */
+/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);",
smoothwave->image->window,
smoothwave->image->style->fg_gc[GTK_STATE_NORMAL],
0,0,smoothwave->width,smoothwave->height,