Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions IsoLib/t35_tool/injection/StrategyHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,13 @@ MP4Err getVideoSampleDurations(MP4Media mediaV, std::vector<u32> &durations)
err = MP4GetMediaSampleCount(mediaV, &sampleCount);
if(err) return err;

durations.reserve(sampleCount);
struct SampleInfo
{
u64 cts;
u32 duration;
};
std::vector<SampleInfo> samples;
samples.reserve(sampleCount);

for(u32 i = 1; i <= sampleCount; ++i)
{
Expand All @@ -88,11 +94,26 @@ MP4Err getVideoSampleDurations(MP4Media mediaV, std::vector<u32> &durations)
return err;
}

durations.push_back(static_cast<u32>(outDuration));
u64 cts = outDTS;
if(outSampleFlags & MP4MediaSampleHasCTSOffset)
{
cts = static_cast<u64>(static_cast<s64>(outDTS) + outCTSOffset);
}
samples.push_back({cts, static_cast<u32>(outDuration)});

if(sampleH) MP4DisposeHandle(sampleH);
}

// Sort by CTS
std::sort(samples.begin(), samples.end(),
[](const SampleInfo &a, const SampleInfo &b) { return a.cts < b.cts; });

durations.reserve(sampleCount);
for(const auto &s : samples)
{
durations.push_back(s.duration);
}

LOG_DEBUG("Collected {} video sample durations", durations.size());
return MP4NoErr;
}
Expand Down
Loading