[vlc-commits] demux: avformat: tag AAC framing with original format (fix #10896)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Feb 21 19:28:25 2017 +0100| [05ca83fc618ede5deb96cc1890bcd73626ef0a2b] | committer: Francois Cartegnie

demux: avformat: tag AAC framing with original format (fix #10896)

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

 modules/demux/avformat/demux.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 24d3147..a41b2b2 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -401,6 +401,18 @@ int OpenDemux( vlc_object_t *p_this )
             fmt.audio.i_bitspersample = cp->bits_per_coded_sample;
             fmt.audio.i_blockalign = cp->block_align;
             psz_type = "audio";
+
+            if(cp->codec_id == AV_CODEC_ID_AAC_LATM)
+            {
+                fmt.i_original_fourcc = VLC_FOURCC('L','A','T','M');
+                fmt.b_packetized = false;
+            }
+            else if(cp->codec_id == AV_CODEC_ID_AAC &&
+                    strstr(p_sys->fmt->long_name, "raw ADTS AAC"))
+            {
+                fmt.i_original_fourcc = VLC_FOURCC('A','D','T','S');
+                fmt.b_packetized = false;
+            }
             break;
 
         case AVMEDIA_TYPE_VIDEO: