From 90da904f1e435812ce245928b80cfd325785ff37 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 29 Jun 2003 19:46:12 +0000 Subject: [PATCH] compatibility fix for new GST_DEBUG stuff. Original commit message from CVS: compatibility fix for new GST_DEBUG stuff. Includes fixes for missing includes for config.h and unistd.h I only ensured for plugins I can build that they work, so if some of them are still broken, you gotta fix them yourselves unfortunately. --- common | 2 +- configure.ac | 2 - ext/aalib/gstaasink.c | 7 +- ext/dv/gstdvdec.c | 3 + ext/esd/esdmon.c | 18 ++-- ext/esd/esdsink.c | 16 +-- ext/flac/gstflacdec.c | 41 ++++---- ext/flac/gstflacenc.c | 3 + ext/gdk_pixbuf/gstgdkpixbuf.c | 3 + ext/jpeg/gstjpegdec.c | 31 +++--- ext/jpeg/gstjpegenc.c | 33 ++++--- ext/ladspa/gstladspa.c | 44 ++++----- ext/libpng/gstpngenc.c | 5 +- ext/mikmod/gstmikmod.c | 5 +- ext/raw1394/gst1394.c | 3 + ext/raw1394/gstdv1394src.c | 26 ++--- ext/shout2/gstshout2.c | 5 +- ext/speex/gstspeexdec.c | 5 +- ext/speex/gstspeexenc.c | 3 + gst/audiofx/audiowsincband.c | 7 +- gst/audiofx/audiowsinclimit.c | 5 +- gst/auparse/gstauparse.c | 7 +- gst/avi/gstavidemux.c | 175 +++++++++++++++++---------------- gst/avi/gstavimux.c | 11 ++- gst/cutter/gstcutter.c | 15 +-- gst/debug/efence.c | 17 ++-- gst/effectv/gstaging.c | 3 + gst/effectv/gstdice.c | 3 + gst/effectv/gstedge.c | 3 + gst/effectv/gstquark.c | 3 + gst/effectv/gstrev.c | 3 + gst/effectv/gstshagadelic.c | 3 + gst/effectv/gstvertigo.c | 3 + gst/effectv/gstwarp.c | 3 + gst/flx/gstflxdec.c | 5 +- gst/goom/gstgoom.c | 9 +- gst/law/alaw.c | 3 + gst/law/mulaw.c | 3 + gst/level/gstlevel.c | 3 + gst/median/gstmedian.c | 5 +- gst/monoscope/gstmonoscope.c | 13 ++- gst/qtdemux/qtdemux.c | 55 ++++++----- gst/rtp/gstrtpL16depay.c | 7 +- gst/rtp/gstrtpL16enc.c | 9 +- gst/rtp/gstrtpL16parse.c | 7 +- gst/rtp/gstrtpL16pay.c | 9 +- gst/smoothwave/gstsmoothwave.c | 15 +-- gst/smpte/gstsmpte.c | 3 + gst/spectrum/gstspectrum.c | 3 + gst/udp/gstudpsink.c | 5 +- gst/udp/gstudpsrc.c | 5 + gst/videocrop/gstvideocrop.c | 3 + gst/videoflip/gstvideoflip.c | 25 ++--- gst/videoflip/videoflip.c | 8 +- gst/wavenc/gstwavenc.c | 3 + gst/wavparse/gstwavparse.c | 31 +++--- m4/as-slurp-ffmpeg.m4 | 12 +-- sys/oss/gstosscommon.c | 70 ++++++------- sys/oss/gstossgst.c | 11 ++- sys/oss/gstosssink.c | 8 +- sys/oss/gstosssrc.c | 9 +- sys/v4l2/gstv4l2src.c | 2 +- sys/v4l2/v4l2-overlay_calls.c | 2 +- sys/v4l2/v4l2_calls.c | 2 +- sys/v4l2/v4l2src_calls.c | 4 +- 65 files changed, 515 insertions(+), 350 deletions(-) diff --git a/common b/common index 4e379694ae..2a3efdc282 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4e379694ae9ff9843d65cf08928642eea44abdf8 +Subproject commit 2a3efdc282fb1ecfd2720dea40523b3441f10fed diff --git a/configure.ac b/configure.ac index 6da875ee4a..4c953d923c 100644 --- a/configure.ac +++ b/configure.ac @@ -968,8 +968,6 @@ dnl ###################################################################### dnl # Check command line parameters, and set shell variables accordingly # dnl ###################################################################### -GST_DEBUGINFO - AC_ARG_ENABLE(libmmx, AC_HELP_STRING([--enable-libmmx],[use libmmx, if available]), [case "${enableval}" in diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 49fad7296e..6a9fbd5f3b 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -246,7 +249,7 @@ gst_aasink_sinkconnect (GstPad *pad, GstCaps *caps) /* FIXME aasink->format is never set */ - GST_DEBUG (0, "aasink: setting %08lx (" GST_FOURCC_FORMAT ")", + GST_DEBUG ("aasink: setting %08lx (" GST_FOURCC_FORMAT ")", aasink->format, GST_FOURCC_ARGS(aasink->format)); g_signal_emit( G_OBJECT (aasink), gst_aasink_signals[SIGNAL_HAVE_SIZE], 0, @@ -346,7 +349,7 @@ gst_aasink_chain (GstPad *pad, GstBuffer *buf) aa_imgwidth (aasink->context), /* dw */ aa_imgheight (aasink->context)); /* dh */ - GST_DEBUG (0,"videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf)); + GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf)); if (aasink->clock) { GstClockID id = gst_clock_new_single_shot_id (aasink->clock, GST_BUFFER_TIMESTAMP(buf)); diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index f7bae7bc72..da53e4d28a 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include /* First, include the header file for the plugin, to bring in the diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index 5d8cd9fc8d..569942dbc6 100644 --- a/ext/esd/esdmon.c +++ b/ext/esd/esdmon.c @@ -20,8 +20,12 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include +#include #define GST_TYPE_ESDMON \ (gst_esdmon_get_type()) @@ -278,7 +282,7 @@ gst_esdmon_get (GstPad *pad) g_return_val_if_fail (pad != NULL, NULL); esdmon = GST_ESDMON(gst_pad_get_parent (pad)); - GST_DEBUG (GST_CAT_PLUGIN_INFO, "attempting to read something from esdmon"); + GST_DEBUG ("attempting to read something from esdmon"); buf = gst_buffer_new (); g_return_val_if_fail (buf, NULL); @@ -324,7 +328,7 @@ gst_esdmon_get (GstPad *pad) if (esdmon->depth == 16) readsamples /= 2; esdmon->samples_since_basetime += readsamples; - GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from esdmon of %ld bytes, timestamp %" G_GINT64_FORMAT, readbytes, GST_BUFFER_TIMESTAMP (buf)); + GST_DEBUG ("pushed buffer from esdmon of %ld bytes, timestamp %" G_GINT64_FORMAT, readbytes, GST_BUFFER_TIMESTAMP (buf)); return buf; } @@ -442,21 +446,21 @@ gst_esdmon_open_audio (GstEsdmon *src) if (src->depth == 16) esdformat |= ESD_BITS16; else if (src->depth == 8) esdformat |= ESD_BITS8; else { - GST_DEBUG (0, "esdmon: invalid bit depth (%d)", src->depth); + GST_DEBUG ("esdmon: invalid bit depth (%d)", src->depth); return FALSE; } if (src->channels == 2) esdformat |= ESD_STEREO; else if (src->channels == 1) esdformat |= ESD_MONO; else { - GST_DEBUG (0, "esdmon: invalid number of channels (%d)", src->channels); + GST_DEBUG ("esdmon: invalid number of channels (%d)", src->channels); return FALSE; } - GST_DEBUG (0, "esdmon: attempting to open connection to esound server"); + GST_DEBUG ("esdmon: attempting to open connection to esound server"); src->fd = esd_monitor_stream(esdformat, src->frequency, src->host, connname); if ( src->fd < 0 ) { - GST_DEBUG (0, "esdmon: can't open connection to esound server"); + GST_DEBUG ("esdmon: can't open connection to esound server"); return FALSE; } @@ -475,7 +479,7 @@ gst_esdmon_close_audio (GstEsdmon *src) GST_FLAG_UNSET (src, GST_ESDMON_OPEN); - GST_DEBUG (0, "esdmon: closed sound device"); + GST_DEBUG ("esdmon: closed sound device"); } static GstElementStateReturn diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index 673aee6ea6..af28a1cf21 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -20,8 +20,12 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "esdsink.h" #include +#include /* elementfactory information */ static GstElementDetails esdsink_details = { @@ -197,7 +201,7 @@ gst_esdsink_chain (GstPad *pad, GstBuffer *buf) if (GST_BUFFER_DATA (buf) != NULL) { if (!esdsink->mute && esdsink->fd >= 0) { - GST_DEBUG (0, "esdsink: fd=%d data=%p size=%d", + GST_DEBUG ("esdsink: fd=%d data=%p size=%d", esdsink->fd, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); write (esdsink->fd, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); } @@ -288,21 +292,21 @@ gst_esdsink_open_audio (GstEsdsink *sink) if (sink->depth == 16) esdformat |= ESD_BITS16; else if (sink->depth == 8) esdformat |= ESD_BITS8; else { - GST_DEBUG (0, "esdsink: invalid bit depth (%d)", sink->depth); + GST_DEBUG ("esdsink: invalid bit depth (%d)", sink->depth); return FALSE; } if (sink->channels == 2) esdformat |= ESD_STEREO; else if (sink->channels == 1) esdformat |= ESD_MONO; else { - GST_DEBUG (0, "esdsink: invalid number of channels (%d)", sink->channels); + GST_DEBUG ("esdsink: invalid number of channels (%d)", sink->channels); return FALSE; } - GST_DEBUG (0, "esdsink: attempting to open connection to esound server"); + GST_DEBUG ("esdsink: attempting to open connection to esound server"); sink->fd = esd_play_stream_fallback(esdformat, sink->frequency, sink->host, connname); if ( sink->fd < 0 ) { - GST_DEBUG (0, "esdsink: can't open connection to esound server"); + GST_DEBUG ("esdsink: can't open connection to esound server"); return FALSE; } @@ -318,7 +322,7 @@ gst_esdsink_close_audio (GstEsdsink *sink) close(sink->fd); sink->fd = -1; - GST_DEBUG (0, "esdsink: closed sound device"); + GST_DEBUG ("esdsink: closed sound device"); } static GstElementStateReturn diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 9fc05dc80c..b439f044a3 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -211,7 +214,7 @@ gst_flacdec_update_metadata (FlacDec *flacdec, const FLAC__StreamMetadata *metad number_of_comments = metadata->data.vorbis_comment.num_comments; value = NULL; - GST_DEBUG (GST_CAT_CAPS, "%d tag(s) found", number_of_comments); + GST_DEBUG ("%d tag(s) found", number_of_comments); for (cursor = 0; cursor < number_of_comments; cursor++) { str_ptr = metadata->data.vorbis_comment.comments[cursor].entry; @@ -225,7 +228,7 @@ gst_flacdec_update_metadata (FlacDec *flacdec, const FLAC__StreamMetadata *metad entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, value); gst_props_add_entry (props, (GstPropsEntry *) entry); - GST_DEBUG (GST_CAT_CAPS, "%s : %s", name, value); + GST_DEBUG ("%s : %s", name, value); g_free (name); g_free (value); @@ -286,7 +289,7 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder, break; } - GST_DEBUG (0, error); + GST_DEBUG (error); gst_element_error (GST_ELEMENT (flacdec), error); } @@ -299,7 +302,7 @@ gst_flacdec_seek (const FLAC__SeekableStreamDecoder *decoder, flacdec = GST_FLACDEC (client_data); - GST_DEBUG (0, "seek %" G_GINT64_FORMAT, position); + GST_DEBUG ("seek %" G_GINT64_FORMAT, position); if (!gst_bytestream_seek (flacdec->bs, position, GST_SEEK_METHOD_SET)) { return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; } @@ -318,7 +321,7 @@ gst_flacdec_tell (const FLAC__SeekableStreamDecoder *decoder, if (*position == -1) return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; - GST_DEBUG (0, "tell %" G_GINT64_FORMAT, *position); + GST_DEBUG ("tell %" G_GINT64_FORMAT, *position); return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; } @@ -335,7 +338,7 @@ gst_flacdec_length (const FLAC__SeekableStreamDecoder *decoder, if (*length == -1) return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; - GST_DEBUG (0, "length %" G_GINT64_FORMAT, *length); + GST_DEBUG ("length %" G_GINT64_FORMAT, *length); return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; } @@ -347,7 +350,7 @@ gst_flacdec_eof (const FLAC__SeekableStreamDecoder *decoder, FlacDec *flacdec; flacdec = GST_FLACDEC (client_data); - GST_DEBUG (0, "eof %d", flacdec->eos); + GST_DEBUG ("eof %d", flacdec->eos); return flacdec->eos; } @@ -375,7 +378,7 @@ gst_flacdec_read (const FLAC__SeekableStreamDecoder *decoder, switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: - GST_DEBUG (0, "eos"); + GST_DEBUG ("eos"); flacdec->eos = TRUE; gst_event_unref (event); if (avail == 0) { @@ -383,7 +386,7 @@ gst_flacdec_read (const FLAC__SeekableStreamDecoder *decoder, } break; case GST_EVENT_DISCONTINUOUS: - GST_DEBUG (0, "discont"); + GST_DEBUG ("discont"); /* we are not yet sending the discont, we'll do that in the next write operation */ flacdec->need_discont = TRUE; @@ -435,7 +438,7 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, } if (GST_PAD_IS_USABLE (flacdec->srcpad)) { - GST_DEBUG (0, "send discont"); + GST_DEBUG ("send discont"); format = GST_FORMAT_TIME; gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT, @@ -516,39 +519,39 @@ gst_flacdec_loop (GstElement *element) flacdec = GST_FLACDEC (element); - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: entering loop"); + GST_DEBUG ("flacdec: entering loop"); if (flacdec->init) { - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: initializing decoder"); + GST_DEBUG ("flacdec: initializing decoder"); FLAC__seekable_stream_decoder_init (flacdec->decoder); /* FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder); */ flacdec->init = FALSE; } if (flacdec->seek_pending) { - GST_DEBUG (GST_CAT_EVENT, "perform seek to sample %" G_GINT64_FORMAT, + GST_DEBUG ("perform seek to sample %" G_GINT64_FORMAT, flacdec->seek_value); if (FLAC__seekable_stream_decoder_seek_absolute (flacdec->decoder, flacdec->seek_value)) { flacdec->total_samples = flacdec->seek_value; - GST_DEBUG (GST_CAT_EVENT, "seek done"); + GST_DEBUG ("seek done"); } else { - GST_DEBUG (GST_CAT_EVENT, "seek failed"); + GST_DEBUG ("seek failed"); } flacdec->seek_pending = FALSE; } - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: processing single"); + GST_DEBUG ("flacdec: processing single"); res = FLAC__seekable_stream_decoder_process_single (flacdec->decoder); - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: checking for EOS"); + GST_DEBUG ("flacdec: checking for EOS"); if (FLAC__seekable_stream_decoder_get_state (flacdec->decoder) == FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM) { GstEvent *event; - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: sending EOS event"); + GST_DEBUG ("flacdec: sending EOS event"); FLAC__seekable_stream_decoder_finish(flacdec->decoder); flacdec->init = TRUE; @@ -558,7 +561,7 @@ gst_flacdec_loop (GstElement *element) } gst_element_set_eos (element); } - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: _loop end"); + GST_DEBUG ("flacdec: _loop end"); } GST_PAD_FORMATS_FUNCTION (gst_flacdec_get_src_formats, diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index f1cd29e501..aa1a0195e4 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index c137caf687..667d57045b 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -20,6 +20,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index fa68d7f7a2..0e499043ce 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include /*#define DEBUG_ENABLED*/ @@ -88,38 +91,38 @@ gst_jpegdec_class_init (GstJpegDec *klass) static void gst_jpegdec_init_source (j_decompress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegdec_chain: init_source"); + GST_DEBUG ("gst_jpegdec_chain: init_source"); } static gboolean gst_jpegdec_fill_input_buffer (j_decompress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegdec_chain: fill_input_buffer"); + GST_DEBUG ("gst_jpegdec_chain: fill_input_buffer"); return TRUE; } static void gst_jpegdec_skip_input_data (j_decompress_ptr cinfo, glong num_bytes) { - GST_DEBUG (0,"gst_jpegdec_chain: skip_input_data"); + GST_DEBUG ("gst_jpegdec_chain: skip_input_data"); } static gboolean gst_jpegdec_resync_to_restart (j_decompress_ptr cinfo, gint desired) { - GST_DEBUG (0,"gst_jpegdec_chain: resync_to_start"); + GST_DEBUG ("gst_jpegdec_chain: resync_to_start"); return TRUE; } static void gst_jpegdec_term_source (j_decompress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegdec_chain: term_source"); + GST_DEBUG ("gst_jpegdec_chain: term_source"); } static void gst_jpegdec_init (GstJpegDec *jpegdec) { - GST_DEBUG (0,"gst_jpegdec_init: initializing"); + GST_DEBUG ("gst_jpegdec_init: initializing"); /* create the sink and src pads */ jpegdec->sinkpad = gst_pad_new_from_template (jpegdec_sink_template, "sink"); gst_element_add_pad(GST_ELEMENT(jpegdec),jpegdec->sinkpad); @@ -265,7 +268,7 @@ static void guarantee_huff_tables(j_decompress_ptr dinfo) (dinfo->dc_huff_tbl_ptrs[1] == NULL) && (dinfo->ac_huff_tbl_ptrs[0] == NULL) && (dinfo->ac_huff_tbl_ptrs[1] == NULL) ) { - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "Generating standard Huffman tables for this frame."); std_huff_tables(dinfo); } @@ -298,14 +301,14 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf) data = (guchar *)GST_BUFFER_DATA(buf); size = GST_BUFFER_SIZE(buf); - GST_DEBUG (0,"gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size, + GST_DEBUG ("gst_jpegdec_chain: got buffer of %ld bytes in '%s'",size, GST_OBJECT_NAME (jpegdec)); jpegdec->jsrc.next_input_byte = data; jpegdec->jsrc.bytes_in_buffer = size; - GST_DEBUG (0,"gst_jpegdec_chain: reading header %08lx", *(gulong *)data); + GST_DEBUG ("gst_jpegdec_chain: reading header %08lx", *(gulong *)data); jpeg_read_header(&jpegdec->cinfo, TRUE); r_h = jpegdec->cinfo.cur_comp_info[0]->h_samp_factor; @@ -320,12 +323,12 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf) jpegdec->cinfo.out_color_space = JCS_YCbCr; jpegdec->cinfo.dct_method = JDCT_IFAST; jpegdec->cinfo.raw_data_out = TRUE; - GST_DEBUG (0,"gst_jpegdec_chain: starting decompress"); + GST_DEBUG ("gst_jpegdec_chain: starting decompress"); guarantee_huff_tables(&jpegdec->cinfo); jpeg_start_decompress(&jpegdec->cinfo); width = jpegdec->cinfo.output_width; height = jpegdec->cinfo.output_height; - GST_DEBUG (0,"gst_jpegdec_chain: width %d, height %d", width, height); + GST_DEBUG ("gst_jpegdec_chain: width %d, height %d", width, height); outbuf = gst_buffer_new(); outsize = GST_BUFFER_SIZE(outbuf) = width*height + @@ -356,7 +359,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf) width2 = width >> 1; - GST_DEBUG (0,"gst_jpegdec_chain: decompressing %u", jpegdec->cinfo.rec_outbuf_height); + GST_DEBUG ("gst_jpegdec_chain: decompressing %u", jpegdec->cinfo.rec_outbuf_height); for (i = 0; i < height; i += r_v*DCTSIZE) { for (j=0, k=0; j< (r_v*DCTSIZE); j += r_v, k++) { jpegdec->line[0][j] = base[0]; base[0] += width; @@ -373,10 +376,10 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf) jpeg_read_raw_data(&jpegdec->cinfo, jpegdec->line, r_v*DCTSIZE); } - GST_DEBUG (0,"gst_jpegdec_chain: decompressing finished"); + GST_DEBUG ("gst_jpegdec_chain: decompressing finished"); jpeg_finish_decompress(&jpegdec->cinfo); - GST_DEBUG (0,"gst_jpegdec_chain: sending buffer"); + GST_DEBUG ("gst_jpegdec_chain: sending buffer"); gst_pad_push(jpegdec->srcpad, outbuf); gst_buffer_unref(buf); diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index ba8dd38b09..b2a8fc1d9d 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstjpegenc.h" @@ -98,19 +101,19 @@ gst_jpegenc_class_init (GstJpegEnc *klass) static void gst_jpegenc_init_destination (j_compress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegenc_chain: init_destination"); + GST_DEBUG ("gst_jpegenc_chain: init_destination"); } static gboolean gst_jpegenc_flush_destination (j_compress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegenc_chain: flush_destination: buffer too small !!!"); + GST_DEBUG ("gst_jpegenc_chain: flush_destination: buffer too small !!!"); return TRUE; } static void gst_jpegenc_term_destination (j_compress_ptr cinfo) { - GST_DEBUG (0,"gst_jpegenc_chain: term_source"); + GST_DEBUG ("gst_jpegenc_chain: term_source"); } static void @@ -134,7 +137,7 @@ gst_jpegenc_init (GstJpegEnc *jpegenc) jpegenc->cinfo.err = jpeg_std_error(&jpegenc->jerr); jpeg_create_compress(&jpegenc->cinfo); - GST_DEBUG (0,"gst_jpegenc_init: setting line buffers"); + GST_DEBUG ("gst_jpegenc_init: setting line buffers"); jpegenc->line[0] = NULL; jpegenc->line[1] = NULL; jpegenc->line[2] = NULL; @@ -154,13 +157,13 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) guint size = 0; gint width, height; - GST_DEBUG (0,"gst_jpegenc_resync: resync"); + GST_DEBUG ("gst_jpegenc_resync: resync"); jpegenc->cinfo.image_width = width = jpegenc->width; jpegenc->cinfo.image_height = height = jpegenc->height; jpegenc->cinfo.input_components = 3; - GST_DEBUG (0,"gst_jpegenc_resync: wdith %d, height %d", width, height); + GST_DEBUG ("gst_jpegenc_resync: wdith %d, height %d", width, height); jpeg_set_defaults(&jpegenc->cinfo); jpegenc->cinfo.dct_method = JDCT_FASTEST; @@ -172,7 +175,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) switch (jpegenc->format) { case GST_COLORSPACE_RGB24: size = 3; - GST_DEBUG (0,"gst_jpegenc_resync: setting format to RGB24"); + GST_DEBUG ("gst_jpegenc_resync: setting format to RGB24"); jpegenc->cinfo.in_color_space = JCS_RGB; jpegenc->cinfo.raw_data_in = FALSE; break; @@ -180,7 +183,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) size = 2; jpegenc->cinfo.raw_data_in = TRUE; jpegenc->cinfo.in_color_space = JCS_YCbCr; - GST_DEBUG (0,"gst_jpegenc_resync: setting format to YUV420P"); + GST_DEBUG ("gst_jpegenc_resync: setting format to YUV420P"); jpegenc->cinfo.comp_info[0].h_samp_factor = 2; jpegenc->cinfo.comp_info[0].v_samp_factor = 2; jpegenc->cinfo.comp_info[1].h_samp_factor = 1; @@ -194,7 +197,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) jpegenc->line[2] = g_realloc(jpegenc->line[2], height*sizeof(char*)/2); } - GST_DEBUG (0,"gst_jpegenc_resync: setting format done"); + GST_DEBUG ("gst_jpegenc_resync: setting format done"); break; default: printf("gst_jpegenc_resync: unsupported colorspace, using RGB\n"); @@ -209,7 +212,7 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) jpeg_suppress_tables(&jpegenc->cinfo, TRUE); jpegenc->buffer = NULL; - GST_DEBUG (0,"gst_jpegenc_resync: resync done"); + GST_DEBUG ("gst_jpegenc_resync: resync done"); } static GstBuffer* @@ -218,7 +221,7 @@ gst_jpegenc_get (GstPad *pad) GstJpegEnc *jpegenc; GstBuffer *newbuf; - GST_DEBUG (0,"gst_jpegenc_chain: pull buffer"); + GST_DEBUG ("gst_jpegenc_chain: pull buffer"); g_return_val_if_fail (pad != NULL, NULL); g_return_val_if_fail (GST_IS_PAD (pad), NULL); @@ -227,7 +230,7 @@ gst_jpegenc_get (GstPad *pad) if (jpegenc->buffer == NULL || GST_BUFFER_REFCOUNT_VALUE(jpegenc->buffer) != 1) { if (jpegenc->buffer) gst_buffer_unref(jpegenc->buffer); - GST_DEBUG (0,"gst_jpegenc_chain: new buffer"); + GST_DEBUG ("gst_jpegenc_chain: new buffer"); newbuf = jpegenc->buffer = gst_buffer_new(); GST_BUFFER_DATA(newbuf) = g_malloc(jpegenc->bufsize); GST_BUFFER_SIZE(newbuf) = jpegenc->bufsize; @@ -260,7 +263,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf) data = GST_BUFFER_DATA(buf); size = GST_BUFFER_SIZE(buf); - GST_DEBUG (0,"gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size, + GST_DEBUG ("gst_jpegenc_chain: got buffer of %ld bytes in '%s'",size, GST_OBJECT_NAME (jpegenc)); outbuf = gst_buffer_new(); @@ -281,7 +284,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf) jpeg_start_compress(&jpegenc->cinfo, TRUE); width2 = width>>1; - GST_DEBUG (0,"gst_jpegdec_chain: compressing"); + GST_DEBUG ("gst_jpegdec_chain: compressing"); for (i = 0; i < height; i += 2*DCTSIZE) { for (j=0, k=0; j<2*DCTSIZE;j+=2, k++) { @@ -293,7 +296,7 @@ gst_jpegenc_chain (GstPad *pad, GstBuffer *buf) jpeg_write_raw_data(&jpegenc->cinfo, jpegenc->line, 2*DCTSIZE); } jpeg_finish_compress(&jpegenc->cinfo); - GST_DEBUG (0,"gst_jpegdec_chain: compressing done"); + GST_DEBUG ("gst_jpegdec_chain: compressing done"); GST_BUFFER_SIZE(outbuf) = (((outsize - jpegenc->jdest.free_in_buffer)+3)&~3); diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index ed96e83597..55c0186db6 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -170,19 +170,19 @@ gst_ladspa_class_init (GstLADSPAClass *klass) for (i=0;iPortCount;i++) { if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) && LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])){ - GST_DEBUG (0, "input port %d", i); + GST_DEBUG ("input port %d", i); klass->sinkpad_portnums[sinkcount++] = i; } if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) && LADSPA_IS_PORT_OUTPUT(desc->PortDescriptors[i])){ - GST_DEBUG (0, "output port %d", i); + GST_DEBUG ("output port %d", i); klass->srcpad_portnums[srccount++] = i; } if (LADSPA_IS_PORT_CONTROL(desc->PortDescriptors[i]) && LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])){ - GST_DEBUG (0, "control port %d", i); + GST_DEBUG ("control port %d", i); klass->control_portnums[controlcount++] = i; } } @@ -324,7 +324,7 @@ gst_ladspa_class_init (GstLADSPAClass *klass) klass->control_info[i].param_name = argname; - GST_DEBUG (0, "adding arg %s from %s",argname, klass->control_info[i].name); + GST_DEBUG ("adding arg %s from %s",argname, klass->control_info[i].name); if (argtype==G_TYPE_BOOLEAN){ paramspec = g_param_spec_boolean(argname,argname,argname, FALSE, argperms); @@ -443,7 +443,7 @@ gst_ladspa_init (GstLADSPA *ladspa) if (sinkcount==0 && srccount == 1) { /* get mode (no sink pads) */ - GST_DEBUG (0, "mono get mode with 1 src pad"); + GST_DEBUG ("mono get mode with 1 src pad"); ladspa->newcaps = TRUE; @@ -451,14 +451,14 @@ gst_ladspa_init (GstLADSPA *ladspa) gst_pad_set_get_function (ladspa->srcpads[0], gst_ladspa_get); } else if (sinkcount==1){ /* with one sink we can use the chain function */ - GST_DEBUG (0, "chain mode"); + GST_DEBUG ("chain mode"); gst_pad_set_link_function (ladspa->sinkpads[0], gst_ladspa_connect); gst_pad_set_chain_function (ladspa->sinkpads[0], gst_ladspa_chain); gst_pad_set_bufferpool_function (ladspa->sinkpads[0], gst_ladspa_get_bufferpool); } else if (sinkcount > 1){ /* more than one sink pad needs loop mode */ - GST_DEBUG (0, "loop mode with %d sink pads and %d src pads", sinkcount, srccount); + GST_DEBUG ("loop mode with %d sink pads and %d src pads", sinkcount, srccount); for (i=0;isinkpads[i], gst_ladspa_connect); @@ -469,7 +469,7 @@ gst_ladspa_init (GstLADSPA *ladspa) else if (sinkcount==0 && srccount == 0){ /* for some reason these plugins exist - we'll just ignore them */ } else { - GST_DEBUG (0, "%d sink pads, %d src pads not yet supported", sinkcount, srccount); + GST_DEBUG ("%d sink pads, %d src pads not yet supported", sinkcount, srccount); } gst_ladspa_instantiate (ladspa); @@ -539,7 +539,7 @@ gst_ladspa_connect_get (GstPad *pad, GstCaps *caps) static void gst_ladspa_force_src_caps(GstLADSPA *ladspa, GstPad *pad) { - GST_DEBUG (0, "forcing caps with rate %d", ladspa->samplerate); + GST_DEBUG ("forcing caps with rate %d", ladspa->samplerate); gst_pad_try_set_caps (pad, gst_caps_new ( "ladspa_src_caps", "audio/raw", @@ -605,7 +605,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP ladspa->controls[cid] = val; } - GST_DEBUG (0, "set arg %s to %f", control_info->name, ladspa->controls[cid]); + GST_DEBUG ("set arg %s to %f", control_info->name, ladspa->controls[cid]); } static void @@ -633,7 +633,7 @@ gst_ladspa_get_property (GObject *object, guint prop_id, GValue *value, GParamSp control_info = &(oclass->control_info[cid]); if (control_info->name == NULL) return; - GST_DEBUG (0, "got arg %s as %f", control_info->name, ladspa->controls[cid]); + GST_DEBUG ("got arg %s as %f", control_info->name, ladspa->controls[cid]); /* now see what type it is */ if (control_info->toggled) { @@ -666,7 +666,7 @@ gst_ladspa_instantiate (GstLADSPA *ladspa) } /* instantiate the plugin */ - GST_DEBUG (0, "instantiating the plugin"); + GST_DEBUG ("instantiating the plugin"); ladspa->handle = desc->instantiate(desc,ladspa->samplerate); g_return_val_if_fail (ladspa->handle != NULL, FALSE); @@ -674,7 +674,7 @@ gst_ladspa_instantiate (GstLADSPA *ladspa) /* walk through the ports and add all the arguments */ for (i=0;inumcontrols;i++) { /* connect the argument to the plugin */ - GST_DEBUG (0, "added control port %d", oclass->control_portnums[i]); + GST_DEBUG ("added control port %d", oclass->control_portnums[i]); desc->connect_port(ladspa->handle, oclass->control_portnums[i], &(ladspa->controls[i])); @@ -694,7 +694,7 @@ gst_ladspa_change_state (GstElement *element) GstLADSPA *ladspa = (GstLADSPA*)element; desc = ladspa->descriptor; - GST_DEBUG (0, "changing state"); + GST_DEBUG ("changing state"); switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: gst_ladspa_activate(ladspa); @@ -722,7 +722,7 @@ gst_ladspa_activate(GstLADSPA *ladspa) gst_ladspa_deactivate(ladspa); } - GST_DEBUG (0, "activating"); + GST_DEBUG ("activating"); /* activate the plugin (function might be null) */ if (desc->activate != NULL) { @@ -738,7 +738,7 @@ gst_ladspa_deactivate(GstLADSPA *ladspa) LADSPA_Descriptor *desc; desc = ladspa->descriptor; - GST_DEBUG (0, "deactivating"); + GST_DEBUG ("deactivating"); /* deactivate the plugin (function might be null) */ if (ladspa->activated && (desc->deactivate != NULL)) { @@ -776,11 +776,11 @@ gst_ladspa_loop(GstElement *element) /* find a bufferpool */ if (numsrcpads > 0 && (bufpool = gst_pad_get_bufferpool (ladspa->srcpads[0]))) { - GST_DEBUG (0, "Got bufferpool from first source pad"); + GST_DEBUG ("Got bufferpool from first source pad"); } else { bufferbytesize = sizeof (LADSPA_Data) * ladspa->buffersize; bufpool = gst_buffer_pool_get_default (bufferbytesize, ladspa->numbuffers); - GST_DEBUG (0, "Created default bufferpool, %d x %d bytes", ladspa->numbuffers, bufferbytesize); + GST_DEBUG ("Created default bufferpool, %d x %d bytes", ladspa->numbuffers, bufferbytesize); } /* get the bytestreams for each pad */ @@ -803,7 +803,7 @@ gst_ladspa_loop(GstElement *element) num_empty_pads = 0; /* first get all the necessary data from the input ports */ for (i=0 ; isrcpads[i], buffers_out[i]); data_out[i] = NULL; diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 9384505061..9cd39cc31a 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -16,6 +16,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "gstpngenc.h" @@ -198,7 +201,7 @@ gst_pngenc_chain (GstPad *pad, GstBuffer *buf) /* non-0 return is from a longjmp inside of libpng */ if (setjmp (pngenc->png_struct_ptr->jmpbuf) != 0) { - GST_DEBUG (GST_CAT_PLUGIN_INFO, "returning from longjmp"); + GST_DEBUG ("returning from longjmp"); png_destroy_write_struct (&pngenc->png_struct_ptr, &pngenc->png_info_ptr); return; } diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c index 284b4bebad..40bf3f81f5 100644 --- a/ext/mikmod/gstmikmod.c +++ b/ext/mikmod/gstmikmod.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstmikmod.h" #include @@ -406,7 +409,7 @@ GstMikMod *mikmod; mikmod = GST_MIKMOD (element); - GST_DEBUG (0,"state pending %d", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d", GST_STATE_PENDING (element)); if (GST_STATE_PENDING (element) == GST_STATE_READY) { diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c index e3302057f2..8e4671d370 100644 --- a/ext/raw1394/gst1394.c +++ b/ext/raw1394/gst1394.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 8efefe2aab..97b2989e71 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -226,32 +226,32 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad if( p[3] & 0x80 ) { // PAL dv1394src->frameSize = PAL_FRAMESIZE; - GST_DEBUG(0,"PAL data"); + GST_DEBUG ("PAL data"); if (gst_pad_try_set_caps (dv1394src->srcpad, GST_CAPS_NEW ( "dv1394src", "video/dv", "format", GST_PROPS_STRING("PAL"), NULL) ) <= 0) { - GST_ERROR(GST_ELEMENT(dv1394src), "Could not set source caps for PAL"); + gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for PAL"); return 0; } } else { // NTSC (untested) dv1394src->frameSize = NTSC_FRAMESIZE; - GST_DEBUG(0,"NTSC data [untested] - please report success/failure to "); + GST_DEBUG ("NTSC data [untested] - please report success/failure to "); if (gst_pad_try_set_caps (dv1394src->srcpad, GST_CAPS_NEW ( "dv1394src", "video/dv", "format", GST_PROPS_STRING ("NTSC"), NULL) ) <= 0) { - GST_ERROR(GST_ELEMENT(dv1394src), "Could not set source caps for NTSC"); + gst_element_error (GST_ELEMENT(dv1394src), "Could not set source caps for NTSC"); return 0; } } dv1394src->pool = gst_buffer_pool_get_default( dv1394src->frameSize, N_BUFFERS_IN_POOL ); if (dv1394src->pool == NULL) { - GST_ERROR(GST_ELEMENT(dv1394src), "gst_buffer_pool_get_default returned NULL"); + gst_element_error (GST_ELEMENT(dv1394src), "gst_buffer_pool_get_default returned NULL"); } } @@ -259,7 +259,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad if( !dv1394src->drop_incomplete || dv1394src->bytesInFrame == dv1394src->frameSize ) { dv1394src->buf = dv1394src->frame; } else { - GST_INFO_ELEMENT(GST_CAT_PLUGIN_INFO, GST_ELEMENT(dv1394src), "incomplete frame dropped"); + GST_INFO_OBJECT (GST_ELEMENT(dv1394src), "incomplete frame dropped"); } dv1394src->frame = NULL; @@ -310,7 +310,7 @@ int gst_dv1394src_iso_receive(raw1394handle_t handle,int channel,size_t len,quad static int gst_dv1394src_bus_reset(raw1394handle_t handle, unsigned int generation) { - GST_INFO_ELEMENT(0,GST_DV1394SRC(raw1394_get_userdata(handle)),"have bus reset"); + GST_INFO_OBJECT (GST_DV1394SRC(raw1394_get_userdata(handle)),"have bus reset"); return 0; } @@ -337,31 +337,31 @@ gst_dv1394src_change_state (GstElement *element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: if ((dv1394src->handle = raw1394_new_handle()) == NULL) { - GST_INFO_ELEMENT(0,dv1394src,"can't get raw1394 handle"); + GST_INFO_OBJECT (dv1394src,"can't get raw1394 handle"); return GST_STATE_FAILURE; } raw1394_set_userdata(dv1394src->handle,dv1394src); dv1394src->numcards = raw1394_get_port_info(dv1394src->handle,dv1394src->pinfo,16); if (dv1394src->numcards == 0) { - GST_INFO_ELEMENT(0,dv1394src,"no cards available for raw1394"); + GST_INFO_OBJECT (dv1394src,"no cards available for raw1394"); return GST_STATE_FAILURE; } if (dv1394src->pinfo[dv1394src->card].nodes <= 1) { - GST_INFO_ELEMENT(0,dv1394src,"there are no nodes on the 1394 bus"); + GST_INFO_OBJECT (dv1394src,"there are no nodes on the 1394 bus"); return GST_STATE_FAILURE; } if (raw1394_set_port(dv1394src->handle,dv1394src->port) < 0) { - GST_INFO_ELEMENT(0,dv1394src,"can't set 1394 port %d",dv1394src->port); + GST_INFO_OBJECT (dv1394src,"can't set 1394 port %d",dv1394src->port); return GST_STATE_FAILURE; } raw1394_set_iso_handler(dv1394src->handle,dv1394src->channel,gst_dv1394src_iso_receive); raw1394_set_bus_reset_handler(dv1394src->handle,gst_dv1394src_bus_reset); dv1394src->started = FALSE; - GST_DEBUG(0,"successfully opened up 1394 connection"); + GST_DEBUG ("successfully opened up 1394 connection"); break; case GST_STATE_PAUSED_TO_PLAYING: if (raw1394_start_iso_rcv(dv1394src->handle,dv1394src->channel) < 0) { - GST_INFO_ELEMENT(0,dv1394src,"can't start 1394 iso receive"); + GST_INFO_OBJECT (dv1394src,"can't start 1394 iso receive"); return GST_STATE_FAILURE; } break; diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index d44d9a2d47..8e4bcce76e 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstshout2.h" #include #include @@ -390,7 +393,7 @@ gst_shout2send_change_state (GstElement *element) shout2send = GST_SHOUT2SEND(element); - GST_DEBUG (0,"state pending %d", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d", GST_STATE_PENDING (element)); /* if going down into NULL state, close the file if it's open */ switch (GST_STATE_TRANSITION (element)) { diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 924f0b02d7..3d92a08624 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstspeexdec.h" @@ -87,7 +90,7 @@ gst_speexdec_class_init (GstSpeexDec *klass) static void gst_speexdec_init (GstSpeexDec *speexdec) { - GST_DEBUG (0,"gst_speexdec_init: initializing"); + GST_DEBUG ("gst_speexdec_init: initializing"); /* create the sink and src pads */ speexdec->sinkpad = gst_pad_new_from_template (speexdec_sink_template, "sink"); diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 006700bd8f..b9e0659623 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstspeexenc.h" diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c index 7ee8680b57..0e57a747fd 100644 --- a/gst/audiofx/audiowsincband.c +++ b/gst/audiofx/audiowsincband.c @@ -30,6 +30,9 @@ * - this might be improved upon with bytestream */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstfilter.h" #include /* M_PI */ @@ -197,7 +200,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) { len = filter->wing_size; /* fill the lp kernel */ - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "bpwsinc: initializing LP kernel of length %d with cut-off %f", len * 2 + 1, filter->lower_frequency); kernel_lp = (double *) g_malloc (sizeof (double) * (2 * len + 1)); @@ -220,7 +223,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) for (i = 0; i <= len * 2; ++i) kernel_lp[i] /= sum; /* fill the hp kernel */ - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "bpwsinc: initializing HP kernel of length %d with cut-off %f", len * 2 + 1, filter->upper_frequency); kernel_hp = (double *) g_malloc (sizeof (double) * (2 * len + 1)); diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c index 74cea70ef8..64e104d67c 100644 --- a/gst/audiofx/audiowsinclimit.c +++ b/gst/audiofx/audiowsinclimit.c @@ -30,6 +30,9 @@ * - this might be improved upon with bytestream */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstfilter.h" #include /* M_PI */ @@ -189,7 +192,7 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) /* fill the kernel */ g_print ("DEBUG: initing filter kernel\n"); len = filter->wing_size; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "lpwsinc: initializing filter kernel of length %d", len * 2 + 1); filter->kernel = (double *) g_malloc (sizeof (double) * (2 * len + 1)); diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 269766a2e4..d9eeb8e0c6 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -21,6 +21,9 @@ * Zaheer Merali #include @@ -182,7 +185,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf) auparse = GST_AUPARSE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "gst_auparse_chain: got buffer in '%s'", + GST_DEBUG ("gst_auparse_chain: got buffer in '%s'", gst_element_get_name (GST_ELEMENT (auparse))); data = GST_BUFFER_DATA (buf); @@ -234,7 +237,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf) g_print ("offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld\n", auparse->offset,auparse->size,auparse->encoding, auparse->frequency,auparse->channels); - GST_DEBUG (0, "offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld", + GST_DEBUG ("offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld", auparse->offset,auparse->size,auparse->encoding, auparse->frequency,auparse->channels); diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 7c9bd46221..77ff97f655 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -19,6 +19,9 @@ /* #define GST_DEBUG_ENABLED */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstavidemux.h" @@ -268,7 +271,7 @@ avi_type_find (GstBuffer *buf, gchar *data = GST_BUFFER_DATA (buf); GstCaps *new; - GST_DEBUG (0,"avi_demux: typefind"); + GST_DEBUG ("avi_demux: typefind"); if (GUINT32_FROM_LE (((guint32 *)data)[0]) != GST_RIFF_TAG_RIFF) return NULL; @@ -308,21 +311,21 @@ gst_avi_demux_avih (GstAviDemux *avi_demux) avi_demux->avih.start = GUINT32_FROM_LE (avih->start); avi_demux->avih.length = GUINT32_FROM_LE (avih->length); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: avih tag found"); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: us_frame %d", avi_demux->avih.us_frame); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: max_bps %d", avi_demux->avih.max_bps); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: pad_gran %d", avi_demux->avih.pad_gran); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: flags 0x%08x", avi_demux->avih.flags); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: tot_frames %d", avi_demux->avih.tot_frames); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: init_frames %d", avi_demux->avih.init_frames); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: streams %d", avi_demux->avih.streams); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: bufsize %d", avi_demux->avih.bufsize); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: width %d", avi_demux->avih.width); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: height %d", avi_demux->avih.height); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: scale %d", avi_demux->avih.scale); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: rate %d", avi_demux->avih.rate); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: start %d", avi_demux->avih.start); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: length %d", avi_demux->avih.length); + GST_INFO ( "gst_avi_demux: avih tag found"); + GST_INFO ( "gst_avi_demux: us_frame %d", avi_demux->avih.us_frame); + GST_INFO ( "gst_avi_demux: max_bps %d", avi_demux->avih.max_bps); + GST_INFO ( "gst_avi_demux: pad_gran %d", avi_demux->avih.pad_gran); + GST_INFO ( "gst_avi_demux: flags 0x%08x", avi_demux->avih.flags); + GST_INFO ( "gst_avi_demux: tot_frames %d", avi_demux->avih.tot_frames); + GST_INFO ( "gst_avi_demux: init_frames %d", avi_demux->avih.init_frames); + GST_INFO ( "gst_avi_demux: streams %d", avi_demux->avih.streams); + GST_INFO ( "gst_avi_demux: bufsize %d", avi_demux->avih.bufsize); + GST_INFO ( "gst_avi_demux: width %d", avi_demux->avih.width); + GST_INFO ( "gst_avi_demux: height %d", avi_demux->avih.height); + GST_INFO ( "gst_avi_demux: scale %d", avi_demux->avih.scale); + GST_INFO ( "gst_avi_demux: rate %d", avi_demux->avih.rate); + GST_INFO ( "gst_avi_demux: start %d", avi_demux->avih.start); + GST_INFO ( "gst_avi_demux: length %d", avi_demux->avih.length); return TRUE; } @@ -367,21 +370,21 @@ gst_avi_demux_strh (GstAviDemux *avi_demux) if (!target->strh.rate) target->strh.rate = 1; /* avoid division by zero */ - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strh tag found"); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: type 0x%08x (%s)", + GST_INFO ( "gst_avi_demux: strh tag found"); + GST_INFO ( "gst_avi_demux: type 0x%08x (%s)", target->strh.type, gst_riff_id_to_fourcc (strh->type)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: fcc_handler 0x%08x (%s)", + GST_INFO ( "gst_avi_demux: fcc_handler 0x%08x (%s)", target->strh.fcc_handler, gst_riff_id_to_fourcc (strh->fcc_handler)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: flags 0x%08x", strh->flags); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: priority %d", target->strh.priority); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: init_frames %d", target->strh.init_frames); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: scale %d", target->strh.scale); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: rate %d", target->strh.rate); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: start %d", target->strh.start); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: length %d", target->strh.length); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: bufsize %d", target->strh.bufsize); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: quality %d", target->strh.quality); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: samplesize %d", target->strh.samplesize); + GST_INFO ( "gst_avi_demux: flags 0x%08x", strh->flags); + GST_INFO ( "gst_avi_demux: priority %d", target->strh.priority); + GST_INFO ( "gst_avi_demux: init_frames %d", target->strh.init_frames); + GST_INFO ( "gst_avi_demux: scale %d", target->strh.scale); + GST_INFO ( "gst_avi_demux: rate %d", target->strh.rate); + GST_INFO ( "gst_avi_demux: start %d", target->strh.start); + GST_INFO ( "gst_avi_demux: length %d", target->strh.length); + GST_INFO ( "gst_avi_demux: bufsize %d", target->strh.bufsize); + GST_INFO ( "gst_avi_demux: quality %d", target->strh.quality); + GST_INFO ( "gst_avi_demux: samplesize %d", target->strh.samplesize); target->delay = 0LL; target->total_bytes = 0LL; @@ -424,7 +427,7 @@ gst_avi_demux_strn (GstAviDemux *avi_demux, gint len) if (got_bytes != len) return; - GST_DEBUG (0, "Stream name: \"%s\"", name); + GST_DEBUG ("Stream name: \"%s\"", name); } static void @@ -592,19 +595,19 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux) if (got_bytes != sizeof (gst_riff_strf_vids)) return; - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context vids"); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: size %d", GUINT32_FROM_LE (strf->size)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: width %d", GUINT32_FROM_LE (strf->width)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: height %d", GUINT32_FROM_LE (strf->height)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: planes %d", GUINT16_FROM_LE (strf->planes)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: bit_cnt %d", GUINT16_FROM_LE (strf->bit_cnt)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: compression 0x%08x (%s)", + GST_INFO ( "gst_avi_demux: strf tag found in context vids"); + GST_INFO ( "gst_avi_demux: size %d", GUINT32_FROM_LE (strf->size)); + GST_INFO ( "gst_avi_demux: width %d", GUINT32_FROM_LE (strf->width)); + GST_INFO ( "gst_avi_demux: height %d", GUINT32_FROM_LE (strf->height)); + GST_INFO ( "gst_avi_demux: planes %d", GUINT16_FROM_LE (strf->planes)); + GST_INFO ( "gst_avi_demux: bit_cnt %d", GUINT16_FROM_LE (strf->bit_cnt)); + GST_INFO ( "gst_avi_demux: compression 0x%08x (%s)", GUINT32_FROM_LE (strf->compression), gst_riff_id_to_fourcc (strf->compression)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: image_size %d", GUINT32_FROM_LE (strf->image_size)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: xpels_meter %d", GUINT32_FROM_LE (strf->xpels_meter)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: ypels_meter %d", GUINT32_FROM_LE (strf->ypels_meter)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: num_colors %d", GUINT32_FROM_LE (strf->num_colors)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: imp_colors %d", GUINT32_FROM_LE (strf->imp_colors)); + GST_INFO ( "gst_avi_demux: image_size %d", GUINT32_FROM_LE (strf->image_size)); + GST_INFO ( "gst_avi_demux: xpels_meter %d", GUINT32_FROM_LE (strf->xpels_meter)); + GST_INFO ( "gst_avi_demux: ypels_meter %d", GUINT32_FROM_LE (strf->ypels_meter)); + GST_INFO ( "gst_avi_demux: num_colors %d", GUINT32_FROM_LE (strf->num_colors)); + GST_INFO ( "gst_avi_demux: imp_colors %d", GUINT32_FROM_LE (strf->imp_colors)); srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", @@ -772,13 +775,13 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux) if (got_bytes != sizeof (gst_riff_strf_auds)) return; - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context auds"); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: format %d", GUINT16_FROM_LE (strf->format)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: channels %d", GUINT16_FROM_LE (strf->channels)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: rate %d", GUINT32_FROM_LE (strf->rate)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: av_bps %d", GUINT32_FROM_LE (strf->av_bps)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: blockalign %d", GUINT16_FROM_LE (strf->blockalign)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: size %d", GUINT16_FROM_LE (strf->size)); + GST_INFO ( "gst_avi_demux: strf tag found in context auds"); + GST_INFO ( "gst_avi_demux: format %d", GUINT16_FROM_LE (strf->format)); + GST_INFO ( "gst_avi_demux: channels %d", GUINT16_FROM_LE (strf->channels)); + GST_INFO ( "gst_avi_demux: rate %d", GUINT32_FROM_LE (strf->rate)); + GST_INFO ( "gst_avi_demux: av_bps %d", GUINT32_FROM_LE (strf->av_bps)); + GST_INFO ( "gst_avi_demux: blockalign %d", GUINT16_FROM_LE (strf->blockalign)); + GST_INFO ( "gst_avi_demux: size %d", GUINT16_FROM_LE (strf->size)); srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", @@ -910,15 +913,15 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux) if (got_bytes != sizeof (gst_riff_strf_iavs)) return; - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context iavs"); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxSrc %08x", GUINT32_FROM_LE (strf->DVAAuxSrc)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxCtl %08x", GUINT32_FROM_LE (strf->DVAAuxCtl)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxSrc1 %08x", GUINT32_FROM_LE (strf->DVAAuxSrc1)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxCtl1 %08x", GUINT32_FROM_LE (strf->DVAAuxCtl1)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVVAuxSrc %08x", GUINT32_FROM_LE (strf->DVVAuxSrc)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVVAuxCtl %08x", GUINT32_FROM_LE (strf->DVVAuxCtl)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVReserved1 %08x", GUINT32_FROM_LE (strf->DVReserved1)); - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2)); + GST_INFO ( "gst_avi_demux: strf tag found in context iavs"); + GST_INFO ( "gst_avi_demux: DVAAuxSrc %08x", GUINT32_FROM_LE (strf->DVAAuxSrc)); + GST_INFO ( "gst_avi_demux: DVAAuxCtl %08x", GUINT32_FROM_LE (strf->DVAAuxCtl)); + GST_INFO ( "gst_avi_demux: DVAAuxSrc1 %08x", GUINT32_FROM_LE (strf->DVAAuxSrc1)); + GST_INFO ( "gst_avi_demux: DVAAuxCtl1 %08x", GUINT32_FROM_LE (strf->DVAAuxCtl1)); + GST_INFO ( "gst_avi_demux: DVVAuxSrc %08x", GUINT32_FROM_LE (strf->DVVAuxSrc)); + GST_INFO ( "gst_avi_demux: DVVAuxCtl %08x", GUINT32_FROM_LE (strf->DVVAuxCtl)); + GST_INFO ( "gst_avi_demux: DVReserved1 %08x", GUINT32_FROM_LE (strf->DVReserved1)); + GST_INFO ( "gst_avi_demux: DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2)); srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", @@ -966,7 +969,7 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux) static void gst_avi_debug_entry (const gchar *prefix, gst_avi_index_entry *entry) { - GST_DEBUG (0, "%s: %05d %d %08llx %05d %14" G_GINT64_FORMAT " %08x %08x (%d) %08x", + GST_DEBUG ("%s: %05d %d %08llx %05d %14" G_GINT64_FORMAT " %08x %08x (%d) %08x", prefix, entry->index_nr, entry->stream_nr, (unsigned long long)entry->bytes_before, entry->frames_before, entry->ts, entry->flags, entry->offset, @@ -985,7 +988,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux, guint32 id; if (!gst_bytestream_seek (avi_demux->bs, filepos + offset, GST_SEEK_METHOD_SET)) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek to index"); + GST_INFO ( "avidemux: could not seek to index"); return; } do { @@ -1001,7 +1004,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux, } while (TRUE); if (GST_BUFFER_OFFSET (buf) != filepos + offset || GST_BUFFER_SIZE (buf) != 8) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not get index, got %" G_GINT64_FORMAT " %d, expected %ld", + GST_INFO ( "avidemux: could not get index, got %" G_GINT64_FORMAT " %d, expected %ld", GST_BUFFER_OFFSET (buf), GST_BUFFER_SIZE (buf), filepos + offset); goto end; } @@ -1009,7 +1012,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux, id = GUINT32_FROM_LE (*(guint32 *)GST_BUFFER_DATA (buf)); if (id != GST_RIFF_TAG_idx1) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: no index found"); + GST_INFO ( "avidemux: no index found"); goto end; } @@ -1020,12 +1023,12 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux, got_bytes = gst_bytestream_read (avi_demux->bs, &buf, index_size); if (got_bytes < index_size) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: error reading index"); + GST_INFO ( "avidemux: error reading index"); goto end; } avi_demux->index_size = index_size/sizeof(gst_riff_index_entry); - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: index size %lu", avi_demux->index_size); + GST_INFO ( "avidemux: index size %lu", avi_demux->index_size); avi_demux->index_entries = g_malloc (avi_demux->index_size * sizeof (gst_avi_index_entry)); @@ -1089,16 +1092,16 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux, avi_stream_context *stream; stream = &avi_demux->stream[i]; - GST_DEBUG (GST_CAT_PLUGIN_INFO, "stream %i: %d frames, %" G_GINT64_FORMAT " bytes", + GST_DEBUG ("stream %i: %d frames, %" G_GINT64_FORMAT " bytes", i, stream->total_frames, stream->total_bytes); } gst_buffer_unref (buf); end: - GST_DEBUG (GST_CAT_PLUGIN_INFO, "index offset at %08lx", filepos); + GST_DEBUG ("index offset at %08lx", filepos); if (!gst_bytestream_seek (avi_demux->bs, filepos, GST_SEEK_METHOD_SET)) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek back to movi"); + GST_INFO ( "avidemux: could not seek back to movi"); return; } } @@ -1305,7 +1308,7 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time) for (i = 0; i < avi_demux->num_streams; i++) { stream = &avi_demux->stream[i]; - GST_DEBUG (0, "finding %d for time %" G_GINT64_FORMAT, i, time); + GST_DEBUG ("finding %d for time %" G_GINT64_FORMAT, i, time); entry = gst_avi_demux_index_entry_for_time (avi_demux, stream->num, time, GST_RIFF_IF_KEYFRAME); if (entry) { @@ -1314,7 +1317,7 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time) min_index = MIN (entry->index_nr, min_index); } } - GST_DEBUG (0, "first index at %d", min_index); + GST_DEBUG ("first index at %d", min_index); /* now we know the entry we need to sync on. calculate number of frames to * skip fro there on and the stream stats */ @@ -1332,9 +1335,9 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time) stream->current_frame = next_entry->frames_before; stream->skip = entry->frames_before - next_entry->frames_before; - GST_DEBUG (0, "%d skip %d", stream->num, stream->skip); + GST_DEBUG ("%d skip %d", stream->num, stream->skip); } - GST_DEBUG (0, "final index at %d", min_index); + GST_DEBUG ("final index at %d", min_index); return min_index; } @@ -1391,7 +1394,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event) case GST_EVENT_SEEK_SEGMENT: stream->end_pos = GST_EVENT_SEEK_ENDOFFSET (event); case GST_EVENT_SEEK: - GST_DEBUG (0, "seek format %d, %08x", GST_EVENT_SEEK_FORMAT (event), stream->strh.type); + GST_DEBUG ("seek format %d, %08x", GST_EVENT_SEEK_FORMAT (event), stream->strh.type); switch (GST_EVENT_SEEK_FORMAT (event)) { case GST_FORMAT_BYTES: case GST_FORMAT_DEFAULT: @@ -1409,7 +1412,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event) res = FALSE; goto done; } - GST_DEBUG (0, "seeking to %" G_GINT64_FORMAT, desired_offset); + GST_DEBUG ("seeking to %" G_GINT64_FORMAT, desired_offset); flags = GST_RIFF_IF_KEYFRAME; @@ -1426,7 +1429,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event) avi_demux->last_seek = seek_entry->ts; } else { - GST_DEBUG (0, "no index entry found for time %" G_GINT64_FORMAT, desired_offset); + GST_DEBUG ("no index entry found for time %" G_GINT64_FORMAT, desired_offset); res = FALSE; } break; @@ -1458,7 +1461,7 @@ gst_avi_demux_handle_sink_event (GstAviDemux *avi_demux) gst_bytestream_get_status (avi_demux->bs, &remaining, &event); type = event? GST_EVENT_TYPE (event) : GST_EVENT_UNKNOWN; - GST_DEBUG (0, "avidemux: event %p %d", event, type); + GST_DEBUG ("avidemux: event %p %d", event, type); switch (type) { case GST_EVENT_EOS: @@ -1478,7 +1481,7 @@ gst_avi_demux_handle_sink_event (GstAviDemux *avi_demux) avi_stream_context *stream = &avi_demux->stream[i]; if (GST_PAD_IS_USABLE (stream->pad)) { - GST_DEBUG (GST_CAT_EVENT, "sending discont on %d %" G_GINT64_FORMAT " + %" G_GINT64_FORMAT " = %" G_GINT64_FORMAT, + GST_DEBUG ("sending discont on %d %" G_GINT64_FORMAT " + %" G_GINT64_FORMAT " = %" G_GINT64_FORMAT, i, avi_demux->last_seek, stream->delay, avi_demux->last_seek + stream->delay); discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, @@ -1517,14 +1520,14 @@ gst_avi_demux_loop (GstElement *element) bs = avi_demux->bs; if (avi_demux->seek_pending) { - GST_DEBUG (0, "avidemux: seek pending to %" G_GINT64_FORMAT " %08llx", + GST_DEBUG ("avidemux: seek pending to %" G_GINT64_FORMAT " %08llx", avi_demux->seek_offset, (unsigned long long)avi_demux->seek_offset); if (!gst_bytestream_seek (avi_demux->bs, avi_demux->seek_offset, GST_SEEK_METHOD_SET)) { - GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek"); + GST_INFO ( "avidemux: could not seek"); } avi_demux->seek_pending = FALSE; } @@ -1588,10 +1591,10 @@ gst_avi_demux_loop (GstElement *element) flush = 0; break; case GST_AVI_DEMUX_HEADER: - GST_DEBUG (0, "riff tag: %4.4s %08x", (gchar *)&chunk.id, chunk.size); + GST_DEBUG ("riff tag: %4.4s %08x", (gchar *)&chunk.id, chunk.size); switch (chunk.id) { case GST_RIFF_TAG_LIST: - GST_DEBUG (0, "list type: %4.4s", (gchar *)&chunk.type); + GST_DEBUG ("list type: %4.4s", (gchar *)&chunk.type); switch (chunk.type) { case GST_RIFF_LIST_movi: { @@ -1639,7 +1642,7 @@ gst_avi_demux_loop (GstElement *element) case GST_RIFF_FCC_pads: case GST_RIFF_FCC_txts: default: - GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux_chain: strh type %s not supported", + GST_INFO ( "gst_avi_demux_chain: strh type %s not supported", gst_riff_id_to_fourcc (avi_demux->fcc_type)); break; } @@ -1654,7 +1657,7 @@ gst_avi_demux_loop (GstElement *element) case GST_RIFF_ISFT: break; default: - GST_DEBUG (0, " ***** unknown chunkid %08x", chunk.id); + GST_DEBUG (" ***** unknown chunkid %08x", chunk.id); break; } break; @@ -1674,7 +1677,7 @@ gst_avi_demux_loop (GstElement *element) stream = &avi_demux->stream[stream_id]; - GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x stream_id %d", + GST_DEBUG ("gst_avi_demux_chain: tag found %08x size %08x stream_id %d", chunk.id, chunk.size, stream_id); format = GST_FORMAT_TIME; @@ -1693,7 +1696,7 @@ gst_avi_demux_loop (GstElement *element) if (GST_PAD_IS_USABLE (stream->pad)) { if (next_ts >= stream->end_pos) { gst_pad_push (stream->pad, GST_BUFFER (gst_event_new (GST_EVENT_EOS))); - GST_DEBUG (0, "end stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT, + GST_DEBUG ("end stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT, stream_id, next_ts, stream->current_frame - 1, stream->end_pos); } @@ -1714,7 +1717,7 @@ gst_avi_demux_loop (GstElement *element) /* FIXME, do some flush event here */ stream->need_flush = FALSE; } - GST_DEBUG (0, "send stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT " %08x", + GST_DEBUG ("send stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT " %08x", stream_id, next_ts, stream->current_frame - 1, stream->delay, chunk.size); @@ -1726,7 +1729,7 @@ gst_avi_demux_loop (GstElement *element) break; } default: - GST_DEBUG (0, " ***** unknown chunkid %08x", chunk.id); + GST_DEBUG (" ***** unknown chunkid %08x", chunk.id); break; } break; diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index c54700b482..8dfa50fa17 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -25,6 +25,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -308,7 +311,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps) if (!GST_CAPS_IS_FIXED (vscaps)) return GST_PAD_LINK_DELAYED; - GST_DEBUG (0, "avimux: sinkconnect triggered on %s", gst_pad_get_name (pad)); + GST_DEBUG ("avimux: sinkconnect triggered on %s", gst_pad_get_name (pad)); for (caps = vscaps; caps != NULL; caps = vscaps = vscaps->next) { @@ -438,7 +441,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps) gst_caps_has_property(caps, "layer")) gst_caps_get_int(caps, "layer", &layer); else - GST_DEBUG(GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "No layer specified, assuming layer 3"); /* we don't need to do anything here, compressed mp3 contains it all */ @@ -497,7 +500,7 @@ gst_avimux_pad_link (GstPad *pad, return; } - GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' connected", padname); + GST_DEBUG ("pad '%s' connected", padname); } static void @@ -524,7 +527,7 @@ gst_avimux_pad_unlink (GstPad *pad, return; } - GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' unlinked", padname); + GST_DEBUG ("pad '%s' unlinked", padname); } static GstPad* diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c index f256bda723..e902894c3d 100644 --- a/gst/cutter/gstcutter.c +++ b/gst/cutter/gstcutter.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "gstcutter.h" @@ -222,7 +225,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf) if (!filter->have_caps) gst_cutter_get_caps (pad, filter); in_data = (gint16 *) GST_BUFFER_DATA (buf); - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "length of prerec buffer: %.3f sec", filter->pre_run_length); @@ -248,7 +251,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf) /* if RMS below threshold, add buffer length to silent run length count * if not, reset */ - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "buffer stats: ms %f, RMS %f, audio length %f", ms, RMS, gst_audio_length (filter->srcpad, buf)); if (RMS < filter->threshold_level) @@ -279,7 +282,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf) /* g_print ("DEBUG: cutter: start from here, turning on out\n"); */ /* first of all, flush current buffer */ g_signal_emit (G_OBJECT (filter), gst_cutter_signals[CUT_START], 0); - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "flushing buffer of length %.3f", filter->pre_run_length); while (filter->pre_buffer) @@ -289,7 +292,7 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf) gst_pad_push (filter->srcpad, prebuf); ++count; } - GST_DEBUG (GST_CAT_PLUGIN_INFO, "flushed %d buffers", count); + GST_DEBUG ("flushed %d buffers", count); filter->pre_run_length = 0.0; } } @@ -345,7 +348,7 @@ gst_cutter_set_property (GObject *object, guint prop_id, case ARG_THRESHOLD: /* set the level */ filter->threshold_level = g_value_get_double (value); - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "DEBUG: set threshold level to %f", filter->threshold_level); break; @@ -355,7 +358,7 @@ gst_cutter_set_property (GObject *object, guint prop_id, * values in dB < 0 result in values between 0 and 1 */ filter->threshold_level = pow (10, g_value_get_double (value) / 20); - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "DEBUG: set threshold level to %f", filter->threshold_level); break; diff --git a/gst/debug/efence.c b/gst/debug/efence.c index 09acc5d5ec..3178d16ee3 100644 --- a/gst/debug/efence.c +++ b/gst/debug/efence.c @@ -19,6 +19,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -200,7 +203,7 @@ gst_efence_chain (GstPad *pad, GstBuffer *buffer) GstBuffer *copy; void *ptr; - GST_DEBUG(0, "gst_efence_chain"); + GST_DEBUG ("gst_efence_chain"); g_return_if_fail (GST_IS_PAD (pad)); g_return_if_fail (buffer != NULL); @@ -322,7 +325,7 @@ GstBuffer *gst_fenced_buffer_new(void) GST_BUFFER_BUFFERPOOL (newbuf) = NULL; GST_BUFFER_POOL_PRIVATE (newbuf) = NULL; - GST_DEBUG(0, "new buffer=%p", newbuf); + GST_DEBUG ("new buffer=%p", newbuf); return newbuf; } @@ -331,7 +334,7 @@ void gst_fenced_buffer_default_free (GstBuffer *buffer) { GstFencedBuffer *fenced_buffer; - GST_DEBUG(0, "free buffer=%p", buffer); + GST_DEBUG ("free buffer=%p", buffer); g_return_if_fail (buffer != NULL); @@ -340,11 +343,11 @@ void gst_fenced_buffer_default_free (GstBuffer *buffer) /* free our data */ if (!GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_DONTFREE) && GST_BUFFER_DATA (buffer)) { - GST_DEBUG(0, "free region %p %d", fenced_buffer->region, + GST_DEBUG ("free region %p %d", fenced_buffer->region, fenced_buffer->length); munmap(fenced_buffer->region, fenced_buffer->length); }else{ - GST_DEBUG(0, "not freeing region %p %d %p", fenced_buffer->region, + GST_DEBUG ("not freeing region %p %d %p", fenced_buffer->region, GST_BUFFER_FLAGS(buffer), GST_BUFFER_DATA(buffer)); } @@ -392,7 +395,7 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length, GstFencedBuffer *fenced_buffer = (GstFencedBuffer *) buffer; int page_size; - GST_DEBUG(0, "buffer=%p length=%d fence_top=%d", buffer, length, fence_top); + GST_DEBUG ("buffer=%p length=%d fence_top=%d", buffer, length, fence_top); if(length==0)return NULL; @@ -418,7 +421,7 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length, fenced_buffer->region = region; fenced_buffer->length = alloc_size; - GST_DEBUG(0, "new region %p %d", fenced_buffer->region, + GST_DEBUG ("new region %p %d", fenced_buffer->region, fenced_buffer->length); if(fence_top){ diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c index e60b49ec57..d427a1e382 100644 --- a/gst/effectv/gstaging.c +++ b/gst/effectv/gstaging.c @@ -21,6 +21,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gsteffectv.h" diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c index 4286f07e73..a9fabd2638 100644 --- a/gst/effectv/gstdice.c +++ b/gst/effectv/gstdice.c @@ -10,6 +10,9 @@ * 270 degrees. The amount of rotation for each square is chosen at random. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "gsteffectv.h" diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c index 4d25fddd8e..f169c24949 100644 --- a/gst/effectv/gstedge.c +++ b/gst/effectv/gstedge.c @@ -21,6 +21,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "gsteffectv.h" diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c index c48cddada5..12aacb5279 100644 --- a/gst/effectv/gstquark.c +++ b/gst/effectv/gstquark.c @@ -21,6 +21,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c index 870e47a905..88b3a8b835 100644 --- a/gst/effectv/gstrev.c +++ b/gst/effectv/gstrev.c @@ -40,6 +40,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c index 38fbb7a363..f97fdae663 100644 --- a/gst/effectv/gstshagadelic.c +++ b/gst/effectv/gstshagadelic.c @@ -22,6 +22,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c index 0c5d507ff5..0216690b59 100644 --- a/gst/effectv/gstvertigo.c +++ b/gst/effectv/gstvertigo.c @@ -22,6 +22,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c index e82dcaad37..d08c265612 100644 --- a/gst/effectv/gstwarp.c +++ b/gst/effectv/gstwarp.c @@ -27,6 +27,9 @@ * by sam lantinga slouken@devolution.com */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index 337d920f81..0f4fac184d 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "flx_fmt.h" @@ -471,7 +474,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"); + GST_DEBUG ("entering loop function"); flxdec = GST_FLXDEC(element); diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 36929f0317..7275799034 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -297,7 +300,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) goom = GST_GOOM (gst_pad_get_parent (pad)); - GST_DEBUG (0, "GOOM: chainfunc called"); + GST_DEBUG ("GOOM: chainfunc called"); if (GST_IS_EVENT (bufin)) { GstEvent *event = GST_EVENT (bufin); @@ -335,7 +338,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) samples_in = GST_BUFFER_SIZE (bufin) / (sizeof (gint16) * goom->channels); - GST_DEBUG (0, "input buffer has %d samples", samples_in); + GST_DEBUG ("input buffer has %d samples", samples_in); if (GST_BUFFER_TIMESTAMP (bufin) < goom->next_time || samples_in < 512) { goto done; @@ -368,7 +371,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) done: gst_buffer_unref (bufin); - GST_DEBUG (0, "GOOM: exiting chainfunc"); + GST_DEBUG ("GOOM: exiting chainfunc"); } static GstElementStateReturn diff --git a/gst/law/alaw.c b/gst/law/alaw.c index 7f6e7de12e..1e0c5b8b9b 100644 --- a/gst/law/alaw.c +++ b/gst/law/alaw.c @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "alaw-encode.h" #include "alaw-decode.h" diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c index 5a6ce24470..d0c8bbdb00 100644 --- a/gst/law/mulaw.c +++ b/gst/law/mulaw.c @@ -1,3 +1,6 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "mulaw-encode.h" #include "mulaw-decode.h" diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index c762d8e162..ba246beaf4 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstlevel.h" #include "math.h" diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c index 4260b72b5d..e1e84b25f9 100644 --- a/gst/median/gstmedian.c +++ b/gst/median/gstmedian.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -282,7 +285,7 @@ gst_median_chain (GstPad *pad, GstBuffer *buf) data = GST_BUFFER_DATA(buf); size = GST_BUFFER_SIZE(buf); - GST_DEBUG (0,"median: have buffer of %d", GST_BUFFER_SIZE(buf)); + GST_DEBUG ("median: 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/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 384dfa0419..f6ff75a140 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -234,15 +237,15 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) monoscope = GST_MONOSCOPE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "Monoscope: chainfunc called"); + GST_DEBUG ("Monoscope: chainfunc called"); samples_in = GST_BUFFER_SIZE (bufin) / sizeof (gint16); - GST_DEBUG (0, "input buffer has %d samples", samples_in); + GST_DEBUG ("input buffer has %d samples", samples_in); /* FIXME: should really select the first 1024 samples after the timestamp. */ if (GST_BUFFER_TIMESTAMP (bufin) < monoscope->next_time || samples_in < 1024) { - GST_DEBUG (0, "timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time); + GST_DEBUG ("timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time); gst_buffer_unref (bufin); return; } @@ -258,7 +261,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) monoscope->visstate = monoscope_init (monoscope->width, monoscope->height); g_assert(monoscope->visstate != 0); - GST_DEBUG (0, "making new pad"); + GST_DEBUG ("making new pad"); caps = GST_CAPS_NEW ( "monoscopesrc", @@ -293,7 +296,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) gst_buffer_unref (bufin); - GST_DEBUG (0, "Monoscope: exiting chainfunc"); + GST_DEBUG ("Monoscope: exiting chainfunc"); } diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 16b415b922..be18775210 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "qtdemux.h" #include @@ -257,7 +260,7 @@ static gboolean gst_qtdemux_handle_sink_event (GstQTDemux *qtdemux) gst_bytestream_get_status(qtdemux->bs, &remaining, &event); type = event ? GST_EVENT_TYPE(event) : GST_EVENT_UNKNOWN; - GST_DEBUG(0,"qtdemux: event %p %d", event, type); + GST_DEBUG ("qtdemux: event %p %d", event, type); switch(type){ case GST_EVENT_EOS: @@ -268,7 +271,7 @@ static gboolean gst_qtdemux_handle_sink_event (GstQTDemux *qtdemux) g_warning("flush event"); break; case GST_EVENT_DISCONTINUOUS: - GST_DEBUG(0,"discontinuous event\n"); + GST_DEBUG ("discontinuous event\n"); //gst_bytestream_flush_fast(qtdemux->bs, remaining); break; default: @@ -324,7 +327,7 @@ static void gst_qtdemux_loop_header (GstElement *element) //cur_offset = gst_bytestream_tell(qtdemux->bs); cur_offset = qtdemux->offset; - GST_DEBUG(0,"loop at position %d",cur_offset); + GST_DEBUG ("loop at position %d",cur_offset); switch(qtdemux->state){ case QTDEMUX_STATE_HEADER: @@ -341,9 +344,9 @@ static void gst_qtdemux_loop_header (GstElement *element) }while(1); length = GUINT32_FROM_BE(*(guint32 *)data); - GST_DEBUG(0,"length %08x",length); + GST_DEBUG ("length %08x",length); fourcc = GUINT32_FROM_LE(*(guint32 *)(data+4)); - GST_DEBUG(0,"fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS(fourcc)); + GST_DEBUG ("fourcc " GST_FOURCC_FORMAT, GST_FOURCC_ARGS(fourcc)); if(length==0){ length = gst_bytestream_length(qtdemux->bs) - cur_offset; } @@ -351,9 +354,9 @@ static void gst_qtdemux_loop_header (GstElement *element) guint32 length1, length2; length1 = GUINT32_FROM_BE(*(guint32 *)(data+8)); - GST_DEBUG(0,"length1 %08x",length1); + GST_DEBUG ("length1 %08x",length1); length2 = GUINT32_FROM_BE(*(guint32 *)(data+12)); - GST_DEBUG(0,"length2 %08x",length2); + GST_DEBUG ("length2 %08x",length2); length=length2; } @@ -370,7 +373,7 @@ static void gst_qtdemux_loop_header (GstElement *element) do{ ret = gst_bytestream_read(qtdemux->bs, &moov, length); if(ret < length){ - GST_DEBUG(0,"read failed (%d < %d)",ret,length); + GST_DEBUG ("read failed (%d < %d)",ret,length); if(!gst_qtdemux_handle_sink_event(qtdemux)){ return; } @@ -395,7 +398,7 @@ static void gst_qtdemux_loop_header (GstElement *element) ret = gst_bytestream_seek(qtdemux->bs, cur_offset + length, GST_SEEK_METHOD_SET); qtdemux->offset = cur_offset + length; - GST_DEBUG(0,"seek returned %d\n",ret); + GST_DEBUG ("seek returned %d\n",ret); break; } case QTDEMUX_STATE_SEEKING_EOS: @@ -444,7 +447,7 @@ static void gst_qtdemux_loop_header (GstElement *element) GST_BUFFER(gst_event_new (GST_EVENT_EOS))); } ret = gst_bytestream_seek(qtdemux->bs, 0, GST_SEEK_METHOD_END); - GST_DEBUG(0,"seek returned %d",ret); + GST_DEBUG ("seek returned %d",ret); qtdemux->state = QTDEMUX_STATE_SEEKING_EOS; return; @@ -455,23 +458,23 @@ static void gst_qtdemux_loop_header (GstElement *element) offset = stream->samples[stream->sample_index].offset; size = stream->samples[stream->sample_index].size; - GST_DEBUG(0,"pushing from stream %d, sample_index=%d offset=%d size=%d", + GST_DEBUG ("pushing from stream %d, sample_index=%d offset=%d size=%d", index, stream->sample_index, offset, size); cur_offset = gst_bytestream_tell(qtdemux->bs); if(offset != cur_offset){ - GST_DEBUG(0,"seeking to offset %d",offset); + GST_DEBUG ("seeking to offset %d",offset); ret = gst_bytestream_seek(qtdemux->bs, offset, GST_SEEK_METHOD_SET); - GST_DEBUG(0,"seek returned %d",ret); + GST_DEBUG ("seek returned %d",ret); return; } - GST_DEBUG(0,"reading %d bytes\n",size); + GST_DEBUG ("reading %d bytes\n",size); buf = NULL; do{ ret = gst_bytestream_read(qtdemux->bs, &buf, size); if(ret < size){ - GST_DEBUG(0,"read failed (%d < %d)",ret,size); + GST_DEBUG ("read failed (%d < %d)",ret,size); if(!gst_qtdemux_handle_sink_event(qtdemux)){ return; } @@ -500,14 +503,14 @@ static GstCaps *gst_qtdemux_src_getcaps(GstPad *pad, GstCaps *caps) QtDemuxStream *stream; int i; - GST_DEBUG(0,"gst_qtdemux_src_getcaps"); + GST_DEBUG ("gst_qtdemux_src_getcaps"); qtdemux = GST_QTDEMUX(gst_pad_get_parent(pad)); g_return_val_if_fail(GST_IS_QTDEMUX(qtdemux), NULL); - GST_DEBUG(0, "looking for pad %p in qtdemux %p", pad, qtdemux); - GST_DEBUG(0, "n_streams is %d", qtdemux->n_streams); + GST_DEBUG ("looking for pad %p in qtdemux %p", pad, qtdemux); + GST_DEBUG ("n_streams is %d", qtdemux->n_streams); for(i=0;in_streams;i++){ stream = qtdemux->streams[i]; if(stream->pad == pad){ @@ -515,7 +518,7 @@ static GstCaps *gst_qtdemux_src_getcaps(GstPad *pad, GstCaps *caps) } } - GST_DEBUG(0,"Couldn't find stream cooresponding to pad\n"); + GST_DEBUG ("Couldn't find stream cooresponding to pad\n"); return NULL; } @@ -527,23 +530,23 @@ gst_qtdemux_src_link(GstPad *pad, GstCaps *caps) QtDemuxStream *stream; int i; - GST_DEBUG(0,"gst_qtdemux_src_link"); + GST_DEBUG ("gst_qtdemux_src_link"); qtdemux = GST_QTDEMUX(gst_pad_get_parent(pad)); - GST_DEBUG(0, "looking for pad %p in qtdemux %p", pad, qtdemux); + GST_DEBUG ("looking for pad %p in qtdemux %p", pad, qtdemux); g_return_val_if_fail(GST_IS_QTDEMUX(qtdemux), GST_PAD_LINK_REFUSED); - GST_DEBUG(0, "n_streams is %d", qtdemux->n_streams); + GST_DEBUG ("n_streams is %d", qtdemux->n_streams); for(i=0;in_streams;i++){ stream = qtdemux->streams[i]; - GST_DEBUG(0, "pad[%d] is %p", i, stream->pad); + GST_DEBUG ("pad[%d] is %p", i, stream->pad); if(stream->pad == pad){ return GST_PAD_LINK_OK; } } - GST_DEBUG(0,"Couldn't find stream cooresponding to pad\n"); + GST_DEBUG ("Couldn't find stream cooresponding to pad\n"); return GST_PAD_LINK_REFUSED; } @@ -581,9 +584,9 @@ void gst_qtdemux_add_stream(GstQTDemux *qtdemux, QtDemuxStream *stream) qtdemux->streams[qtdemux->n_streams] = stream; qtdemux->n_streams++; - GST_DEBUG(0, "n_streams is now %d", qtdemux->n_streams); + GST_DEBUG ("n_streams is now %d", qtdemux->n_streams); - GST_DEBUG(0, "adding pad %p to qtdemux %p", stream->pad, qtdemux); + GST_DEBUG ("adding pad %p to qtdemux %p", stream->pad, qtdemux); gst_element_add_pad(GST_ELEMENT (qtdemux), stream->pad); /* Note: we need to have everything set up before calling try_set_caps */ diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c index 63d3e0bd1b..484b7a30d5 100644 --- a/gst/rtp/gstrtpL16depay.c +++ b/gst/rtp/gstrtpL16depay.c @@ -12,6 +12,9 @@ * Library General Public License for more */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstrtpL16parse.h" #include "gstrtp-common.h" @@ -238,7 +241,7 @@ gst_rtpL16parse_chain (GstPad * pad, GstBuffer * buf) memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet), GST_BUFFER_SIZE (outbuf)); - GST_DEBUG (0,"gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); + GST_DEBUG ("gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); /* FIXME: According to RFC 1890, this is required, right? */ #if G_BYTE_ORDER == G_LITTLE_ENDIAN @@ -303,7 +306,7 @@ gst_rtpL16parse_change_state (GstElement * element) rtpL16parse = GST_RTP_L16_PARSE (element); - GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: diff --git a/gst/rtp/gstrtpL16enc.c b/gst/rtp/gstrtpL16enc.c index 9dec5cc714..c5a60a6883 100644 --- a/gst/rtp/gstrtpL16enc.c +++ b/gst/rtp/gstrtpL16enc.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstrtpL16enc.h" @@ -195,7 +198,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_DISCONTINUOUS: - GST_DEBUG (GST_CAT_EVENT, "discont"); + GST_DEBUG ("discont"); rtpL16enc->next_time = 0; gst_pad_event_default (pad, event); return; @@ -238,7 +241,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf) memcpy (GST_BUFFER_DATA (outbuf), packet->data, rtp_packet_get_packet_len (packet)); memcpy (GST_BUFFER_DATA (outbuf) + rtp_packet_get_packet_len(packet), GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); - GST_DEBUG (0,"gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); + GST_DEBUG ("gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); gst_pad_push (rtpL16enc->srcpad, outbuf); ++rtpL16enc->seq; @@ -288,7 +291,7 @@ gst_rtpL16enc_change_state (GstElement * element) rtpL16enc = GST_RTP_L16_ENC (element); - GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); /* if going down into NULL state, close the file if it's open */ switch (GST_STATE_TRANSITION (element)) { diff --git a/gst/rtp/gstrtpL16parse.c b/gst/rtp/gstrtpL16parse.c index 63d3e0bd1b..484b7a30d5 100644 --- a/gst/rtp/gstrtpL16parse.c +++ b/gst/rtp/gstrtpL16parse.c @@ -12,6 +12,9 @@ * Library General Public License for more */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstrtpL16parse.h" #include "gstrtp-common.h" @@ -238,7 +241,7 @@ gst_rtpL16parse_chain (GstPad * pad, GstBuffer * buf) memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet), GST_BUFFER_SIZE (outbuf)); - GST_DEBUG (0,"gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); + GST_DEBUG ("gst_rtpL16parse_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); /* FIXME: According to RFC 1890, this is required, right? */ #if G_BYTE_ORDER == G_LITTLE_ENDIAN @@ -303,7 +306,7 @@ gst_rtpL16parse_change_state (GstElement * element) rtpL16parse = GST_RTP_L16_PARSE (element); - GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: diff --git a/gst/rtp/gstrtpL16pay.c b/gst/rtp/gstrtpL16pay.c index 9dec5cc714..c5a60a6883 100644 --- a/gst/rtp/gstrtpL16pay.c +++ b/gst/rtp/gstrtpL16pay.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstrtpL16enc.h" @@ -195,7 +198,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_DISCONTINUOUS: - GST_DEBUG (GST_CAT_EVENT, "discont"); + GST_DEBUG ("discont"); rtpL16enc->next_time = 0; gst_pad_event_default (pad, event); return; @@ -238,7 +241,7 @@ gst_rtpL16enc_chain (GstPad * pad, GstBuffer * buf) memcpy (GST_BUFFER_DATA (outbuf), packet->data, rtp_packet_get_packet_len (packet)); memcpy (GST_BUFFER_DATA (outbuf) + rtp_packet_get_packet_len(packet), GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); - GST_DEBUG (0,"gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); + GST_DEBUG ("gst_rtpL16enc_chain: pushing buffer of size %d", GST_BUFFER_SIZE(outbuf)); gst_pad_push (rtpL16enc->srcpad, outbuf); ++rtpL16enc->seq; @@ -288,7 +291,7 @@ gst_rtpL16enc_change_state (GstElement * element) rtpL16enc = GST_RTP_L16_ENC (element); - GST_DEBUG (0, "state pending %d\n", GST_STATE_PENDING (element)); + GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); /* if going down into NULL state, close the file if it's open */ switch (GST_STATE_TRANSITION (element)) { diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 7e2917b44e..e6a55fcd00 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstsmoothwave.h" @@ -125,12 +128,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"); */ +/* GST_DEBUG ("creating palette"); */ for (i=0;i<256;i++) palette[i] = (i << 16) || (i << 8); -/* GST_DEBUG (0,"creating cmap"); */ +/* GST_DEBUG ("creating cmap"); */ smoothwave->cmap = gdk_rgb_cmap_new(palette,256); -/* GST_DEBUG (0,"created cmap"); */ +/* GST_DEBUG ("created cmap"); */ /* gtk_widget_set_default_colormap (smoothwave->cmap); */ smoothwave->image = gtk_drawing_area_new(); @@ -176,7 +179,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) qheight = smoothwave->height/4; -/* GST_DEBUG (0,"traversing %d",smoothwave->width); */ +/* GST_DEBUG ("traversing %d",smoothwave->width); */ for (i=0;iwidth,samplecount);i++) { gint16 y1 = (gint32)(samples[i*2] * qheight) / 32768 + qheight; @@ -195,8 +198,8 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) ptr++; } -/* GST_DEBUG (0,"drawing"); */ -/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);", +/* GST_DEBUG ("drawing"); */ +/* GST_DEBUG ("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, diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index 3a7d2f4edf..b6761427fb 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include "paint.h" diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index cb78bdd08c..16786e3373 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include "gstspectrum.h" diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c index 3d2580c3e2..a251eede30 100644 --- a/gst/udp/gstudpsink.c +++ b/gst/udp/gstudpsink.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstudpsink.h" #define UDP_DEFAULT_HOST "localhost" @@ -271,7 +274,7 @@ gst_udpsink_chain (GstPad *pad, GstBuffer *buf) if (udpsink->clock) { GstClockID id = gst_clock_new_single_shot_id (udpsink->clock, GST_BUFFER_TIMESTAMP (buf)); - GST_DEBUG (0, "udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf)); + GST_DEBUG ("udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf)); gst_element_clock_wait (GST_ELEMENT (udpsink), id, NULL); gst_clock_id_free (id); } diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index f400b0fb43..b3101e0029 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -18,7 +18,12 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "gstudpsrc.h" +#include #define UDP_DEFAULT_PORT 4951 #define UDP_DEFAULT_MULTICAST_GROUP "0.0.0.0" diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index ea80742078..53628471bc 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/gst/videoflip/gstvideoflip.c b/gst/videoflip/gstvideoflip.c index 6f51d7050f..6dd26247b8 100644 --- a/gst/videoflip/gstvideoflip.c +++ b/gst/videoflip/gstvideoflip.c @@ -19,6 +19,9 @@ /*#define DEBUG_ENABLED */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -188,7 +191,7 @@ gst_videoflip_sink_getcaps (GstPad *pad, GstCaps *caps) GstCaps *sizecaps; int i; - GST_DEBUG(0,"gst_videoflip_src_link"); + GST_DEBUG ("gst_videoflip_src_link"); videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad)); /* get list of peer's caps */ @@ -229,7 +232,7 @@ gst_videoflip_src_link (GstPad *pad, GstCaps *caps) GstPadLinkReturn ret; GstCaps *peercaps; - GST_DEBUG(0,"gst_videoflip_src_link"); + GST_DEBUG ("gst_videoflip_src_link"); videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) { @@ -244,7 +247,7 @@ gst_videoflip_src_link (GstPad *pad, GstCaps *caps) gst_caps_get_int (caps, "width", &videoflip->to_width); gst_caps_get_int (caps, "height", &videoflip->to_height); - GST_DEBUG(0,"width %d height %d",videoflip->to_width,videoflip->to_height); + GST_DEBUG ("width %d height %d",videoflip->to_width,videoflip->to_height); peercaps = gst_caps_copy(caps); @@ -273,7 +276,7 @@ gst_videoflip_sink_link (GstPad *pad, GstCaps *caps) GstPadLinkReturn ret; GstCaps *peercaps; - GST_DEBUG(0,"gst_videoflip_src_link"); + GST_DEBUG ("gst_videoflip_src_link"); videoflip = GST_VIDEOFLIP (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) { @@ -312,7 +315,7 @@ gst_videoflip_sink_link (GstPad *pad, GstCaps *caps) static void gst_videoflip_init (GstVideoflip *videoflip) { - GST_DEBUG(0,"gst_videoflip_init"); + GST_DEBUG ("gst_videoflip_init"); videoflip->sinkpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (gst_videoflip_sink_template_factory), "sink"); @@ -341,7 +344,7 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf) gulong size; GstBuffer *outbuf; - GST_DEBUG (0,"gst_videoflip_chain"); + GST_DEBUG ("gst_videoflip_chain"); g_return_if_fail (pad != NULL); g_return_if_fail (GST_IS_PAD (pad)); @@ -358,10 +361,10 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf) return; } - GST_DEBUG (0,"gst_videoflip_chain: got buffer of %ld bytes in '%s'",size, + GST_DEBUG ("gst_videoflip_chain: got buffer of %ld bytes in '%s'",size, GST_OBJECT_NAME (videoflip)); - GST_DEBUG(0,"size=%ld from=%dx%d to=%dx%d fromsize=%ld (should be %d) tosize=%d", + GST_DEBUG ("size=%ld from=%dx%d to=%dx%d fromsize=%ld (should be %d) tosize=%d", size, videoflip->from_width, videoflip->from_height, videoflip->to_width, videoflip->to_height, @@ -377,12 +380,12 @@ gst_videoflip_chain (GstPad *pad, GstBuffer *buf) GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf); g_return_if_fail(videoflip->format); - GST_DEBUG (0,"format %s",videoflip->format->fourcc); + GST_DEBUG ("format %s",videoflip->format->fourcc); g_return_if_fail(videoflip->format->scale); videoflip->format->scale(videoflip, GST_BUFFER_DATA(outbuf), data); - GST_DEBUG (0,"gst_videoflip_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf), + GST_DEBUG ("gst_videoflip_chain: pushing buffer of %d bytes in '%s'",GST_BUFFER_SIZE(outbuf), GST_OBJECT_NAME (videoflip)); gst_pad_push(videoflip->srcpad, outbuf); @@ -399,7 +402,7 @@ gst_videoflip_set_property (GObject *object, guint prop_id, const GValue *value, g_return_if_fail(GST_IS_VIDEOFLIP(object)); src = GST_VIDEOFLIP(object); - GST_DEBUG(0,"gst_videoflip_set_property"); + GST_DEBUG ("gst_videoflip_set_property"); switch (prop_id) { case ARG_METHOD: src->method = g_value_get_enum (value); diff --git a/gst/videoflip/videoflip.c b/gst/videoflip/videoflip.c index ea93a7c6ce..1476401995 100644 --- a/gst/videoflip/videoflip.c +++ b/gst/videoflip/videoflip.c @@ -74,7 +74,7 @@ videoflip_find_by_caps(GstCaps *caps) { int i; - GST_DEBUG (0,"finding %p",caps); + GST_DEBUG ("finding %p",caps); g_return_val_if_fail(caps != NULL, NULL); @@ -121,13 +121,13 @@ gst_videoflip_setup (GstVideoflip *videoflip) break; } - GST_DEBUG (0,"format=%p \"%s\" from %dx%d to %dx%d", + GST_DEBUG ("format=%p \"%s\" from %dx%d to %dx%d", videoflip->format, videoflip->format->fourcc, videoflip->from_width, videoflip->from_height, videoflip->to_width, videoflip->to_height); if(videoflip->method == GST_VIDEOFLIP_METHOD_IDENTITY){ - GST_DEBUG (0,"videoflip: using passthru"); + GST_DEBUG ("videoflip: using passthru"); videoflip->passthru = TRUE; videoflip->inited = TRUE; return; @@ -149,7 +149,7 @@ gst_videoflip_planar411 (GstVideoflip *scale, unsigned char *dest, unsigned char int dw = scale->to_width; int dh = scale->to_height; - GST_DEBUG (0,"videoflip: scaling planar 4:1:1 %dx%d to %dx%d", sw, sh, dw, dh); + GST_DEBUG ("videoflip: scaling planar 4:1:1 %dx%d to %dx%d", sw, sh, dw, dh); gst_videoflip_flip(scale, dest, src, sw, sh, dw, dh); diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index 21736cb900..81487867fc 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -18,6 +18,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 3385fed32d..f8966fc123 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -18,6 +18,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -233,7 +236,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) g_return_if_fail (GST_BUFFER_DATA (buf) != NULL); wavparse = GST_WAVPARSE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "gst_wavparse_chain: got buffer in '%s'", + GST_DEBUG ("gst_wavparse_chain: got buffer in '%s'", gst_object_get_name (GST_OBJECT (wavparse))); size = GST_BUFFER_SIZE (buf); @@ -298,7 +301,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) } if (wavparse->state == GST_WAVPARSE_OTHER) { - GST_DEBUG (0, "we're in unknown territory here, not passing on"); + GST_DEBUG ("we're in unknown territory here, not passing on"); return; } @@ -311,7 +314,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) if (wavparse->state == GST_WAVPARSE_UNKNOWN) { gint retval; - GST_DEBUG (0, "GstWavParse: checking for RIFF format"); + GST_DEBUG ("GstWavParse: checking for RIFF format"); /* create a new RIFF parser */ wavparse->riff = gst_riff_new (); @@ -320,13 +323,13 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) retval = gst_riff_next_buffer (wavparse->riff, buf, 0); buffer_riffed = TRUE; if (retval < 0) { - GST_DEBUG (0, "sorry, isn't RIFF"); + GST_DEBUG ("sorry, isn't RIFF"); return; } /* this has to be a file of form WAVE for us to deal with it */ if (wavparse->riff->form != gst_riff_fourcc_to_id ("WAVE")) { - GST_DEBUG (0, "sorry, isn't WAVE"); + GST_DEBUG ("sorry, isn't WAVE"); return; } @@ -339,7 +342,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) GstRiffChunk *fmt; GstWavParseFormat *format; - GST_DEBUG (0, "GstWavParse: looking for fmt chunk"); + GST_DEBUG ("GstWavParse: looking for fmt chunk"); /* there's a good possibility we may not have parsed this buffer */ if (buffer_riffed == FALSE) { @@ -417,7 +420,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) return; } - GST_DEBUG (0, "frequency %d, channels %d", + GST_DEBUG ("frequency %d, channels %d", wavparse->rate, wavparse->channels); /* we're now looking for the data chunk */ @@ -434,7 +437,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) GstBuffer *newbuf; GstRiffChunk *datachunk; - GST_DEBUG (0, "GstWavParse: looking for data chunk"); + GST_DEBUG ("GstWavParse: looking for data chunk"); /* again, we might need to parse the buffer */ if (buffer_riffed == FALSE) { @@ -447,7 +450,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) if (datachunk != NULL) { gulong subsize; - GST_DEBUG (0, "data begins at %ld", datachunk->offset); + GST_DEBUG ("data begins at %ld", datachunk->offset); wavparse->datastart = datachunk->offset; @@ -456,7 +459,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) /* now we construct a new buffer for the remainder */ subsize = size - datachunk->offset; - GST_DEBUG (0, "sending last %ld bytes along as audio", subsize); + GST_DEBUG ("sending last %ld bytes along as audio", subsize); newbuf = gst_buffer_create_sub (buf, datachunk->offset, subsize); gst_buffer_unref (buf); @@ -510,7 +513,7 @@ gst_wavparse_pad_convert (GstPad *pad, bytes_per_sample = wavparse->channels * wavparse->width / 8; if (bytes_per_sample == 0) { - GST_DEBUG (0, "bytes_per_sample is 0, probably an mp3 - channels %d, width %d\n", + GST_DEBUG ("bytes_per_sample is 0, probably an mp3 - channels %d, width %d\n", wavparse->channels, wavparse->width); return FALSE; } @@ -519,7 +522,7 @@ gst_wavparse_pad_convert (GstPad *pad, g_warning ("byterate is 0, internal error\n"); return FALSE; } - GST_DEBUG (0, "bytes per sample: %d\n", bytes_per_sample); + GST_DEBUG ("bytes per sample: %d\n", bytes_per_sample); switch (src_format) { case GST_FORMAT_BYTES: @@ -589,7 +592,7 @@ gst_wavparse_pad_query (GstPad *pad, GstQueryType type, g_warning ("Could not query sink pad's peer\n"); return FALSE; } - GST_DEBUG (0, "pad_query done, value %" G_GINT64_FORMAT "\n", *value); + GST_DEBUG ("pad_query done, value %" G_GINT64_FORMAT "\n", *value); return TRUE; } @@ -610,7 +613,7 @@ gst_wavparse_srcpad_event (GstPad *pad, GstEvent *event) GstWavParse *wavparse = GST_WAVPARSE (GST_PAD_PARENT (pad)); gboolean res = FALSE; - GST_DEBUG(0, "event %d", GST_EVENT_TYPE (event)); + GST_DEBUG ("event %d", GST_EVENT_TYPE (event)); switch (GST_EVENT_TYPE (event)) { case GST_EVENT_SEEK: diff --git a/m4/as-slurp-ffmpeg.m4 b/m4/as-slurp-ffmpeg.m4 index 9108edbfad..625eccd2ac 100644 --- a/m4/as-slurp-ffmpeg.m4 +++ b/m4/as-slurp-ffmpeg.m4 @@ -18,6 +18,7 @@ dnl a date spec) AC_DEFUN(AS_SLURP_FFMPEG, [ # save original dir + FAILED="" DIRECTORY=`pwd` # get/update cvs if test ! -d $1; then mkdir -p $1; fi @@ -27,18 +28,17 @@ AC_DEFUN(AS_SLURP_FFMPEG, # check out cvs code AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1) cvs -Q -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes - cd ffmpeg + echo "$2" > Tag else # compare against Tag file and see if it needs updating - if diff -q Tag ffmpeg/CVS/Tag > /dev/null 2> /dev/null - then - # diff returned no problem + if test "`cat Tag`" == "$2"; then AC_MSG_NOTICE(ffmpeg cvs code in sync) else - # diff says they differ cd ffmpeg - AC_MSG_NOTICE(updating ffmpeg cvs code) + AC_MSG_NOTICE(updating ffmpeg cvs code to $2) cvs -Q update -dP -D '$2' || FAILED=yes + cd .. + echo "$2" > Tag fi fi diff --git a/sys/oss/gstosscommon.c b/sys/oss/gstosscommon.c index 6d96f9c4d8..c3346b8f08 100644 --- a/sys/oss/gstosscommon.c +++ b/sys/oss/gstosscommon.c @@ -47,24 +47,24 @@ gst_ossformat_get (gint law, gint endianness, gboolean sign, gint width, gint de if (sign == TRUE) { if (endianness == G_LITTLE_ENDIAN) { *format = AFMT_S16_LE; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "16 bit signed LE, no law (%d)", *format); } else if (endianness == G_BIG_ENDIAN) { *format = AFMT_S16_BE; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "16 bit signed BE, no law (%d)", *format); } } else { if (endianness == G_LITTLE_ENDIAN) { *format = AFMT_U16_LE; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "16 bit unsigned LE, no law (%d)", *format); } else if (endianness == G_BIG_ENDIAN) { *format = AFMT_U16_BE; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "16 bit unsigned BE, no law (%d)", *format); } } @@ -73,23 +73,23 @@ gst_ossformat_get (gint law, gint endianness, gboolean sign, gint width, gint de else if (width == 8) { if (sign == TRUE) { *format = AFMT_S8; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "8 bit signed, no law (%d)", *format); } else { *format = AFMT_U8; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "8 bit unsigned, no law (%d)", *format); } *bps = 1; } } else if (law == 1) { *format = AFMT_MU_LAW; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "mu law (%d)", *format); } else if (law == 2) { *format = AFMT_A_LAW; - GST_DEBUG (GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "a law (%d)", *format); } else { g_critical ("unknown law"); @@ -147,7 +147,7 @@ gst_osscommon_parse_caps (GstOssCommon *common, GstCaps *caps) if (!gst_ossformat_get (common->law, common->endianness, common->sign, common->width, common->depth, &format, &bps)) { - GST_DEBUG (GST_CAT_PLUGIN_INFO, "could not get format"); + GST_DEBUG ("could not get format"); return FALSE; } @@ -216,7 +216,7 @@ gst_osscommon_sync_parms (GstOssCommon *common) else frag = 0x7FFF0000 | common->fragment; - GST_INFO (GST_CAT_PLUGIN_INFO, + GST_INFO ( "common: setting sound card to %dHz %d format %s (%08x fragment)", common->rate, common->format, (common->channels == 2) ? "stereo" : "mono", frag); @@ -250,7 +250,7 @@ gst_osscommon_sync_parms (GstOssCommon *common) } common->fragment = space.fragstotal << 16 | frag_ln; - GST_INFO (GST_CAT_PLUGIN_INFO, + GST_INFO ( "common: set sound card to %dHz, %d format, %s " "(%d bytes buffer, %08x fragment)", common->rate, common->format, @@ -258,7 +258,7 @@ gst_osscommon_sync_parms (GstOssCommon *common) space.bytes, common->fragment); common->fragment_time = (GST_SECOND * common->fragment_size) / common->bps; - GST_INFO (GST_CAT_PLUGIN_INFO, "fragment time %u %" G_GUINT64_FORMAT "\n", + GST_INFO ( "fragment time %u %" G_GUINT64_FORMAT "\n", common->bps, common->fragment_time); if (target_format != common->format || @@ -278,7 +278,7 @@ gst_osscommon_open_audio (GstOssCommon *common, GstOssOpenMode mode, gchar **err gint caps; g_return_val_if_fail (common->fd == -1, FALSE); - GST_INFO (GST_CAT_PLUGIN_INFO, "common: attempting to open sound device"); + GST_INFO ( "common: attempting to open sound device"); /* first try to open the sound card */ if (mode == GST_OSSCOMMON_WRITE) { @@ -336,41 +336,41 @@ gst_osscommon_open_audio (GstOssCommon *common, GstOssOpenMode mode, gchar **err /* set card state */ ioctl (common->fd, SNDCTL_DSP_GETCAPS, &caps); - GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Capabilities %08x", caps); + GST_INFO ( "osscommon: Capabilities %08x", caps); - if (caps & DSP_CAP_DUPLEX) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Full duplex"); - if (caps & DSP_CAP_REALTIME) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Realtime"); - if (caps & DSP_CAP_BATCH) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Batch"); - if (caps & DSP_CAP_COPROC) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Has coprocessor"); - if (caps & DSP_CAP_TRIGGER) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Trigger"); - if (caps & DSP_CAP_MMAP) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Direct access"); + if (caps & DSP_CAP_DUPLEX) GST_INFO ( "osscommon: Full duplex"); + if (caps & DSP_CAP_REALTIME) GST_INFO ( "osscommon: Realtime"); + if (caps & DSP_CAP_BATCH) GST_INFO ( "osscommon: Batch"); + if (caps & DSP_CAP_COPROC) GST_INFO ( "osscommon: Has coprocessor"); + if (caps & DSP_CAP_TRIGGER) GST_INFO ( "osscommon: Trigger"); + if (caps & DSP_CAP_MMAP) GST_INFO ( "osscommon: Direct access"); #ifdef DSP_CAP_MULTI - if (caps & DSP_CAP_MULTI) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Multiple open"); + if (caps & DSP_CAP_MULTI) GST_INFO ( "osscommon: Multiple open"); #endif /* DSP_CAP_MULTI */ #ifdef DSP_CAP_BIND - if (caps & DSP_CAP_BIND) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Channel binding"); + if (caps & DSP_CAP_BIND) GST_INFO ( "osscommon: Channel binding"); #endif /* DSP_CAP_BIND */ ioctl(common->fd, SNDCTL_DSP_GETFMTS, &caps); - GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: Formats %08x", caps); - if (caps & AFMT_MU_LAW) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: MU_LAW"); - if (caps & AFMT_A_LAW) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: A_LAW"); - if (caps & AFMT_IMA_ADPCM) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: IMA_ADPCM"); - if (caps & AFMT_U8) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: U8"); - if (caps & AFMT_S16_LE) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: S16_LE"); - if (caps & AFMT_S16_BE) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: S16_BE"); - if (caps & AFMT_S8) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: S8"); - if (caps & AFMT_U16_LE) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: U16_LE"); - if (caps & AFMT_U16_BE) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: U16_BE"); - if (caps & AFMT_MPEG) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: MPEG"); + GST_INFO ( "osscommon: Formats %08x", caps); + if (caps & AFMT_MU_LAW) GST_INFO ( "osscommon: MU_LAW"); + if (caps & AFMT_A_LAW) GST_INFO ( "osscommon: A_LAW"); + if (caps & AFMT_IMA_ADPCM) GST_INFO ( "osscommon: IMA_ADPCM"); + if (caps & AFMT_U8) GST_INFO ( "osscommon: U8"); + if (caps & AFMT_S16_LE) GST_INFO ( "osscommon: S16_LE"); + if (caps & AFMT_S16_BE) GST_INFO ( "osscommon: S16_BE"); + if (caps & AFMT_S8) GST_INFO ( "osscommon: S8"); + if (caps & AFMT_U16_LE) GST_INFO ( "osscommon: U16_LE"); + if (caps & AFMT_U16_BE) GST_INFO ( "osscommon: U16_BE"); + if (caps & AFMT_MPEG) GST_INFO ( "osscommon: MPEG"); #ifdef AFMT_AC3 - if (caps & AFMT_AC3) GST_INFO (GST_CAT_PLUGIN_INFO, "osscommon: AC3"); + if (caps & AFMT_AC3) GST_INFO ( "osscommon: AC3"); #endif - GST_INFO (GST_CAT_PLUGIN_INFO, + GST_INFO ( "osscommon: opened audio (%s) with fd=%d", common->device, common->fd); common->caps = caps; diff --git a/sys/oss/gstossgst.c b/sys/oss/gstossgst.c index 337dff483c..71feae3679 100644 --- a/sys/oss/gstossgst.c +++ b/sys/oss/gstossgst.c @@ -21,6 +21,9 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include @@ -173,7 +176,7 @@ gst_ossgst_format_to_caps (gint format, gint stereo, gint rate) gint width = 16; gboolean supported = TRUE; - GST_DEBUG (0, "have format 0x%08x %d %d", format, stereo, rate); + GST_DEBUG ("have format 0x%08x %d %d", format, stereo, rate); switch (format) { case AFMT_MU_LAW: @@ -342,7 +345,7 @@ gst_ossgst_spawn_process (GstOssGst *ossgst) pipe(ossgst->fdin); pipe(ossgst->fdout); - GST_DEBUG (0, "about to fork"); + GST_DEBUG ("about to fork"); if((ossgst->childpid = fork()) == -1) { @@ -350,13 +353,13 @@ gst_ossgst_spawn_process (GstOssGst *ossgst) gst_element_error(GST_ELEMENT(ossgst),"forking"); return FALSE; } - GST_DEBUG (0,"forked %d", ossgst->childpid); + GST_DEBUG ("forked %d", ossgst->childpid); if(ossgst->childpid == 0) { gchar **args; - GST_DEBUG (0, "fork command %d", ossgst->childpid); + GST_DEBUG ("fork command %d", ossgst->childpid); ld_preload = getenv ("LD_PRELOAD"); diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 7bd4c9886e..1c42405816 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -20,11 +20,15 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include +#include -#include +#include "gstosssink.h" /* elementfactory information */ static GstElementDetails gst_osssink_details = { @@ -634,7 +638,7 @@ gst_osssink_change_state (GstElement *element) gst_osscommon_close_audio (&osssink->common); GST_FLAG_UNSET (osssink, GST_OSSSINK_OPEN); - GST_INFO (GST_CAT_PLUGIN_INFO, "osssink: closed sound device"); + GST_INFO ( "osssink: closed sound device"); } break; } diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 68593d80f2..046e8cc21e 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -20,6 +20,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include #include @@ -322,7 +325,7 @@ gst_osssrc_get (GstPad *pad) src = GST_OSSSRC(gst_pad_get_parent (pad)); - GST_DEBUG (GST_CAT_PLUGIN_INFO, "attempting to read something from the soundcard"); + GST_DEBUG ("attempting to read something from the soundcard"); if (src->need_eos) { src->need_eos = FALSE; @@ -368,7 +371,7 @@ gst_osssrc_get (GstPad *pad) src->curoffset += readbytes; - GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from soundcard of %ld bytes, timestamp %" G_GINT64_FORMAT, + GST_DEBUG ("pushed buffer from soundcard of %ld bytes, timestamp %" G_GINT64_FORMAT, readbytes, GST_BUFFER_TIMESTAMP (buf)); return buf; @@ -426,7 +429,7 @@ gst_osssrc_change_state (GstElement *element) { GstOssSrc *osssrc = GST_OSSSRC (element); - GST_DEBUG (GST_CAT_PLUGIN_INFO, "osssrc: state change"); + GST_DEBUG ("osssrc: state change"); switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index f5c87ce93b..f28c59a67c 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -430,7 +430,7 @@ gst_v4l2src_v4l2fourcc_to_caps (guint32 fourcc, break; } default: - GST_DEBUG(GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "Unknown fourcc 0x%08x " GST_FOURCC_FORMAT ", trying default", fourcc, GST_FOURCC_ARGS(fourcc)); diff --git a/sys/v4l2/v4l2-overlay_calls.c b/sys/v4l2/v4l2-overlay_calls.c index a78cdc6819..d6b35366d8 100644 --- a/sys/v4l2/v4l2-overlay_calls.c +++ b/sys/v4l2/v4l2-overlay_calls.c @@ -31,7 +31,7 @@ #include "v4l2_calls.h" #define DEBUG(format, args...) \ - GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \ + GST_DEBUG_OBJECT (\ GST_ELEMENT(v4l2element), \ "V4L2-overlay: " format, ##args) diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index 24d2574452..6f01328f97 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -31,7 +31,7 @@ #include "v4l2_calls.h" #define DEBUG(format, args...) \ - GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \ + GST_DEBUG_OBJECT (\ GST_ELEMENT(v4l2element), \ "V4L2: " format, ##args) diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index fd524b0d97..521196cf4a 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -29,7 +29,7 @@ #include #define DEBUG(format, args...) \ - GST_DEBUG_ELEMENT(GST_CAT_PLUGIN_INFO, \ + GST_DEBUG_OBJECT (\ GST_ELEMENT(v4l2src), \ "V4L2SRC: " format, ##args) @@ -400,7 +400,7 @@ gst_v4l2src_grab_frame (GstV4l2Src *v4l2src, while (v4l2src->frame_queue_state[v4l2src->queue_frame] != QUEUE_STATE_READY_FOR_QUEUE && !v4l2src->quit) { - GST_DEBUG(GST_CAT_PLUGIN_INFO, + GST_DEBUG ( "Waiting for frames to become available (%d < %d)", v4l2src->num_queued, MIN_BUFFERS_QUEUED); g_cond_wait(v4l2src->cond_queue_state,