mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-10 12:29:44 +00:00
Code Issues Projects Releases Wiki Activity

fmp4mux: Implement interleaving based on start timestamps instead of accumulated durations

Browse source 
Durations might accumulate rounding errors and streams might not
actually start at the same time. For that reason also start with the
stream that has the lowest timestamp.
This commit is contained in:
Sebastian Dröge 2022-05-17 15:25:28 +03:00
parent d7bd4c1c93
commit 6bca5a9962
1 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
generic/fmp4/src/fmp4mux/imp.rs
View file

@ -639,42 +639,60 @@ impl FMP4Mux {
// Interleave buffers according to the settings into a single vec // Interleave buffers according to the settings into a single vec
let mut interleaved_buffers = let mut interleaved_buffers =
Vec::with_capacity(drain_buffers.iter().map(|bs| bs.len()).sum()); Vec::with_capacity(drain_buffers.iter().map(|bs| bs.len()).sum());
while drain_buffers.iter().any(|bs| !bs.is_empty()) { while let Some((idx, bs)) =
for (idx, bs) in drain_buffers.iter_mut().enumerate() { drain_buffers
let mut dequeued_time = gst::ClockTime::ZERO; .iter_mut()
let mut dequeued_bytes = 0; .enumerate()
.min_by(|(a_idx, a), (b_idx, b)| {
let (a, b) = match (a.front(), b.front()) {
(None, None) => return std::cmp::Ordering::Equal,
(None, _) => return std::cmp::Ordering::Greater,
(_, None) => return std::cmp::Ordering::Less,
(Some(a), Some(b)) => (a, b),
};
while settings match a.dts.unwrap_or(a.pts).cmp(&b.dts.unwrap_or(b.pts)) {
.interleave_bytes std::cmp::Ordering::Equal => a_idx.cmp(b_idx),
.map_or(true, |max_bytes| dequeued_bytes <= max_bytes) cmp => cmp,
&& settings
.interleave_time
.map_or(true, |max_time| dequeued_time <= max_time)
{
if let Some(buffer) = bs.pop_front() {
dequeued_time += match bs.front() {
Some(next_buffer) => match Option::zip(next_buffer.dts, buffer.dts) {
Some((b, a)) => b.saturating_sub(a),
None => next_buffer.pts.saturating_sub(buffer.pts),
},
None => {
let timing_info = timing_infos[idx].as_ref().unwrap();
match Option::zip(timing_info.end_dts, buffer.dts) {
Some((b, a)) => b.saturating_sub(a),
None => timing_info.end_pts.saturating_sub(buffer.pts),
}
}
};
dequeued_bytes += buffer.buffer.size() as u64;
interleaved_buffers.push(buffer);
} else {
// No buffers left in this stream, go to next stream
break;
} }
})
{
let start_time = match bs.front() {
None => {
// No more buffers now
break;
}
Some(buf) => buf.dts.unwrap_or(buf.pts),
};
let mut current_end_time = start_time;
let mut dequeued_bytes = 0;
while settings
.interleave_bytes
.map_or(true, |max_bytes| dequeued_bytes <= max_bytes)
&& settings.interleave_time.map_or(true, |max_time| {
current_end_time.saturating_sub(start_time) <= max_time
})
{
if let Some(buffer) = bs.pop_front() {
current_end_time = match bs.front() {
Some(next_buffer) => next_buffer.dts.unwrap_or(next_buffer.pts),
None => {
let timing_info = timing_infos[idx].as_ref().unwrap();
timing_info.end_dts.unwrap_or(timing_info.end_pts)
}
};
dequeued_bytes += buffer.buffer.size() as u64;
interleaved_buffers.push(buffer);
} else {
// No buffers left in this stream, go to next stream
break;
} }
} }
} }
assert!(drain_buffers.iter().all(|bs| bs.is_empty()));
let mut buffer_list = None; let mut buffer_list = None;
if interleaved_buffers.is_empty() { if interleaved_buffers.is_empty() {