From 48a699812b5cb25d712d737740e9cf64147c1eac Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 21 Feb 2012 11:12:53 -0300 Subject: [PATCH] tsdemux: Clean up AAC caps mess --- gst/mpegtsdemux/tsdemux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index 5be489eb9c..8f3e1e4734 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -147,9 +147,12 @@ struct _TSDemuxStream GST_STATIC_CAPS ( \ "audio/mpeg, " \ "mpegversion = (int) 1;" \ + "audio/mpeg, " \ + "mpegversion = (int) 2, " \ + "stream-format = (string) adts; " \ "audio/mpeg, " \ "mpegversion = (int) 4, " \ - "stream-format = (string) {adts, loas}; " \ + "stream-format = (string) latm; " \ "audio/x-lpcm, " \ "width = (int) { 16, 20, 24 }, " \ "rate = (int) { 48000, 96000 }, " \ @@ -1116,7 +1119,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, template = gst_static_pad_template_get (&audio_template); name = g_strdup_printf ("audio_%04x", bstream->pid); caps = gst_caps_new_simple ("audio/mpeg", - "mpegversion", G_TYPE_INT, 4, + "mpegversion", G_TYPE_INT, 2, "stream-format", G_TYPE_STRING, "adts", NULL); break; 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); caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 4, - "stream-format", G_TYPE_STRING, "loas", NULL); + "stream-format", G_TYPE_STRING, "latm", NULL); break; case ST_VIDEO_MPEG4: template = gst_static_pad_template_get (&video_template);