mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add ogg/vorbis support for avi files

Browse source 
Original commit message from CVS:
Add ogg/vorbis support for avi files
This commit is contained in:
Ronald S. Bultje 2002-10-27 18:08:43 +00:00
parent 53e95e4cea
commit 027ddda3f0
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/avi/gstavidemux.c
View file

@ -146,6 +146,11 @@ GST_PAD_TEMPLATE_FACTORY (src_audio_templ,
"avidemux_src_audio", "avidemux_src_audio",
"audio/mp3", "audio/mp3",
NULL NULL
),
GST_CAPS_NEW (
"avidemux_src_audio",
"application/x-ogg",
NULL
) )
) )
@ -511,13 +516,13 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
/* let's try some gstreamer-formatted mime types */ /* let's try some gstreamer-formatted mime types */
switch (GUINT16_FROM_LE(strf->format)) switch (GUINT16_FROM_LE(strf->format))
{ {
case 0x0050: case GST_RIFF_WAVE_FORMAT_MPEGL3:
case 0x0055: /* mp3 */ case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp3 */
newcaps = gst_caps_new ("avidemux_audio_src", newcaps = gst_caps_new ("avidemux_audio_src",
"audio/mp3", "audio/mp3",
NULL); NULL);
break; break;
case 0x0001: /* PCM/wav */ case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */
newcaps = gst_caps_new ("avidemux_audio_src", newcaps = gst_caps_new ("avidemux_audio_src",
"audio/raw", "audio/raw",
gst_props_new ( gst_props_new (
@ -533,6 +538,16 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
NULL NULL
)); ));
break; break;
case GST_RIFF_WAVE_FORMAT_VORBIS1: /* ogg/vorbis mode 1 */
case GST_RIFF_WAVE_FORMAT_VORBIS2: /* ogg/vorbis mode 2 */
case GST_RIFF_WAVE_FORMAT_VORBIS3: /* ogg/vorbis mode 3 */
case GST_RIFF_WAVE_FORMAT_VORBIS1PLUS: /* ogg/vorbis mode 1+ */
case GST_RIFF_WAVE_FORMAT_VORBIS2PLUS: /* ogg/vorbis mode 2+ */
case GST_RIFF_WAVE_FORMAT_VORBIS3PLUS: /* ogg/vorbis mode 3+ */
newcaps = gst_caps_new ("avidemux_audio_src",
"application/x-ogg",
NULL);
break;
} }
if (newcaps) capslist = gst_caps_append(capslist, newcaps); if (newcaps) capslist = gst_caps_append(capslist, newcaps);

10
gst/avi/gstavimux.c
View file

@ -157,6 +157,11 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
"avimux_sink_audio", "avimux_sink_audio",
"audio/mp3", "audio/mp3",
NULL NULL
),
GST_CAPS_NEW (
"avimux_sink_audio",
"application/x-ogg",
NULL
) )
) )
@ -424,6 +429,11 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
GST_RIFF_WAVE_FORMAT_MPEGL12); GST_RIFF_WAVE_FORMAT_MPEGL12);
goto done; goto done;
} }
else if (!strcmp (mimetype, "application/x-ogg"))
{
avimux->auds.format = GST_RIFF_WAVE_FORMAT_VORBIS1;
goto done;
}
} }
return GST_PAD_CONNECT_REFUSED; return GST_PAD_CONNECT_REFUSED;