From 71477f05d3d4fcdcd9d21e0b910fdf9da8cb4129 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 30 Nov 2017 14:10:41 +0100 Subject: [PATCH] Fixed HLS non-subtitle output --- src/output/output_hls.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp index 95f3291d..26e1b4d5 100644 --- a/src/output/output_hls.cpp +++ b/src/output/output_hls.cpp @@ -26,6 +26,13 @@ namespace Mist { } } unsigned int vidTracks = 0; + bool hasSubs = false; + for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) { + if (it->second.codec == "subtitle"){ + hasSubs = true; + break; + } + } for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) { if (it->second.codec == "H264" || it->second.codec == "HEVC" || it->second.codec == "MPEG2") { vidTracks++; @@ -36,7 +43,11 @@ namespace Mist { if (audioId != -1) { bWidth += myMeta.tracks[audioId].bps; } - result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,SUBTITLES=\"sub1\",BANDWIDTH=" << (bWidth * 8) << "\r\n"; + if (!hasSubs){ + result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=" << (bWidth * 8) << "\r\n"; + }else{ + result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,SUBTITLES=\"sub1\",BANDWIDTH=" << (bWidth * 8) << "\r\n"; + } result << it->first; if (audioId != -1) { result << "_" << audioId;