mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-02 09:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Clean up AAC caps mess

Browse source
This commit is contained in:
Thibault Saunier 2012-02-21 11:12:53 -03:00 committed by Edward Hervey
parent dc8b6c678d
commit 48a699812b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/mpegtsdemux/tsdemux.c
View file

@ -147,9 +147,12 @@ struct _TSDemuxStream
GST_STATIC_CAPS ( \ GST_STATIC_CAPS ( \
"audio/mpeg, " \ "audio/mpeg, " \
"mpegversion = (int) 1;" \ "mpegversion = (int) 1;" \
"audio/mpeg, " \
"mpegversion = (int) 2, " \
"stream-format = (string) adts; " \
"audio/mpeg, " \ "audio/mpeg, " \
"mpegversion = (int) 4, " \ "mpegversion = (int) 4, " \
"stream-format = (string) {adts, loas}; " \ "stream-format = (string) latm; " \
"audio/x-lpcm, " \ "audio/x-lpcm, " \
"width = (int) { 16, 20, 24 }, " \ "width = (int) { 16, 20, 24 }, " \
"rate = (int) { 48000, 96000 }, " \ "rate = (int) { 48000, 96000 }, " \
@ -1116,7 +1119,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
template = gst_static_pad_template_get (&audio_template); template = gst_static_pad_template_get (&audio_template);
name = g_strdup_printf ("audio_%04x", bstream->pid); name = g_strdup_printf ("audio_%04x", bstream->pid);
caps = gst_caps_new_simple ("audio/mpeg", caps = gst_caps_new_simple ("audio/mpeg",
"mpegversion", G_TYPE_INT, 4, "mpegversion", G_TYPE_INT, 2,
"stream-format", G_TYPE_STRING, "adts", NULL); "stream-format", G_TYPE_STRING, "adts", NULL);
break; break;
case ST_AUDIO_AAC_LATM: case ST_AUDIO_AAC_LATM:
@ -1124,7 +1127,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
name = g_strdup_printf ("audio_%04x", bstream->pid); name = g_strdup_printf ("audio_%04x", bstream->pid);
caps = gst_caps_new_simple ("audio/mpeg", caps = gst_caps_new_simple ("audio/mpeg",
"mpegversion", G_TYPE_INT, 4, "mpegversion", G_TYPE_INT, 4,
"stream-format", G_TYPE_STRING, "loas", NULL); "stream-format", G_TYPE_STRING, "latm", NULL);
break; break;
case ST_VIDEO_MPEG4: case ST_VIDEO_MPEG4:
template = gst_static_pad_template_get (&video_template); template = gst_static_pad_template_get (&video_template);