From 4ece6347f9a8f4d3536054705345ea5f605cad84 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sat, 30 Oct 2004 06:44:02 +0000 Subject: [PATCH] ext/dv/gstdvdec.c: Set EOS on the element when processing an EOS event. Original commit message from CVS: * ext/dv/gstdvdec.c: (gst_dvdec_handle_sink_event): Set EOS on the element when processing an EOS event. * ext/speex/gstspeexdec.h: * ext/speex/gstspeexenc.h: Only keep a const ptr to the mode * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps_with_data), (gst_riff_create_audio_template_caps): Allow WMAV3, with up to 6 channels. * gst/asfdemux/gstasfmux.c: (gst_asfmux_request_new_pad): Don't call gst_pad_set_event_function on a sink pad. * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_get_subpicture_stream), (gst_dvd_demux_set_cur_audio), (gst_dvd_demux_set_cur_subpicture): Copy the explicit caps that were set across to the cur_* pads, instead of trying to use a possibly non-existent negotiated caps. Reset the type of subpicture pads to UNKNOWN after calling init_stream, so that the caps get set. --- ChangeLog | 21 +++++++++++++++++++++ ext/dv/gstdvdec.c | 3 +++ ext/speex/gstspeexdec.h | 2 +- ext/speex/gstspeexenc.h | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddec267c8c..e5ecc886b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2004-10-30 Jan Schmidt + + * ext/dv/gstdvdec.c: (gst_dvdec_handle_sink_event): + Set EOS on the element when processing an EOS event. + * ext/speex/gstspeexdec.h: + * ext/speex/gstspeexenc.h: + Only keep a const ptr to the mode + * gst-libs/gst/riff/riff-media.c: + (gst_riff_create_audio_caps_with_data), + (gst_riff_create_audio_template_caps): + Allow WMAV3, with up to 6 channels. + * gst/asfdemux/gstasfmux.c: (gst_asfmux_request_new_pad): + Don't call gst_pad_set_event_function on a sink pad. + * gst/mpegstream/gstdvddemux.c: + (gst_dvd_demux_get_subpicture_stream), + (gst_dvd_demux_set_cur_audio), (gst_dvd_demux_set_cur_subpicture): + Copy the explicit caps that were set across to the cur_* pads, + instead of trying to use a possibly non-existent negotiated caps. + Reset the type of subpicture pads to UNKNOWN after calling init_stream, + so that the caps get set. + 2004-10-29 Martin Pitt Reviewed by: Ronald S. Bultje diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 19bf308f88..dbfbe5b374 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -657,6 +657,9 @@ gst_dvdec_handle_sink_event (GstDVDec * dvdec) gst_event_ref (event); gst_pad_push (dvdec->audiosrcpad, GST_DATA (event)); } + if (type == GST_EVENT_EOS) { + gst_element_set_eos (GST_ELEMENT (dvdec)); + } break; } case GST_EVENT_DISCONTINUOUS: diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h index dcb04a2c7c..f0cd61c08d 100644 --- a/ext/speex/gstspeexdec.h +++ b/ext/speex/gstspeexdec.h @@ -57,7 +57,7 @@ struct _GstSpeexDec { void *state; SpeexStereoState stereo; - SpeexMode *mode; + const SpeexMode * mode; SpeexHeader *header; SpeexCallback callback; SpeexBits bits; diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h index dc1983b6aa..0c00203108 100644 --- a/ext/speex/gstspeexenc.h +++ b/ext/speex/gstspeexenc.h @@ -70,7 +70,7 @@ struct _GstSpeexEnc { SpeexBits bits; SpeexHeader header; - SpeexMode *speex_mode; + const SpeexMode *speex_mode; void *state; GstSpeexMode mode; GstAdapter *adapter;