mirrors/mp4-rust
1
0
Fork 0
mirror of https://github.com/alfg/mp4-rust.git synced 2025-01-03 00:48:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix fragmented start_time and is_sync wrong calculation

Browse source
This commit is contained in:
Andrey Tkachenko 2023-11-20 20:03:59 +04:00
parent 1996727b3d
commit 4b49afba6b
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/track.rs
View file

@ -501,16 +501,14 @@ impl Mp4Track {
fn sample_time(&self, sample_id: u32) -> Result<(u64, u32)> { fn sample_time(&self, sample_id: u32) -> Result<(u64, u32)> {
if !self.trafs.is_empty() { if !self.trafs.is_empty() {
let mut base_start_time = 0;
let mut default_sample_duration = self.default_sample_duration;
if let Some((traf_idx, sample_idx)) = self.find_traf_idx_and_sample_idx(sample_id) { if let Some((traf_idx, sample_idx)) = self.find_traf_idx_and_sample_idx(sample_id) {
let traf = &self.trafs[traf_idx]; let traf = &self.trafs[traf_idx];
if let Some(tfdt) = &traf.tfdt { let base_start_time = traf
base_start_time = tfdt.base_media_decode_time; .tfdt
} .as_ref()
if let Some(duration) = traf.tfhd.default_sample_duration { .map(|tfdt| tfdt.base_media_decode_time)
default_sample_duration = duration; .unwrap_or(0);
}
if let Some(trun) = &traf.trun { if let Some(trun) = &traf.trun {
if TrunBox::FLAG_SAMPLE_DURATION & trun.flags != 0 { if TrunBox::FLAG_SAMPLE_DURATION & trun.flags != 0 {
let mut start_offset = 0u64; let mut start_offset = 0u64;
@ -523,9 +521,21 @@ impl Mp4Track {
return Ok((base_start_time + start_offset, duration)); return Ok((base_start_time + start_offset, duration));
} }
} }
let default_sample_duration = traf
.tfhd
.default_sample_duration
.unwrap_or(self.default_sample_duration);
let start_offset = sample_idx as u64 * default_sample_duration as u64;
Ok((base_start_time + start_offset, default_sample_duration))
} else {
Ok((
((sample_id - 1) * self.default_sample_duration) as u64,
self.default_sample_duration,
))
} }
let start_offset = ((sample_id - 1) * default_sample_duration) as u64;
Ok((base_start_time + start_offset, default_sample_duration))
} else { } else {
let stts = &self.trak.mdia.minf.stbl.stts; let stts = &self.trak.mdia.minf.stbl.stts;
@ -579,8 +589,11 @@ impl Mp4Track {
fn is_sync_sample(&self, sample_id: u32) -> bool { fn is_sync_sample(&self, sample_id: u32) -> bool {
if !self.trafs.is_empty() { if !self.trafs.is_empty() {
let sample_sizes_count = self.sample_count() / self.trafs.len() as u32; if let Some((_, sample_idx)) = self.find_traf_idx_and_sample_idx(sample_id) {
return sample_id == 1 || sample_id % sample_sizes_count == 0; return sample_idx == 0;
}
return sample_id == 1;
} }
if let Some(ref stss) = self.trak.mdia.minf.stbl.stss { if let Some(ref stss) = self.trak.mdia.minf.stbl.stss {