diff options
| author | Martin Storsjö <martin@martin.st> | 2020-12-20 00:45:42 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2021-01-15 15:01:03 +0200 |
| commit | c2424b1f35a1c6c06f1f9fe5f77a7157ed84e1cd (patch) | |
| tree | 69adc27588c6ee103aa2ae9a61c06bbb656ea719 /tests | |
| parent | d4902751cb111d8f66d481d670cad079228e9f73 (diff) | |
movenc: Present durations in mvhd/tkhd/mdhd as they are after edits
If the edit lists remove parts of the output timeline, or add a
delay to it, this should be included in the mvhd/tkhd/mdhd durations,
which should correspond to the edit lists.
For tracks starting with pts < 0, the edit list trims out the segment
before pts=0. For tracks starting with pts > 0, a delay element is
added in the edit list, delaying the start of the track data.
In both cases, the practical effect is that the post-edit output
is as if the track had started with pts = 0. Thus calculate the range
from pts=0 to end_pts, for the purposes of mvhd/tkhd/mdhd, unless
edit lists explicitly are disabled.
mov_write_edts_tag needs to operate on the actual pts duration of
the track samples, not the duration that already takes the edit
list effect into account.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/copy-trac3074 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/gaplessenc-itunes-to-ipod-aac | 2 | ||||
| -rw-r--r-- | tests/ref/fate/gaplessenc-pcm-to-mov-aac | 2 | ||||
| -rw-r--r-- | tests/ref/fate/movenc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074 index b5b0b6a60b..78b6015ae8 100644 --- a/tests/ref/fate/copy-trac3074 +++ b/tests/ref/fate/copy-trac3074 @@ -1,4 +1,4 @@ -620e3ab4ee6241bec55ea2ec4ef42908 *tests/data/fate/copy-trac3074.mp4 +da6122873fb83ce4340cf5d0ab8d475e *tests/data/fate/copy-trac3074.mp4 334012 tests/data/fate/copy-trac3074.mp4 #tb 0: 1/48000 #media_type 0: audio diff --git a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac index 76cbf22358..95b167bda6 100644 --- a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac +++ b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac @@ -5,7 +5,7 @@ duration_ts=103326 [/STREAM] [FORMAT] start_time=0.000000 -duration=2.367000 +duration=2.344000 [/FORMAT] packet|pts=-1024|dts=-1024|duration=1024|flags=KDside_data| diff --git a/tests/ref/fate/gaplessenc-pcm-to-mov-aac b/tests/ref/fate/gaplessenc-pcm-to-mov-aac index 2b17956e2b..bfd47be10f 100644 --- a/tests/ref/fate/gaplessenc-pcm-to-mov-aac +++ b/tests/ref/fate/gaplessenc-pcm-to-mov-aac @@ -5,7 +5,7 @@ duration_ts=529200 [/STREAM] [FORMAT] start_time=0.000000 -duration=12.024000 +duration=12.000000 [/FORMAT] packet|pts=-1024|dts=-1024|duration=1024|flags=KDside_data| diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index 602639106d..81ea75f372 100644 --- a/tests/ref/fate/movenc +++ b/tests/ref/fate/movenc @@ -7,7 +7,7 @@ write_data len 36, time nopts, type header atom ftyp write_data len 2761, time nopts, type header atom - write_data len 908, time 966667, type sync atom moof write_data len 110, time nopts, type trailer atom - -5b6e4211a45cd5dac99c8b90752a03d7 3815 non-empty-moov-elst +caf0876986b5f033efc0958c338289cc 3815 non-empty-moov-elst write_data len 36, time nopts, type header atom ftyp write_data len 2669, time nopts, type header atom - write_data len 908, time 1000000, type sync atom moof |