mirrors/mp4-rust
1
0
Fork 0
mirror of https://github.com/alfg/mp4-rust.git synced 2024-06-10 17:09:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge 9d8bfc9d54 into 35560e94f5

Browse source
This commit is contained in:
jensenn 2024-02-20 22:37:21 +00:00 committed by GitHub
parent 35560e94f5 9d8bfc9d54
commit ed1960e918
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/track.rs
View file

@ -261,7 +261,7 @@ impl Mp4Track {
pub fn sequence_parameter_set(&self) -> Result<&[u8]> { pub fn sequence_parameter_set(&self) -> Result<&[u8]> {
if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 { if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
match avc1.avcc.sequence_parameter_sets.get(0) { match avc1.avcc.sequence_parameter_sets.first() {
Some(nal) => Ok(nal.bytes.as_ref()), Some(nal) => Ok(nal.bytes.as_ref()),
None => Err(Error::EntryInStblNotFound( None => Err(Error::EntryInStblNotFound(
self.track_id(), self.track_id(),
@ -276,7 +276,7 @@ impl Mp4Track {
pub fn picture_parameter_set(&self) -> Result<&[u8]> { pub fn picture_parameter_set(&self) -> Result<&[u8]> {
if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 { if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
match avc1.avcc.picture_parameter_sets.get(0) { match avc1.avcc.picture_parameter_sets.first() {
Some(nal) => Ok(nal.bytes.as_ref()), Some(nal) => Ok(nal.bytes.as_ref()),
None => Err(Error::EntryInStblNotFound( None => Err(Error::EntryInStblNotFound(
self.track_id(), self.track_id(),
@ -520,12 +520,15 @@ impl Mp4Track {
)?; )?;
} }
let duration = trun.sample_durations[sample_idx]; let duration = trun.sample_durations[sample_idx];
return Ok((base_start_time + start_offset, duration)); return Ok((base_start_time.wrapping_add(start_offset), duration));
} }
} }
} }
let start_offset = ((sample_id - 1) * default_sample_duration) as u64; let start_offset = ((sample_id - 1) * default_sample_duration) as u64;
Ok((base_start_time + start_offset, default_sample_duration)) Ok((
base_start_time.wrapping_add(start_offset),
default_sample_duration,
))
} else { } else {
let stts = &self.trak.mdia.minf.stbl.stts; let stts = &self.trak.mdia.minf.stbl.stts;