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-06-25 01:20:35 +00:00
Code Issues Projects Releases Wiki Activity

mp4mux: Add support for GstAggregator::start-time-selector==set

Browse source 
Taking it into account so the encoded stream start time is what was set
in `GstAggregator::start-time`, respecting what was specified by the user.
This commit is contained in:
Thibault Saunier 2024-01-19 15:14:03 -03:00
parent ecbf46e82b
commit 9155a57722
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mux/mp4/src/mp4mux/imp.rs
View file

@ -143,6 +143,7 @@ struct Stream {
impl Stream { impl Stream {
fn get_elst_infos( fn get_elst_infos(
&self, &self,
start_time: gst::ClockTime,
min_earliest_pts: gst::ClockTime, min_earliest_pts: gst::ClockTime,
) -> Result<Vec<super::ElstInfo>, anyhow::Error> { ) -> Result<Vec<super::ElstInfo>, anyhow::Error> {
let mut elst_infos = self.elst_infos.clone(); let mut elst_infos = self.elst_infos.clone();
@ -179,10 +180,11 @@ impl Stream {
} }
// Add a gap at the beginning if needed // Add a gap at the beginning if needed
if min_earliest_pts != earliest_pts { if min_earliest_pts != earliest_pts || start_time > gst::ClockTime::ZERO {
let gap_duration = (earliest_pts - min_earliest_pts).nseconds()) let gap_duration = (start_time.nseconds()
.mul_div_round(timescale as u64, gst::ClockTime::SECOND.nseconds()) + (earliest_pts - min_earliest_pts).nseconds())
.context("too big gap")?; .mul_div_round(timescale as u64, gst::ClockTime::SECOND.nseconds())
.context("too big gap")?;
if gap_duration > 0 { if gap_duration > 0 {
elst_infos.insert( elst_infos.insert(
@ -1516,6 +1518,13 @@ impl AggregatorImpl for MP4Mux {
state.mdat_size state.mdat_size
); );
let obj = self.obj();
let start_time =
if obj.start_time_selection() == gst_base::AggregatorStartTimeSelection::Set {
gst::ClockTime::from_nseconds(AggregatorExt::start_time(&*obj))
} else {
gst::ClockTime::ZERO
};
let min_earliest_pts = state let min_earliest_pts = state
.streams .streams
.iter() .iter()
@ -1537,7 +1546,7 @@ impl AggregatorImpl for MP4Mux {
earliest_pts, earliest_pts,
end_pts, end_pts,
elst_infos: stream elst_infos: stream
.get_elst_infos(min_earliest_pts) .get_elst_infos(start_time, min_earliest_pts)
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
gst::error!(CAT, "Could not prepare edit lists: {e:?}"); gst::error!(CAT, "Could not prepare edit lists: {e:?}");