hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for EBML output

Browse source
This commit is contained in:
Thulinma 2019-05-02 16:49:51 +02:00
parent 61bb14a368
commit 84f9463059
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/output/output_ebml.cpp
View file

@ -66,7 +66,7 @@ namespace Mist{
/// Calculates the size of a Cluster (contents only) and returns it. /// Calculates the size of a Cluster (contents only) and returns it.
/// Bases the calculation on the currently selected tracks and the given start/end time for the cluster. /// Bases the calculation on the currently selected tracks and the given start/end time for the cluster.
uint32_t OutEBML::clusterSize(uint64_t start, uint64_t end){ uint32_t OutEBML::clusterSize(uint64_t start, uint64_t end){
if (start == end){++end;} if (start <= end){end = start+1;}
uint32_t sendLen = EBML::sizeElemUInt(EBML::EID_TIMECODE, start); uint32_t sendLen = EBML::sizeElemUInt(EBML::EID_TIMECODE, start);
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); for (std::set<long unsigned int>::iterator it = selectedTracks.begin();
it != selectedTracks.end(); it++){ it != selectedTracks.end(); it++){
@ -110,7 +110,7 @@ namespace Mist{
EXTREME_MSG("Cluster: %llu - %llu (%lu/%lu) = %llu", currentClusterTime, newClusterTime, fragIndice, Trk.fragments.size(), clusterSize(currentClusterTime, newClusterTime)); EXTREME_MSG("Cluster: %llu - %llu (%lu/%lu) = %llu", currentClusterTime, newClusterTime, fragIndice, Trk.fragments.size(), clusterSize(currentClusterTime, newClusterTime));
}else{ }else{
//In live, clusters are aligned with the lookAhead time //In live, clusters are aligned with the lookAhead time
newClusterTime += needsLookAhead; newClusterTime = currentClusterTime+needsLookAhead;
} }
EBML::sendElemHead(myConn, EBML::EID_CLUSTER, clusterSize(currentClusterTime, newClusterTime)); EBML::sendElemHead(myConn, EBML::EID_CLUSTER, clusterSize(currentClusterTime, newClusterTime));
EBML::sendElemUInt(myConn, EBML::EID_TIMECODE, currentClusterTime); EBML::sendElemUInt(myConn, EBML::EID_TIMECODE, currentClusterTime);