From c4d036490f599fa98ef1e534f7f18bb38f4ba769 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 7 Nov 2017 14:20:29 +0100 Subject: [PATCH 1/2] Fixed same-connection HTTP requests after any end of track is reached --- src/output/output_http.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/output/output_http.cpp b/src/output/output_http.cpp index e08cbec9..4223517f 100644 --- a/src/output/output_http.cpp +++ b/src/output/output_http.cpp @@ -224,6 +224,7 @@ namespace Mist { } INFO_MSG("Received request %s", H.getUrl().c_str()); + initialize(); if (H.GetVar("audio") != "" || H.GetVar("video") != ""){ selectedTracks.clear(); if (H.GetVar("audio") != ""){ @@ -252,6 +253,8 @@ namespace Mist { for (std::set::iterator it = toRemove.begin(); it != toRemove.end(); it++){ selectedTracks.erase(*it); } + }else{ + selectDefaultTracks(); } onHTTP(); From ef8d305f37139b5da4397afe87159ed5f2ebf919 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 7 Nov 2017 14:28:26 +0100 Subject: [PATCH 2/2] Improved debug message levels for MP4 output --- src/output/output_progressive_mp4.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp index a135f09a..0afb0317 100644 --- a/src/output/output_progressive_mp4.cpp +++ b/src/output/output_progressive_mp4.cpp @@ -339,7 +339,7 @@ namespace Mist { temp.trackID = *subIt; temp.time = myMeta.tracks[*subIt].firstms;//timeplace of frame temp.index = 0; - INFO_MSG("adding to sortSet: tid %lu time %lu", temp.trackID, temp.time); + HIGH_MSG("Header sortSet: tid %lu time %lu", temp.trackID, temp.time); sortSet.insert(temp); } while (!sortSet.empty()) { @@ -505,9 +505,6 @@ namespace Mist { return; } - //Always initialize before anything else - initialize(); - //Make sure we start receiving data after this function ///\todo Should this happen here? parseData = true;