From b05c21680d1fc31c044bd4c0854da86b20fd6f1c Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 23 May 2023 09:27:00 -0400 Subject: [PATCH] Revert "fmp4: Return a running time in get_next_time()" This reverts commit 04bb7b4db0fcf84283c07297b1577dd97564a0f9. As Sebastian points out, the chunk PTS is already in running time, so this was wrong from the start. Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/363 Part-of: --- mux/fmp4/src/fmp4mux/imp.rs | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/mux/fmp4/src/fmp4mux/imp.rs b/mux/fmp4/src/fmp4mux/imp.rs index ae913571..1985847d 100644 --- a/mux/fmp4/src/fmp4mux/imp.rs +++ b/mux/fmp4/src/fmp4mux/imp.rs @@ -2927,22 +2927,7 @@ impl ElementImpl for FMP4Mux { impl AggregatorImpl for FMP4Mux { fn next_time(&self) -> Option { let state = self.state.lock().unwrap(); - let agg = self.obj(); - let segment = agg - .src_pad() - .segment() - .downcast::() - .expect("TIME segment"); - - state - .chunk_start_pts - .opt_add(state.timeout_delay) - .and_then(|mut t| { - if !agg.class().as_ref().variant.is_single_stream() { - t += SEGMENT_OFFSET; - } - segment.to_running_time(t) - }) + state.chunk_start_pts.opt_add(state.timeout_delay) } fn sink_query(