[vlc-commits] demux: ts: handle broken ADTS as LATM

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun 10 16:32:48 2020 +0200| [1dbb3247af9aba8dbfab35eae7322c5eeffd261e] | committer: Francois Cartegnie

demux: ts: handle broken ADTS as LATM

refs #24842

(cherry picked from commit d77d82b4448260c16b2f1b066ddca45c75387c78)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1dbb3247af9aba8dbfab35eae7322c5eeffd261e
---

 modules/demux/mpeg/ts_psi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index bfc23a9137..33843424f7 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1417,7 +1417,10 @@ static void PIDFillFormat( demux_t *p_demux, ts_stream_t *p_pes,
         break;
     case 0x11:  /* MPEG4 (audio) LATM */
         es_format_Change( fmt, AUDIO_ES, VLC_CODEC_MP4A );
-        fmt->i_original_fourcc = VLC_FOURCC('L','A','T','M');
+        /* https://trac.ffmpeg.org/ticket/320
+         * Haivision's Makito encoder violates mapping by putting ADTS
+           instead of LOAS, we can only hint that's not raw AAC */
+        fmt->i_original_fourcc = VLC_FOURCC('H','E','A','D');
         break;
     case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
         es_format_Change( fmt, VIDEO_ES, VLC_CODEC_H264 );