MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-10-29 15:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update test to allow ffmpeg 4.x edit list behavior

Browse Source 
Fixes #10
This commit is contained in:
Scott Lamb 2019-07-10 17:02:45 -07:00
parent d2e18ca5e2
commit 856c01918b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mp4.rs
View File

@ -1879,9 +1879,11 @@ mod tests {
if let Some((orig_dur, new_dur)) = final_durations { if let Some((orig_dur, new_dur)) = final_durations {
// One would normally expect the duration to be exactly the same, but when using an // One would normally expect the duration to be exactly the same, but when using an
// edit list, ffmpeg appears to extend the last packet's duration by the amount skipped // edit list, ffmpeg 3.x appears to extend the last packet's duration by the amount
// at the beginning. I think this is a bug on their side. // skipped at the beginning. ffmpeg 4.x behaves properly. Allow either behavior.
assert!(orig_dur - shorten + pts_offset == new_dur, // See <https://github.com/scottlamb/moonfire-nvr/issues/10>.
assert!(orig_dur - shorten + pts_offset == new_dur ||
orig_dur - shorten == new_dur,
"orig_dur={} new_dur={} shorten={} pts_offset={}", "orig_dur={} new_dur={} shorten={} pts_offset={}",
orig_dur, new_dur, shorten, pts_offset); orig_dur, new_dur, shorten, pts_offset);
} }