From 9ae992ff35a1fb82eeb5239a6a09f3e8f7e7fc90 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Mon, 26 Aug 2013 10:40:14 +0200
Subject: [PATCH] Fixed DTSC Fix, working MP4 Progressive.
---
src/connectors/conn_http_progressive_mp4.cpp | 4 ++--
src/converters/dtscfix.cpp | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/connectors/conn_http_progressive_mp4.cpp b/src/connectors/conn_http_progressive_mp4.cpp
index fb7e0ef8..30651420 100644
--- a/src/connectors/conn_http_progressive_mp4.cpp
+++ b/src/connectors/conn_http_progressive_mp4.cpp
@@ -114,7 +114,7 @@ namespace Connector_HTTP {
std::stringstream cmd;
cmd << "t "<< (*keyPartIt).trackID;
cmd << "\ns " << (*keyPartIt).time;
- cmd << "\np "<< (*keyPartIt).time + (*keyPartIt).len<<"\n";
+ cmd << "\no\n";
ss.SendNow(cmd.str());
}
if ( !ss.connected()){
@@ -173,7 +173,7 @@ namespace Connector_HTTP {
std::stringstream cmd;
cmd << "t "<< (*keyPartIt).trackID;
cmd << "\ns " << (*keyPartIt).time;
- cmd << "\np " << (*keyPartIt).time + (*keyPartIt).len<<"\n";
+ cmd << "\no\n";
//std::cerr << cmd.str() << std::endl;
ss.SendNow(cmd.str());
}
diff --git a/src/converters/dtscfix.cpp b/src/converters/dtscfix.cpp
index be7f1975..8f1ad8d9 100644
--- a/src/converters/dtscfix.cpp
+++ b/src/converters/dtscfix.cpp
@@ -10,7 +10,7 @@
namespace Converters {
class HeaderEntryDTSC {
public:
- HeaderEntryDTSC() : totalSize(0), lastKeyTime(-5000), trackID(0), firstms(0x7FFFFFFF), lastms(0), keynum(0) {}
+ HeaderEntryDTSC() : totalSize(0), lastKeyTime(-5001), trackID(0), firstms(0x7FFFFFFF), lastms(0), keynum(0) {}
long long int totalSize;
std::vector<long long int> parts;
long long int lastKeyTime;
@@ -154,9 +154,6 @@ namespace Converters {
meta["tracks"][currentID]["keys"][newNum]["num"] = ++trackData[currentID].keynum;
meta["tracks"][currentID]["keys"][newNum]["time"] = F.getJSON()["time"];
meta["tracks"][currentID]["keys"][newNum]["bpos"] = F.getLastReadPos();
- if (newNum == 0){
- trackData[currentID].firstms = F.getJSON()["time"].asInt();
- }
if (meta["tracks"][currentID]["keys"].size() > 1){
meta["tracks"][currentID]["keys"][newNum - 1]["len"] = F.getJSON()["time"].asInt() - meta["tracks"][currentID]["keys"][newNum - 1]["time"].asInt();
meta["tracks"][currentID]["keys"][newNum - 1]["size"] = trackData[currentID].totalSize;