[vlc-commits] [Git][videolan/vlc][3.0.x] demux: hls: only force AAC on es demux

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
755016e0 by Francois Cartegnie at 2023-06-27T20:24:14+02:00
demux: hls: only force AAC on es demux

shortcuts will enforce wrong profile and
demux will never end

regression by fix 2396e15bd5b261b2c716ff653b5b8e6374be8bba

(cherry picked from commit f272deef0f543cb8774843783ad703b04d2e34a8)

- - - - -


1 changed file:

- modules/demux/hls/HLSStreams.cpp


Changes:

=====================================
modules/demux/hls/HLSStreams.cpp
=====================================
@@ -192,13 +192,11 @@ AbstractDemuxer *HLSStream::newDemux(vlc_object_t *p_obj, const StreamFormat &fo
     switch(format)
     {
         case StreamFormat::Type::PackedAAC:
-            ret = new Demuxer(p_obj, "aac", out, source);
+            ret = new Demuxer(p_obj, "aac", out, source); /* "es" demuxer cannot probe AAC, need to force */
             break;
-        case StreamFormat::Type::PackedMP3:
-            ret = new Demuxer(p_obj, "mp3", out, source);
-            break;
-        case StreamFormat::Type::PackedAC3:
-            ret = new Demuxer(p_obj, "ac3", out, source);
+        case StreamFormat::Type::PackedMP3: /* MPGA / MP3, needs "es" to probe: do not force */
+        case StreamFormat::Type::PackedAC3: /* AC3 / E-AC3, needs "es" to probe: do not force */
+            ret = new Demuxer(p_obj, "es", out, source);
             break;
 
         case StreamFormat::Type::MPEG2TS:



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/755016e00344bd9dd387546d281e204a7e8ed289

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/755016e00344bd9dd387546d281e204a7e8ed289
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance