From 0f4a6c9367f14cfe817b9256fa45ae79d7662767 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Wed, 23 May 2018 12:02:48 +0200 Subject: [PATCH] Live mp4 working again --- src/output/output_progressive_mp4.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp index b80f3b2c..da731f24 100644 --- a/src/output/output_progressive_mp4.cpp +++ b/src/output/output_progressive_mp4.cpp @@ -65,7 +65,7 @@ namespace Mist{ + 8 //MINF Box + 36 //DINF Box + 8; // STBL Box - if (thisTrack.firstms != firstms){ + if (myMeta.vod && thisTrack.firstms != firstms){ tmpRes += 12;// EDTS entry extra } @@ -213,10 +213,10 @@ namespace Mist{ MP4::ELST elstBox; elstBox.setVersion(0); elstBox.setFlags(0); - if (thisTrack.firstms != fms){ + if (myMeta.vod && thisTrack.firstms != fms){ elstBox.setCount(2); - elstBox.setSegmentDuration(0, fragmented ? -1 : thisTrack.firstms - fms); + elstBox.setSegmentDuration(0, thisTrack.firstms - fms); elstBox.setMediaTime(0, 0xFFFFFFFFull); elstBox.setMediaRateInteger(0, 0); elstBox.setMediaRateFraction(0, 0); @@ -227,7 +227,7 @@ namespace Mist{ elstBox.setMediaRateFraction(1, 0); }else{ elstBox.setCount(1); - elstBox.setSegmentDuration(0, tDuration); + elstBox.setSegmentDuration(0, fragmented ? -1 : tDuration); elstBox.setMediaTime(0, 0); elstBox.setMediaRateInteger(0, 1); elstBox.setMediaRateFraction(0, 0);