From adf59f3786a9582ab570cc279af20a1e926994a0 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Thu, 1 May 2014 10:26:36 +0200
Subject: [PATCH] Bugfixes in live HSS
---
src/output/output_hss.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/output/output_hss.cpp b/src/output/output_hss.cpp
index abaa7955..09138588 100644
--- a/src/output/output_hss.cpp
+++ b/src/output/output_hss.cpp
@@ -126,11 +126,11 @@ namespace Mist {
selectedTracks.insert(tid);
if (myMeta.live) {
updateMeta();
- int seekable = canSeekms(seekTime / 10000);
+ int seekable = canSeekms(seekTime);
if (seekable == 0){
// iff the fragment in question is available, check if the next is available too
for (std::deque<DTSC::Key>::iterator it = myMeta.tracks[tid].keys.begin(); it != myMeta.tracks[tid].keys.end(); it++){
- if (it->getTime() >= (seekTime / 10000)){
+ if (it->getTime() >= seekTime){
if ((it + 1) == myMeta.tracks[tid].keys.end()){
seekable = 1;
}
@@ -143,7 +143,7 @@ namespace Mist {
HTTP_S.SetBody("The requested fragment is no longer kept in memory on the server and cannot be served.\n");
myConn.SendNow(HTTP_S.BuildResponse("412", "Fragment out of range"));
HTTP_R.Clean(); //clean for any possible next requests
- std::cout << "Fragment @ " << seekTime / 10000 << "ms too old (" << myMeta.tracks[tid].firstms << " - " << myMeta.tracks[tid].lastms << " ms)" << std::endl;
+ std::cout << "Fragment @ " << seekTime << "ms too old (" << myMeta.tracks[tid].firstms << " - " << myMeta.tracks[tid].lastms << " ms)" << std::endl;
stop();
wantRequest = true;
return;
@@ -153,7 +153,7 @@ namespace Mist {
HTTP_S.SetBody("Proxy, re-request this in a second or two.\n");
myConn.SendNow(HTTP_S.BuildResponse("208", "Ask again later"));
HTTP_R.Clean(); //clean for any possible next requests
- std::cout << "Fragment @ " << seekTime / 10000 << "ms not available yet (" << myMeta.tracks[tid].firstms << " - " << myMeta.tracks[tid].lastms << " ms)" << std::endl;
+ std::cout << "Fragment @ " << seekTime << "ms not available yet (" << myMeta.tracks[tid].firstms << " - " << myMeta.tracks[tid].lastms << " ms)" << std::endl;
stop();
wantRequest = true;
return;
@@ -184,7 +184,7 @@ namespace Mist {
HTTP_S.SetBody("Proxy, re-request this in a second or two.\n");
myConn.SendNow(HTTP_S.BuildResponse("208", "Ask again later"));
HTTP_R.Clean(); //clean for any possible next requests
- std::cout << "Fragment after fragment @ " << (seekTime / 10000) << " not available yet" << std::endl;
+ std::cout << "Fragment after fragment @ " << seekTime << " not available yet" << std::endl;
}
}
break;
@@ -196,12 +196,12 @@ namespace Mist {
}
/*
if (myMeta.live) {
- if (mstime == 0 && (seekTime / 10000) > 1){
+ if (mstime == 0 && seekTime > 1){
HTTP_S.Clean();
HTTP_S.SetBody("The requested fragment is no longer kept in memory on the server and cannot be served.\n");
myConn.SendNow(HTTP_S.BuildResponse("412", "Fragment out of range"));
HTTP_R.Clean(); //clean for any possible next requests
- std::cout << "Fragment @ " << (seekTime / 10000) << " too old" << std::endl;
+ std::cout << "Fragment @ " << seekTime << " too old" << std::endl;
continue;
}
}