diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2004-10-30 06:44:03 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2004-10-30 06:44:03 +0000 |
| commit | b3dd7657aa62c6dee93575133683888daf42b2fe (patch) | |
| tree | d09c89829c8b826b560ffb6ef3c0858fd633511a | |
| parent | 8640aa0703efb4afd903740a2206d70d1e0b9095 (diff) | |
| download | gst-plugins-bad-b3dd7657aa62c6dee93575133683888daf42b2fe.tar.gz gst-plugins-bad-b3dd7657aa62c6dee93575133683888daf42b2fe.tar.bz2 gst-plugins-bad-b3dd7657aa62c6dee93575133683888daf42b2fe.zip | |
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.
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 3 |
2 files changed, 24 insertions, 0 deletions
@@ -1,3 +1,24 @@ +2004-10-30 Jan Schmidt <thaytan@mad.scientist.com> + + * 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 <martin.pitt@canonical.com> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 9912a6e8..9dbb31da 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -459,6 +459,8 @@ gst_riff_create_audio_caps_with_data (guint16 codec_id, { gint version = (codec_id - GST_RIFF_WAVE_FORMAT_WMAV1) + 1; + channels_max = 6; + block_align = TRUE; caps = gst_caps_new_simple ("audio/x-wma", @@ -613,6 +615,7 @@ gst_riff_create_audio_template_caps (void) GST_RIFF_WAVE_FORMAT_DVI_ADPCM, GST_RIFF_WAVE_FORMAT_WMAV1, GST_RIFF_WAVE_FORMAT_WMAV2, + GST_RIFF_WAVE_FORMAT_WMAV3, /* FILL ME */ 0 }; |