[vlc-commits] demux: ts: map AAC original codec

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Mar 12 15:25:11 2017 +0100| [55602ffa26389917d64b55cd321cbf3fc90846fa] | committer: Francois Cartegnie

demux: ts: map AAC original codec

avoids misdetection

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55602ffa26389917d64b55cd321cbf3fc90846fa
---

 modules/demux/mpeg/ts_psi.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 3f62c60..d1c81fd 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1321,18 +1321,24 @@ static void PIDFillFormat( demux_t *p_demux, ts_pes_t *p_pes,
     case 0x04:  /* MPEG-2 audio */
         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MPGA );
         break;
-    case 0x11:  /* MPEG4 (audio) LATM */
     case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
-    case 0x1c:  /* ISO/IEC 14496-3 Audio, without using any additional
-                   transport syntax, such as DST, ALS and SLS */
         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
+        fmt->i_original_fourcc = VLC_FOURCC('A','D','T','S');
         break;
     case 0x10:  /* MPEG4 (video) */
         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V );
         break;
+    case 0x11:  /* MPEG4 (audio) LATM */
+        es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
+        fmt->i_original_fourcc = VLC_FOURCC('L','A','T','M');
+        break;
     case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 );
         break;
+    case 0x1C:  /* ISO/IEC 14496-3 Audio, without using any additional
+                   transport syntax, such as DST, ALS and SLS */
+        es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
+        break;
     case 0x24:  /* HEVC */
         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_HEVC );
         break;