From 8e6da507bc2b8112429b78b14f3b3a617944a332 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 12 Feb 2015 15:58:19 +0100 Subject: [PATCH] Updated TS protocols to use proper DTS/PTS using new lib calls. --- src/output/output_hls.cpp | 2 +- src/output/output_httpts.cpp | 2 +- src/output/output_ts.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp index b3cf6034..c36bb5dc 100644 --- a/src/output/output_hls.cpp +++ b/src/output/output_hls.cpp @@ -172,7 +172,7 @@ namespace Mist { std::string bs; //prepare bufferstring if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){ - bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90); + bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90, currentPacket.getInt("offset") * 90); fillPacket(first, bs.data(), bs.size(), VideoCounter); if (myMeta.tracks[currentPacket.getTrackId()].codec == "H264"){ //End of previous nal unit, somehow needed for h264 diff --git a/src/output/output_httpts.cpp b/src/output/output_httpts.cpp index c0472e46..c694709f 100644 --- a/src/output/output_httpts.cpp +++ b/src/output/output_httpts.cpp @@ -67,7 +67,7 @@ namespace Mist { std::string bs; //prepare bufferstring if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){ - bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90); + bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90, currentPacket.getInt("offset") * 90); fillPacket(first, bs.data(), bs.size(), VideoCounter); if (currentPacket.getInt("keyframe")){ diff --git a/src/output/output_ts.cpp b/src/output/output_ts.cpp index 60605f8a..4e1f9a6e 100644 --- a/src/output/output_ts.cpp +++ b/src/output/output_ts.cpp @@ -96,7 +96,7 @@ namespace Mist { std::string bs; //prepare bufferstring if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){ - bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90); + bs = TS::Packet::getPESVideoLeadIn(0ul, currentPacket.getTime() * 90, currentPacket.getInt("offset") * 90); fillPacket(first, bs.data(), bs.size(),VideoCounter); if (currentPacket.getInt("keyframe")){