[FFmpeg-devel] [PATCH 2/3 v2] avformat/mov: Populate packet duration using stts atom instead of guessing

Mon Nov 25 03:57:56 EET 2024

On 11/24/2024 10:46 PM, Michael Niedermayer wrote:
> Hi
> 
> On Thu, Nov 21, 2024 at 07:40:22PM -0300, James Almer wrote:
>> From: Darren Mo <fumoboy007 at me.com>
>>
>> Fixes tickets #7855 and #11312.
>>
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>   libavformat/isom.h                            |   3 +
>>   libavformat/mov.c                             | 181 ++++++++++++++++--
>>   tests/ref/fate/copy-trac236                   |   4 +-
>>   tests/ref/fate/filter-fps                     |   1 +
>>   tests/ref/fate/filter-fps-cfr                 |   1 +
>>   tests/ref/fate/filter-meta-4560-rotate0       |   4 +-
>>   tests/ref/fate/gaplessenc-itunes-to-ipod-aac  |   2 +-
>>   tests/ref/fate/matroska-dovi-write-config8    |   4 +-
>>   .../fate/matroska-non-rotation-displaymatrix  |   6 +-
>>   tests/ref/fate/mov-aac-2048-priming           |   2 +-
>>   tests/ref/fate/mov-zombie                     |   4 +-
>>   11 files changed, 182 insertions(+), 30 deletions(-)
> 
> this does strange things to duration:
> 
> ./ffmpeg -i mm-short.mpg -y -bitexact -t 1 -acodec aac -frag_duration 200k test2.mov
> ./ffprobe -v 0 test2.mov -show_packets -print_format compact
> 
>   packet|codec_type=video|stream_index=0|pts=10752|pts_time=0.840000|dts=10240|dts_time=0.800000|duration=512|duration_time=0.040000|size=2130|pos=77815|flags=___
>   packet|codec_type=video|stream_index=0|pts=13312|pts_time=1.040000|dts=10752|dts_time=0.840000|duration=512|duration_time=0.040000|size=5123|pos=79945|flags=___
>   packet|codec_type=video|stream_index=0|pts=12288|pts_time=0.960000|dts=11264|dts_time=0.880000|duration=512|duration_time=0.040000|size=3980|pos=85068|flags=___
>   packet|codec_type=video|stream_index=0|pts=11776|pts_time=0.920000|dts=11776|dts_time=0.920000|duration=512|duration_time=0.040000|size=2266|pos=89048|flags=___
>   packet|codec_type=video|stream_index=0|pts=12800|pts_time=1.000000|dts=12288|dts_time=0.960000|duration=512|duration_time=0.040000|size=2085|pos=91314|flags=___
> -packet|codec_type=audio|stream_index=1|pts=38656|pts_time=0.805333|dts=38656|dts_time=0.805333|duration=1024|duration_time=0.021333|size=343|pos=93399|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=39680|pts_time=0.826667|dts=39680|dts_time=0.826667|duration=1024|duration_time=0.021333|size=338|pos=93742|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=40704|pts_time=0.848000|dts=40704|dts_time=0.848000|duration=1024|duration_time=0.021333|size=337|pos=94080|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=41728|pts_time=0.869333|dts=41728|dts_time=0.869333|duration=1024|duration_time=0.021333|size=326|pos=94417|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=42752|pts_time=0.890667|dts=42752|dts_time=0.890667|duration=1024|duration_time=0.021333|size=339|pos=94743|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=43776|pts_time=0.912000|dts=43776|dts_time=0.912000|duration=1024|duration_time=0.021333|size=336|pos=95082|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=44800|pts_time=0.933333|dts=44800|dts_time=0.933333|duration=1024|duration_time=0.021333|size=330|pos=95418|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=45824|pts_time=0.954667|dts=45824|dts_time=0.954667|duration=1024|duration_time=0.021333|size=333|pos=95748|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=46848|pts_time=0.976000|dts=46848|dts_time=0.976000|duration=1024|duration_time=0.021333|size=340|pos=96081|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=47872|pts_time=0.997333|dts=47872|dts_time=0.997333|duration=1024|duration_time=0.021333|size=337|pos=96421|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=48896|pts_time=1.018667|dts=48896|dts_time=1.018667|duration=1024|duration_time=0.021333|size=398|pos=96898|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=49920|pts_time=1.040000|dts=49920|dts_time=1.040000|duration=1024|duration_time=0.021333|size=367|pos=97296|flags=K__
> -packet|codec_type=audio|stream_index=1|pts=50944|pts_time=1.061333|dts=50944|dts_time=1.061333|duration=1024|duration_time=0.021333|size=328|pos=97663|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=38656|pts_time=0.805333|dts=38656|dts_time=0.805333|duration=1070071408|duration_time=22293.154333|size=343|pos=93399|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=39680|pts_time=0.826667|dts=39680|dts_time=0.826667|duration=1070071408|duration_time=22293.154333|size=338|pos=93742|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=40704|pts_time=0.848000|dts=40704|dts_time=0.848000|duration=1070071408|duration_time=22293.154333|size=337|pos=94080|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=41728|pts_time=0.869333|dts=41728|dts_time=0.869333|duration=1070071408|duration_time=22293.154333|size=326|pos=94417|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=42752|pts_time=0.890667|dts=42752|dts_time=0.890667|duration=1070071408|duration_time=22293.154333|size=339|pos=94743|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=43776|pts_time=0.912000|dts=43776|dts_time=0.912000|duration=1070071408|duration_time=22293.154333|size=336|pos=95082|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=44800|pts_time=0.933333|dts=44800|dts_time=0.933333|duration=1070071408|duration_time=22293.154333|size=330|pos=95418|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=45824|pts_time=0.954667|dts=45824|dts_time=0.954667|duration=1070071408|duration_time=22293.154333|size=333|pos=95748|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=46848|pts_time=0.976000|dts=46848|dts_time=0.976000|duration=1070071408|duration_time=22293.154333|size=340|pos=96081|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=47872|pts_time=0.997333|dts=47872|dts_time=0.997333|duration=1070071408|duration_time=22293.154333|size=337|pos=96421|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=48896|pts_time=1.018667|dts=48896|dts_time=1.018667|duration=1070071408|duration_time=22293.154333|size=398|pos=96898|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=49920|pts_time=1.040000|dts=49920|dts_time=1.040000|duration=1070071408|duration_time=22293.154333|size=367|pos=97296|flags=K__
> +packet|codec_type=audio|stream_index=1|pts=50944|pts_time=1.061333|dts=50944|dts_time=1.061333|duration=1070071408|duration_time=22293.154333|size=328|pos=97663|flags=K__

