diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-11-26 14:51:34 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-11-26 14:51:34 +0000 |
| commit | dbb97e6823269a9c97074aebc5ec8297b119a437 (patch) | |
| tree | 0e7f462081680144914880e736f3e33396905736 /ext | |
| parent | d9c6d0dde9359d084b1eb800932ffd90a1700629 (diff) | |
flac debug cleanup m4 for ffmpeg
Original commit message from CVS:
flac debug cleanup
m4 for ffmpeg
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 14 | ||||
| -rw-r--r-- | ext/flac/gstflacdec.c | 10 |
2 files changed, 15 insertions, 9 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 763c6776..c2a973f3 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -76,6 +76,12 @@ else GSM_DIR= endif +if USE_FFMPEG +FFMPEG_DIR=ffmpeg +else +FFMPEG_DIR= +endif + if USE_FLAC FLAC_DIR=flac else @@ -142,12 +148,6 @@ else LIBFAME_DIR= endif -if USE_LIBPNG -LIBPNG_DIR=libpng -else -LIBPNG_DIR= -endif - if USE_MAD MAD_DIR=mad else @@ -242,7 +242,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ - $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ + $(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBDV_DIR) $(LIBFAME_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index ac939c36..ef782e03 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -433,9 +433,11 @@ gst_flacdec_loop (GstElement *element) flacdec = GST_FLACDEC (element); + GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: entering loop"); if (flacdec->init) { + GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: initializing decoder"); FLAC__seekable_stream_decoder_init (flacdec->decoder); - //FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder); + /* FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder); */ flacdec->init = FALSE; } @@ -455,19 +457,23 @@ gst_flacdec_loop (GstElement *element) flacdec->seek_pending = FALSE; } + GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: processing single"); res = FLAC__seekable_stream_decoder_process_single (flacdec->decoder); + GST_DEBUG (GST_CAT_PLUGIN_INFO, "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"); FLAC__seekable_stream_decoder_finish(flacdec->decoder); flacdec->init = TRUE; - event = gst_event_new(GST_EVENT_EOS); + event = gst_event_new (GST_EVENT_EOS); gst_pad_push (flacdec->srcpad, GST_BUFFER (event)); gst_element_set_eos (element); } + GST_DEBUG (GST_CAT_PLUGIN_INFO, "flacdec: _loop end"); } GST_FORMATS_FUNCTION (gst_flacdec_get_src_formats, |