[vlc-commits] demux: mkv: support OPUS/EXPERIMENTAL codec ID

[Tristan Matthews]

vlc/vlc-3.0 | branch: master | Tristan Matthews  | Wed Feb 
14 23:12:07 2018 -0500| [674d5d6f4c04b3a099100b9869277362ca34e12d] | committer: 
Tristan Matthews

demux: mkv: support OPUS/EXPERIMENTAL codec ID

Fixes #19660

(cherry picked from commit 5d0056dc3e2bc11bebf7dfa0ddefaa32f34cefd2)
Signed-off-by: Tristan Matthews 

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

 modules/demux/mkv/matroska_segment_parse.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp 
b/modules/demux/mkv/matroska_segment_parse.cpp
index c16176e9f9..0b82866bb7 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1755,7 +1755,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
 vars.p_fmt->i_codec = VLC_CODEC_VORBIS;
 fill_extra_data( vars.p_tk, 0 );
 }
-S_CASE("A_OPUS") {
+static void A_OPUS__helper(HandlerPayload& vars) {
 vars.p_fmt->i_codec = VLC_CODEC_OPUS;
 vars.p_tk->b_no_duration = true;
 if( !vars.p_tk->fmt.audio.i_rate )
@@ -1774,6 +1774,8 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
 ps, pkt, 2 ) )
 msg_Err( vars.p_demuxer, "Couldn't pack OPUS headers");
 }
+S_CASE("A_OPUS"){ A_OPUS__helper( vars ); }
+S_CASE("A_OPUS/EXPERIMENTAL")   { A_OPUS__helper( vars ); }
 static void A_AAC_MPEG__helper(HandlerPayload& vars, int i_profile, 
bool sbr = false) {
 int i_srate;
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: mkv: support OPUS/EXPERIMENTAL codec ID

[Tristan Matthews]

vlc | branch: master | Tristan Matthews  | Wed Feb 14 
23:12:07 2018 -0500| [5d0056dc3e2bc11bebf7dfa0ddefaa32f34cefd2] | committer: 
Tristan Matthews

demux: mkv: support OPUS/EXPERIMENTAL codec ID

Fixes #19660

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

 modules/demux/mkv/matroska_segment_parse.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp 
b/modules/demux/mkv/matroska_segment_parse.cpp
index 63cf64e346..7b18ee3286 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1753,7 +1753,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
 vars.p_fmt->i_codec = VLC_CODEC_VORBIS;
 fill_extra_data( vars.p_tk, 0 );
 }
-S_CASE("A_OPUS") {
+static void A_OPUS__helper(HandlerPayload& vars) {
 vars.p_fmt->i_codec = VLC_CODEC_OPUS;
 vars.p_tk->b_no_duration = true;
 if( !vars.p_tk->fmt.audio.i_rate )
@@ -1772,6 +1772,8 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
 ps, pkt, 2 ) )
 msg_Err( vars.p_demuxer, "Couldn't pack OPUS headers");
 }
+S_CASE("A_OPUS"){ A_OPUS__helper( vars ); }
+S_CASE("A_OPUS/EXPERIMENTAL")   { A_OPUS__helper( vars ); }
 static void A_AAC_MPEG__helper(HandlerPayload& vars, int i_profile, 
bool sbr = false) {
 int i_srate;
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits