From 09c7881d10f5f4c562a347333ab5654be308d310 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Wed, 18 Feb 2015 18:53:53 +0100 Subject: [PATCH] Some fixes to HLS output. --- src/output/output_hls.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp index e75a9e2a..c3e0162e 100644 --- a/src/output/output_hls.cpp +++ b/src/output/output_hls.cpp @@ -83,9 +83,7 @@ namespace Mist { if ( !myMeta.live){ result << "#EXT-X-ENDLIST\r\n"; } -#if DEBUG >= 8 - std::cerr << "Sending this index:" << std::endl << result.str() << std::endl; -#endif + DEBUG_MSG(DLVL_HIGH, "Sending this index: %s", result.str().c_str()); return result.str(); } //liveIndex @@ -139,6 +137,8 @@ namespace Mist { PackData.UnitStart(1); if (currentPacket.getInt("keyframe")){ PackData.RandomAccess(1); + } + if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){ PackData.PCR(currentPacket.getTime() * 27000); } first = false; @@ -182,8 +182,6 @@ namespace Mist { avccbox.setPayload(myMeta.tracks[currentPacket.getTrackId()].init); haveAvcc = true; } - bs = avccbox.asAnnexB(); - fillPacket(first, bs.data(), bs.size(), VideoCounter); } unsigned int i = 0;