Can't reproduce. With current master I get:

> $ ./ffprobe -v 0 test2.mov -show_packets -print_format compact
> packet|codec_type=video|stream_index=0|pts=1024|pts_time=0.080000|dts=0|dts_time=0.000000|duration=512|duration_time=0.040000|size=12625|pos=1684|flags=K__
> packet|codec_type=video|stream_index=0|pts=3072|pts_time=0.240000|dts=512|dts_time=0.040000|duration=512|duration_time=0.040000|size=5141|pos=14309|flags=___
> packet|codec_type=audio|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=3840|duration_time=0.080000|size=283|pos=19450|flags=K__
> packet|codec_type=video|stream_index=0|pts=2048|pts_time=0.160000|dts=1024|dts_time=0.080000|duration=512|duration_time=0.040000|size=1525|pos=19733|flags=___
> packet|codec_type=audio|stream_index=1|pts=3840|pts_time=0.080000|dts=3840|dts_time=0.080000|duration=1024|duration_time=0.021333|size=263|pos=21258|flags=K__
> packet|codec_type=audio|stream_index=1|pts=4864|pts_time=0.101333|dts=4864|dts_time=0.101333|duration=1024|duration_time=0.021333|size=262|pos=21521|flags=K__
> packet|codec_type=video|stream_index=0|pts=1536|pts_time=0.120000|dts=1536|dts_time=0.120000|duration=512|duration_time=0.040000|size=1297|pos=21783|flags=___
> packet|codec_type=audio|stream_index=1|pts=5888|pts_time=0.122667|dts=5888|dts_time=0.122667|duration=1024|duration_time=0.021333|size=93|pos=23080|flags=K__
> packet|codec_type=audio|stream_index=1|pts=6912|pts_time=0.144000|dts=6912|dts_time=0.144000|duration=1024|duration_time=0.021333|size=457|pos=23173|flags=K__
> packet|codec_type=video|stream_index=0|pts=2560|pts_time=0.200000|dts=2048|dts_time=0.160000|duration=512|duration_time=0.040000|size=358|pos=23630|flags=___
> packet|codec_type=audio|stream_index=1|pts=7936|pts_time=0.165333|dts=7936|dts_time=0.165333|duration=1024|duration_time=0.021333|size=403|pos=23988|flags=K__
> packet|codec_type=audio|stream_index=1|pts=8960|pts_time=0.186667|dts=8960|dts_time=0.186667|duration=1024|duration_time=0.021333|size=387|pos=24391|flags=K__
> packet|codec_type=video|stream_index=0|pts=5120|pts_time=0.400000|dts=2560|dts_time=0.200000|duration=512|duration_time=0.040000|size=4366|pos=25054|flags=___
> packet|codec_type=video|stream_index=0|pts=4096|pts_time=0.320000|dts=3072|dts_time=0.240000|duration=512|duration_time=0.040000|size=2298|pos=29420|flags=___
> packet|codec_type=video|stream_index=0|pts=3584|pts_time=0.280000|dts=3584|dts_time=0.280000|duration=512|duration_time=0.040000|size=1265|pos=31718|flags=___
> packet|codec_type=video|stream_index=0|pts=4608|pts_time=0.360000|dts=4096|dts_time=0.320000|duration=512|duration_time=0.040000|size=1327|pos=32983|flags=___
> packet|codec_type=video|stream_index=0|pts=7168|pts_time=0.560000|dts=4608|dts_time=0.360000|duration=512|duration_time=0.040000|size=5047|pos=34310|flags=___
> packet|codec_type=audio|stream_index=1|pts=9984|pts_time=0.208000|dts=9984|dts_time=0.208000|duration=1024|duration_time=0.021333|size=358|pos=39357|flags=K__
> packet|codec_type=audio|stream_index=1|pts=11008|pts_time=0.229333|dts=11008|dts_time=0.229333|duration=1024|duration_time=0.021333|size=351|pos=39715|flags=K__
> packet|codec_type=audio|stream_index=1|pts=12032|pts_time=0.250667|dts=12032|dts_time=0.250667|duration=1024|duration_time=0.021333|size=353|pos=40066|flags=K__
> packet|codec_type=audio|stream_index=1|pts=13056|pts_time=0.272000|dts=13056|dts_time=0.272000|duration=1024|duration_time=0.021333|size=339|pos=40419|flags=K__
> packet|codec_type=audio|stream_index=1|pts=14080|pts_time=0.293333|dts=14080|dts_time=0.293333|duration=1024|duration_time=0.021333|size=351|pos=40758|flags=K__
> packet|codec_type=audio|stream_index=1|pts=15104|pts_time=0.314667|dts=15104|dts_time=0.314667|duration=1024|duration_time=0.021333|size=337|pos=41109|flags=K__
> packet|codec_type=audio|stream_index=1|pts=16128|pts_time=0.336000|dts=16128|dts_time=0.336000|duration=1024|duration_time=0.021333|size=337|pos=41446|flags=K__
> packet|codec_type=audio|stream_index=1|pts=17152|pts_time=0.357333|dts=17152|dts_time=0.357333|duration=1024|duration_time=0.021333|size=353|pos=41783|flags=K__
> packet|codec_type=audio|stream_index=1|pts=18176|pts_time=0.378667|dts=18176|dts_time=0.378667|duration=1024|duration_time=0.021333|size=340|pos=42136|flags=K__
> packet|codec_type=video|stream_index=0|pts=6144|pts_time=0.480000|dts=5120|dts_time=0.400000|duration=512|duration_time=0.040000|size=2400|pos=42756|flags=___
> packet|codec_type=video|stream_index=0|pts=5632|pts_time=0.440000|dts=5632|dts_time=0.440000|duration=512|duration_time=0.040000|size=1574|pos=45156|flags=___
> packet|codec_type=video|stream_index=0|pts=6656|pts_time=0.520000|dts=6144|dts_time=0.480000|duration=512|duration_time=0.040000|size=1443|pos=46730|flags=___
> packet|codec_type=video|stream_index=0|pts=9216|pts_time=0.720000|dts=6656|dts_time=0.520000|duration=512|duration_time=0.040000|size=5249|pos=48173|flags=___
> packet|codec_type=video|stream_index=0|pts=8192|pts_time=0.640000|dts=7168|dts_time=0.560000|duration=512|duration_time=0.040000|size=2688|pos=53422|flags=___
> packet|codec_type=audio|stream_index=1|pts=19200|pts_time=0.400000|dts=19200|dts_time=0.400000|duration=1024|duration_time=0.021333|size=335|pos=56110|flags=K__
> packet|codec_type=audio|stream_index=1|pts=20224|pts_time=0.421333|dts=20224|dts_time=0.421333|duration=1024|duration_time=0.021333|size=330|pos=56445|flags=K__
> packet|codec_type=audio|stream_index=1|pts=21248|pts_time=0.442667|dts=21248|dts_time=0.442667|duration=1024|duration_time=0.021333|size=341|pos=56775|flags=K__
> packet|codec_type=audio|stream_index=1|pts=22272|pts_time=0.464000|dts=22272|dts_time=0.464000|duration=1024|duration_time=0.021333|size=326|pos=57116|flags=K__
> packet|codec_type=audio|stream_index=1|pts=23296|pts_time=0.485333|dts=23296|dts_time=0.485333|duration=1024|duration_time=0.021333|size=341|pos=57442|flags=K__
> packet|codec_type=audio|stream_index=1|pts=24320|pts_time=0.506667|dts=24320|dts_time=0.506667|duration=1024|duration_time=0.021333|size=321|pos=57783|flags=K__
> packet|codec_type=audio|stream_index=1|pts=25344|pts_time=0.528000|dts=25344|dts_time=0.528000|duration=1024|duration_time=0.021333|size=325|pos=58104|flags=K__
> packet|codec_type=audio|stream_index=1|pts=26368|pts_time=0.549333|dts=26368|dts_time=0.549333|duration=1024|duration_time=0.021333|size=325|pos=58429|flags=K__
> packet|codec_type=audio|stream_index=1|pts=27392|pts_time=0.570667|dts=27392|dts_time=0.570667|duration=1024|duration_time=0.021333|size=333|pos=58754|flags=K__
> packet|codec_type=audio|stream_index=1|pts=28416|pts_time=0.592000|dts=28416|dts_time=0.592000|duration=1024|duration_time=0.021333|size=319|pos=59087|flags=K__
> packet|codec_type=video|stream_index=0|pts=7680|pts_time=0.600000|dts=7680|dts_time=0.600000|duration=512|duration_time=0.040000|size=1566|pos=59682|flags=___
> packet|codec_type=video|stream_index=0|pts=8704|pts_time=0.680000|dts=8192|dts_time=0.640000|duration=512|duration_time=0.040000|size=1629|pos=61248|flags=___
> packet|codec_type=video|stream_index=0|pts=11264|pts_time=0.880000|dts=8704|dts_time=0.680000|duration=512|duration_time=0.040000|size=6504|pos=62877|flags=___
> packet|codec_type=video|stream_index=0|pts=10240|pts_time=0.800000|dts=9216|dts_time=0.720000|duration=512|duration_time=0.040000|size=3131|pos=69381|flags=___
> packet|codec_type=video|stream_index=0|pts=9728|pts_time=0.760000|dts=9728|dts_time=0.760000|duration=512|duration_time=0.040000|size=1946|pos=72512|flags=___
> packet|codec_type=audio|stream_index=1|pts=29440|pts_time=0.613333|dts=29440|dts_time=0.613333|duration=1024|duration_time=0.021333|size=337|pos=74458|flags=K__
> packet|codec_type=audio|stream_index=1|pts=30464|pts_time=0.634667|dts=30464|dts_time=0.634667|duration=1024|duration_time=0.021333|size=330|pos=74795|flags=K__
> packet|codec_type=audio|stream_index=1|pts=31488|pts_time=0.656000|dts=31488|dts_time=0.656000|duration=1024|duration_time=0.021333|size=338|pos=75125|flags=K__
> packet|codec_type=audio|stream_index=1|pts=32512|pts_time=0.677333|dts=32512|dts_time=0.677333|duration=1024|duration_time=0.021333|size=343|pos=75463|flags=K__
> packet|codec_type=audio|stream_index=1|pts=33536|pts_time=0.698667|dts=33536|dts_time=0.698667|duration=1024|duration_time=0.021333|size=333|pos=75806|flags=K__
> packet|codec_type=audio|stream_index=1|pts=34560|pts_time=0.720000|dts=34560|dts_time=0.720000|duration=1024|duration_time=0.021333|size=343|pos=76139|flags=K__
> packet|codec_type=audio|stream_index=1|pts=35584|pts_time=0.741333|dts=35584|dts_time=0.741333|duration=1024|duration_time=0.021333|size=355|pos=76482|flags=K__
> packet|codec_type=audio|stream_index=1|pts=36608|pts_time=0.762667|dts=36608|dts_time=0.762667|duration=1024|duration_time=0.021333|size=348|pos=76837|flags=K__
> packet|codec_type=audio|stream_index=1|pts=37632|pts_time=0.784000|dts=37632|dts_time=0.784000|duration=1024|duration_time=0.021333|size=352|pos=77185|flags=K__
> packet|codec_type=video|stream_index=0|pts=10752|pts_time=0.840000|dts=10240|dts_time=0.800000|duration=512|duration_time=0.040000|size=2130|pos=77817|flags=___
> packet|codec_type=video|stream_index=0|pts=13312|pts_time=1.040000|dts=10752|dts_time=0.840000|duration=512|duration_time=0.040000|size=5123|pos=79947|flags=___
> packet|codec_type=video|stream_index=0|pts=12288|pts_time=0.960000|dts=11264|dts_time=0.880000|duration=512|duration_time=0.040000|size=3980|pos=85070|flags=___
> packet|codec_type=video|stream_index=0|pts=11776|pts_time=0.920000|dts=11776|dts_time=0.920000|duration=512|duration_time=0.040000|size=2266|pos=89050|flags=___
> packet|codec_type=video|stream_index=0|pts=12800|pts_time=1.000000|dts=12288|dts_time=0.960000|duration=512|duration_time=0.040000|size=2085|pos=91316|flags=___
> packet|codec_type=audio|stream_index=1|pts=38656|pts_time=0.805333|dts=38656|dts_time=0.805333|duration=1024|duration_time=0.021333|size=343|pos=93401|flags=K__
> packet|codec_type=audio|stream_index=1|pts=39680|pts_time=0.826667|dts=39680|dts_time=0.826667|duration=1024|duration_time=0.021333|size=339|pos=93744|flags=K__
> packet|codec_type=audio|stream_index=1|pts=40704|pts_time=0.848000|dts=40704|dts_time=0.848000|duration=1024|duration_time=0.021333|size=336|pos=94083|flags=K__
> packet|codec_type=audio|stream_index=1|pts=41728|pts_time=0.869333|dts=41728|dts_time=0.869333|duration=1024|duration_time=0.021333|size=326|pos=94419|flags=K__
> packet|codec_type=audio|stream_index=1|pts=42752|pts_time=0.890667|dts=42752|dts_time=0.890667|duration=1024|duration_time=0.021333|size=338|pos=94745|flags=K__
> packet|codec_type=audio|stream_index=1|pts=43776|pts_time=0.912000|dts=43776|dts_time=0.912000|duration=1024|duration_time=0.021333|size=336|pos=95083|flags=K__
> packet|codec_type=audio|stream_index=1|pts=44800|pts_time=0.933333|dts=44800|dts_time=0.933333|duration=1024|duration_time=0.021333|size=330|pos=95419|flags=K__
> packet|codec_type=audio|stream_index=1|pts=45824|pts_time=0.954667|dts=45824|dts_time=0.954667|duration=1024|duration_time=0.021333|size=333|pos=95749|flags=K__
> packet|codec_type=audio|stream_index=1|pts=46848|pts_time=0.976000|dts=46848|dts_time=0.976000|duration=1024|duration_time=0.021333|size=340|pos=96082|flags=K__
> packet|codec_type=audio|stream_index=1|pts=47872|pts_time=0.997333|dts=47872|dts_time=0.997333|duration=1024|duration_time=0.021333|size=337|pos=96422|flags=K__
> packet|codec_type=audio|stream_index=1|pts=48896|pts_time=1.018667|dts=48896|dts_time=1.018667|duration=1024|duration_time=0.021333|size=398|pos=96899|flags=K__
> packet|codec_type=audio|stream_index=1|pts=49920|pts_time=1.040000|dts=49920|dts_time=1.040000|duration=1024|duration_time=0.021333|size=367|pos=97297|flags=K__
> packet|codec_type=audio|stream_index=1|pts=50944|pts_time=1.061333|dts=50944|dts_time=1.061333|duration=1024|duration_time=0.021333|size=328|pos=97664|flags=K__

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20241124/1d5ce2c4/attachment.sig>