Commit ba4b73c9779c32580f8a3ba08602a5d94e0bcd7c caused a regression in
the usage of avg_frame_rate to detect the frame rate of raw h264/hevc
bitstreams: after the commit, avg_frame_rate is always the value of the
-framerate option (which is set to 25 by default) instead of the actual
frame rate derived from the bitstream SPS/VPS NALUs.
This commit fixes the regression by setting the framerate codec
parameter to the value of the framerate option instead. After this
change, bitstreams without timing information will derive avg_frame_rate
from the -framerate option, while bitstreams with timing information
will derive avg_frame_rate from the bitstream itself.
The CAVS demux test now uses the -raw_packet_size option to workaround
an issue where the CAVS parser does not parse the framerate from the
header, which gives initial packets parsed from the initial raw packet
an incorrect duration.
The h264-bsf-dts2pts test now returns the correct frame durations for a
bitstream with a mix of single-field and double-field frames.
Signed-off-by: Gavin Li <g...@thegavinli.com>
---
libavformat/rawdec.c | 2 +-
tests/fate/demux.mak | 2 +-
tests/ref/fate/cavs-demux | 122 +++++++++---------
tests/ref/fate/h264-bsf-dts2pts | 102 +++++++--------
.../ref/fate/h264-conformance-cvpcmnl2_sva_c | 6 +-
tests/ref/lavf-fate/hevc.mp4 | 2 +-
6 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index d0c829dc42..5cf2764a0d 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -83,9 +83,9 @@ int ff_raw_video_read_header(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
st->codecpar->codec_id = ffifmt(s->iformat)->raw_codec_id;
+ st->codecpar->framerate = s1->framerate;
sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;
- st->avg_frame_rate = s1->framerate;
avpriv_set_pts_info(st, 64, 1, 1200000);
fail:
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index e0d1fccc8f..f2dacfdc6c 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -30,7 +30,7 @@ FATE_SAMPLES_DEMUX-$(CONFIG_BRSTM_DEMUXER) += fate-brstm
fate-brstm: CMD = crc -i $(TARGET_SAMPLES)/brstm/lozswd_partial.brstm -c:a copy
FATE_FFPROBE_DEMUX-$(call ALLYES, CAVSVIDEO_DEMUXER CAVSVIDEO_PARSER) +=
fate-cavs-demux
-fate-cavs-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/cavs/bunny.mp4
+fate-cavs-demux: CMD = ffprobe_demux -raw_packet_size 128
$(TARGET_SAMPLES)/cavs/bunny.mp4
FATE_SAMPLES_DEMUX-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -c:v
copy -c:a copy
diff --git a/tests/ref/fate/cavs-demux b/tests/ref/fate/cavs-demux
index b1e2c2fd25..86a7c306a0 100644
--- a/tests/ref/fate/cavs-demux
+++ b/tests/ref/fate/cavs-demux
@@ -1,62 +1,62 @@
packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=48000|duration_time=0.040000|size=14447|pos=0|flags=K__|data_hash=CRC32:83f257c0
-packet|codec_type=video|stream_index=0|pts=48000|pts_time=0.040000|dts=48000|dts_time=0.040000|duration=48000|duration_time=0.040000|size=483|pos=14447|flags=K__|data_hash=CRC32:5abb82f8
-packet|codec_type=video|stream_index=0|pts=96000|pts_time=0.080000|dts=96000|dts_time=0.080000|duration=48000|duration_time=0.040000|size=18|pos=14930|flags=K__|data_hash=CRC32:b8b123d8
-packet|codec_type=video|stream_index=0|pts=144000|pts_time=0.120000|dts=144000|dts_time=0.120000|duration=48000|duration_time=0.040000|size=18|pos=14948|flags=K__|data_hash=CRC32:19180fa8
-packet|codec_type=video|stream_index=0|pts=192000|pts_time=0.160000|dts=192000|dts_time=0.160000|duration=48000|duration_time=0.040000|size=18|pos=14966|flags=K__|data_hash=CRC32:cf501647
-packet|codec_type=video|stream_index=0|pts=240000|pts_time=0.200000|dts=240000|dts_time=0.200000|duration=40000|duration_time=0.033333|size=1807|pos=14984|flags=K__|data_hash=CRC32:4267e1d5
-packet|codec_type=video|stream_index=0|pts=280000|pts_time=0.233333|dts=280000|dts_time=0.233333|duration=40000|duration_time=0.033333|size=28|pos=16791|flags=K__|data_hash=CRC32:c223285a
-packet|codec_type=video|stream_index=0|pts=320000|pts_time=0.266667|dts=320000|dts_time=0.266667|duration=40000|duration_time=0.033333|size=25|pos=16819|flags=K__|data_hash=CRC32:2565cc9e
-packet|codec_type=video|stream_index=0|pts=360000|pts_time=0.300000|dts=360000|dts_time=0.300000|duration=40000|duration_time=0.033333|size=22|pos=16844|flags=K__|data_hash=CRC32:7fbf36ac
-packet|codec_type=video|stream_index=0|pts=400000|pts_time=0.333333|dts=400000|dts_time=0.333333|duration=40000|duration_time=0.033333|size=23884|pos=16866|flags=K__|data_hash=CRC32:d61430fd
-packet|codec_type=video|stream_index=0|pts=440000|pts_time=0.366667|dts=440000|dts_time=0.366667|duration=40000|duration_time=0.033333|size=265|pos=40750|flags=K__|data_hash=CRC32:d64145a0
-packet|codec_type=video|stream_index=0|pts=480000|pts_time=0.400000|dts=480000|dts_time=0.400000|duration=40000|duration_time=0.033333|size=393|pos=41015|flags=K__|data_hash=CRC32:32c020e2
-packet|codec_type=video|stream_index=0|pts=520000|pts_time=0.433333|dts=520000|dts_time=0.433333|duration=40000|duration_time=0.033333|size=656|pos=41408|flags=K__|data_hash=CRC32:965c7846
-packet|codec_type=video|stream_index=0|pts=560000|pts_time=0.466667|dts=560000|dts_time=0.466667|duration=40000|duration_time=0.033333|size=3500|pos=42064|flags=K__|data_hash=CRC32:ddf731de
-packet|codec_type=video|stream_index=0|pts=600000|pts_time=0.500000|dts=600000|dts_time=0.500000|duration=40000|duration_time=0.033333|size=68|pos=45564|flags=K__|data_hash=CRC32:f8c8ba07
-packet|codec_type=video|stream_index=0|pts=640000|pts_time=0.533333|dts=640000|dts_time=0.533333|duration=40000|duration_time=0.033333|size=58|pos=45632|flags=K__|data_hash=CRC32:22adbb83
-packet|codec_type=video|stream_index=0|pts=680000|pts_time=0.566667|dts=680000|dts_time=0.566667|duration=40000|duration_time=0.033333|size=43|pos=45690|flags=K__|data_hash=CRC32:53fb136c
-packet|codec_type=video|stream_index=0|pts=720000|pts_time=0.600000|dts=720000|dts_time=0.600000|duration=40000|duration_time=0.033333|size=11757|pos=45733|flags=K__|data_hash=CRC32:551e491b
-packet|codec_type=video|stream_index=0|pts=760000|pts_time=0.633333|dts=760000|dts_time=0.633333|duration=40000|duration_time=0.033333|size=98|pos=57490|flags=K__|data_hash=CRC32:4e718dd4
-packet|codec_type=video|stream_index=0|pts=800000|pts_time=0.666667|dts=800000|dts_time=0.666667|duration=40000|duration_time=0.033333|size=79|pos=57588|flags=K__|data_hash=CRC32:4c5a32f5
-packet|codec_type=video|stream_index=0|pts=840000|pts_time=0.700000|dts=840000|dts_time=0.700000|duration=40000|duration_time=0.033333|size=128|pos=57667|flags=K__|data_hash=CRC32:95b8cad1
-packet|codec_type=video|stream_index=0|pts=880000|pts_time=0.733333|dts=880000|dts_time=0.733333|duration=40000|duration_time=0.033333|size=10487|pos=57795|flags=K__|data_hash=CRC32:8646f8f2
-packet|codec_type=video|stream_index=0|pts=920000|pts_time=0.766667|dts=920000|dts_time=0.766667|duration=40000|duration_time=0.033333|size=65|pos=68282|flags=K__|data_hash=CRC32:73687d19
-packet|codec_type=video|stream_index=0|pts=960000|pts_time=0.800000|dts=960000|dts_time=0.800000|duration=40000|duration_time=0.033333|size=46|pos=68347|flags=K__|data_hash=CRC32:ad381ca5
-packet|codec_type=video|stream_index=0|pts=1000000|pts_time=0.833333|dts=1000000|dts_time=0.833333|duration=40000|duration_time=0.033333|size=67|pos=68393|flags=K__|data_hash=CRC32:89069152
-packet|codec_type=video|stream_index=0|pts=1040000|pts_time=0.866667|dts=1040000|dts_time=0.866667|duration=40000|duration_time=0.033333|size=8403|pos=68460|flags=K__|data_hash=CRC32:a22913dd
-packet|codec_type=video|stream_index=0|pts=1080000|pts_time=0.900000|dts=1080000|dts_time=0.900000|duration=40000|duration_time=0.033333|size=70|pos=76863|flags=K__|data_hash=CRC32:98772596
-packet|codec_type=video|stream_index=0|pts=1120000|pts_time=0.933333|dts=1120000|dts_time=0.933333|duration=40000|duration_time=0.033333|size=63|pos=76933|flags=K__|data_hash=CRC32:cfd62cc4
-packet|codec_type=video|stream_index=0|pts=1160000|pts_time=0.966667|dts=1160000|dts_time=0.966667|duration=40000|duration_time=0.033333|size=70|pos=76996|flags=K__|data_hash=CRC32:9b526357
-packet|codec_type=video|stream_index=0|pts=1200000|pts_time=1.000000|dts=1200000|dts_time=1.000000|duration=40000|duration_time=0.033333|size=7945|pos=77066|flags=K__|data_hash=CRC32:d0f46769
-packet|codec_type=video|stream_index=0|pts=1240000|pts_time=1.033333|dts=1240000|dts_time=1.033333|duration=40000|duration_time=0.033333|size=40558|pos=85011|flags=K__|data_hash=CRC32:4db0bd7d
-packet|codec_type=video|stream_index=0|pts=1280000|pts_time=1.066667|dts=1280000|dts_time=1.066667|duration=40000|duration_time=0.033333|size=1260|pos=125569|flags=K__|data_hash=CRC32:3c4397d7
-packet|codec_type=video|stream_index=0|pts=1320000|pts_time=1.100000|dts=1320000|dts_time=1.100000|duration=40000|duration_time=0.033333|size=27|pos=126829|flags=K__|data_hash=CRC32:5e233c77
-packet|codec_type=video|stream_index=0|pts=1360000|pts_time=1.133333|dts=1360000|dts_time=1.133333|duration=40000|duration_time=0.033333|size=26|pos=126856|flags=K__|data_hash=CRC32:57985e7b
-packet|codec_type=video|stream_index=0|pts=1400000|pts_time=1.166667|dts=1400000|dts_time=1.166667|duration=40000|duration_time=0.033333|size=18|pos=126882|flags=K__|data_hash=CRC32:f4eb01ba
-packet|codec_type=video|stream_index=0|pts=1440000|pts_time=1.200000|dts=1440000|dts_time=1.200000|duration=40000|duration_time=0.033333|size=2931|pos=126900|flags=K__|data_hash=CRC32:ca20964f
-packet|codec_type=video|stream_index=0|pts=1480000|pts_time=1.233333|dts=1480000|dts_time=1.233333|duration=40000|duration_time=0.033333|size=25|pos=129831|flags=K__|data_hash=CRC32:a82bd0b4
-packet|codec_type=video|stream_index=0|pts=1520000|pts_time=1.266667|dts=1520000|dts_time=1.266667|duration=40000|duration_time=0.033333|size=19|pos=129856|flags=K__|data_hash=CRC32:bc5f709d
-packet|codec_type=video|stream_index=0|pts=1560000|pts_time=1.300000|dts=1560000|dts_time=1.300000|duration=40000|duration_time=0.033333|size=30|pos=129875|flags=K__|data_hash=CRC32:c1f8a4c9
-packet|codec_type=video|stream_index=0|pts=1600000|pts_time=1.333333|dts=1600000|dts_time=1.333333|duration=40000|duration_time=0.033333|size=5088|pos=129905|flags=K__|data_hash=CRC32:41ace145
-packet|codec_type=video|stream_index=0|pts=1640000|pts_time=1.366667|dts=1640000|dts_time=1.366667|duration=40000|duration_time=0.033333|size=41|pos=134993|flags=K__|data_hash=CRC32:e169b3c7
-packet|codec_type=video|stream_index=0|pts=1680000|pts_time=1.400000|dts=1680000|dts_time=1.400000|duration=40000|duration_time=0.033333|size=53|pos=135034|flags=K__|data_hash=CRC32:973c5fe3
-packet|codec_type=video|stream_index=0|pts=1720000|pts_time=1.433333|dts=1720000|dts_time=1.433333|duration=40000|duration_time=0.033333|size=54|pos=135087|flags=K__|data_hash=CRC32:665639e6
-packet|codec_type=video|stream_index=0|pts=1760000|pts_time=1.466667|dts=1760000|dts_time=1.466667|duration=40000|duration_time=0.033333|size=7150|pos=135141|flags=K__|data_hash=CRC32:cc910027
-packet|codec_type=video|stream_index=0|pts=1800000|pts_time=1.500000|dts=1800000|dts_time=1.500000|duration=40000|duration_time=0.033333|size=48|pos=142291|flags=K__|data_hash=CRC32:45658f78
-packet|codec_type=video|stream_index=0|pts=1840000|pts_time=1.533333|dts=1840000|dts_time=1.533333|duration=40000|duration_time=0.033333|size=48|pos=142339|flags=K__|data_hash=CRC32:94e359a2
-packet|codec_type=video|stream_index=0|pts=1880000|pts_time=1.566667|dts=1880000|dts_time=1.566667|duration=40000|duration_time=0.033333|size=51|pos=142387|flags=K__|data_hash=CRC32:959ccdd9
-packet|codec_type=video|stream_index=0|pts=1920000|pts_time=1.600000|dts=1920000|dts_time=1.600000|duration=40000|duration_time=0.033333|size=9379|pos=142438|flags=K__|data_hash=CRC32:a3318410
-packet|codec_type=video|stream_index=0|pts=1960000|pts_time=1.633333|dts=1960000|dts_time=1.633333|duration=40000|duration_time=0.033333|size=58|pos=151817|flags=K__|data_hash=CRC32:44b24f03
-packet|codec_type=video|stream_index=0|pts=2000000|pts_time=1.666667|dts=2000000|dts_time=1.666667|duration=40000|duration_time=0.033333|size=43|pos=151875|flags=K__|data_hash=CRC32:f4876e05
-packet|codec_type=video|stream_index=0|pts=2040000|pts_time=1.700000|dts=2040000|dts_time=1.700000|duration=40000|duration_time=0.033333|size=62|pos=151918|flags=K__|data_hash=CRC32:34dce749
-packet|codec_type=video|stream_index=0|pts=2080000|pts_time=1.733333|dts=2080000|dts_time=1.733333|duration=40000|duration_time=0.033333|size=10733|pos=151980|flags=K__|data_hash=CRC32:9012fdfb
-packet|codec_type=video|stream_index=0|pts=2120000|pts_time=1.766667|dts=2120000|dts_time=1.766667|duration=40000|duration_time=0.033333|size=58|pos=162713|flags=K__|data_hash=CRC32:8a3c8760
-packet|codec_type=video|stream_index=0|pts=2160000|pts_time=1.800000|dts=2160000|dts_time=1.800000|duration=40000|duration_time=0.033333|size=41|pos=162771|flags=K__|data_hash=CRC32:28da6bf4
-packet|codec_type=video|stream_index=0|pts=2200000|pts_time=1.833333|dts=2200000|dts_time=1.833333|duration=40000|duration_time=0.033333|size=68|pos=162812|flags=K__|data_hash=CRC32:959dcc10
-packet|codec_type=video|stream_index=0|pts=2240000|pts_time=1.866667|dts=2240000|dts_time=1.866667|duration=40000|duration_time=0.033333|size=9247|pos=162880|flags=K__|data_hash=CRC32:cf1e2a1a
-packet|codec_type=video|stream_index=0|pts=2280000|pts_time=1.900000|dts=2280000|dts_time=1.900000|duration=40000|duration_time=0.033333|size=58|pos=172127|flags=K__|data_hash=CRC32:2efcb7ba
-packet|codec_type=video|stream_index=0|pts=2320000|pts_time=1.933333|dts=2320000|dts_time=1.933333|duration=40000|duration_time=0.033333|size=67|pos=172185|flags=K__|data_hash=CRC32:42484449
-packet|codec_type=video|stream_index=0|pts=2360000|pts_time=1.966667|dts=2360000|dts_time=1.966667|duration=40000|duration_time=0.033333|size=83|pos=172252|flags=K__|data_hash=CRC32:a941bdf0
-packet|codec_type=video|stream_index=0|pts=2400000|pts_time=2.000000|dts=2400000|dts_time=2.000000|duration=40000|duration_time=0.033333|size=5417|pos=172335|flags=K__|data_hash=CRC32:9d0d503b
-stream|index=0|codec_name=cavs|profile=unknown|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=1280|height=720|coded_width=1280|coded_height=720|has_b_frames=0|sample_aspect_ratio=N/A|display_aspect_ratio=N/A|pix_fmt=yuv420p|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=30/1|avg_frame_rate=25/1|time_base=1/1200000|start_pts=N/A|start_time=N/A|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=60|extradata_size=18|extradata_hash=CRC32:1255d52e|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=
0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0
-format|filename=bunny.mp4|nb_streams=1|nb_programs=0|nb_stream_groups=0|format_name=cavsvideo|start_time=N/A|duration=N/A|size=177752|bit_rate=N/A|probe_score=51
+packet|codec_type=video|stream_index=0|pts=48000|pts_time=0.040000|dts=48000|dts_time=0.040000|duration=40000|duration_time=0.033333|size=483|pos=14447|flags=K__|data_hash=CRC32:5abb82f8
+packet|codec_type=video|stream_index=0|pts=88000|pts_time=0.073333|dts=88000|dts_time=0.073333|duration=40000|duration_time=0.033333|size=18|pos=14930|flags=K__|data_hash=CRC32:b8b123d8
+packet|codec_type=video|stream_index=0|pts=128000|pts_time=0.106667|dts=128000|dts_time=0.106667|duration=40000|duration_time=0.033333|size=18|pos=14948|flags=K__|data_hash=CRC32:19180fa8
+packet|codec_type=video|stream_index=0|pts=168000|pts_time=0.140000|dts=168000|dts_time=0.140000|duration=40000|duration_time=0.033333|size=18|pos=14966|flags=K__|data_hash=CRC32:cf501647
+packet|codec_type=video|stream_index=0|pts=208000|pts_time=0.173333|dts=208000|dts_time=0.173333|duration=40000|duration_time=0.033333|size=1807|pos=14984|flags=K__|data_hash=CRC32:4267e1d5
+packet|codec_type=video|stream_index=0|pts=248000|pts_time=0.206667|dts=248000|dts_time=0.206667|duration=40000|duration_time=0.033333|size=28|pos=16791|flags=K__|data_hash=CRC32:c223285a
+packet|codec_type=video|stream_index=0|pts=288000|pts_time=0.240000|dts=288000|dts_time=0.240000|duration=40000|duration_time=0.033333|size=25|pos=16819|flags=K__|data_hash=CRC32:2565cc9e
+packet|codec_type=video|stream_index=0|pts=328000|pts_time=0.273333|dts=328000|dts_time=0.273333|duration=40000|duration_time=0.033333|size=22|pos=16844|flags=K__|data_hash=CRC32:7fbf36ac
+packet|codec_type=video|stream_index=0|pts=368000|pts_time=0.306667|dts=368000|dts_time=0.306667|duration=40000|duration_time=0.033333|size=23884|pos=16866|flags=K__|data_hash=CRC32:d61430fd
+packet|codec_type=video|stream_index=0|pts=408000|pts_time=0.340000|dts=408000|dts_time=0.340000|duration=40000|duration_time=0.033333|size=265|pos=40750|flags=K__|data_hash=CRC32:d64145a0
+packet|codec_type=video|stream_index=0|pts=448000|pts_time=0.373333|dts=448000|dts_time=0.373333|duration=40000|duration_time=0.033333|size=393|pos=41015|flags=K__|data_hash=CRC32:32c020e2
+packet|codec_type=video|stream_index=0|pts=488000|pts_time=0.406667|dts=488000|dts_time=0.406667|duration=40000|duration_time=0.033333|size=656|pos=41408|flags=K__|data_hash=CRC32:965c7846
+packet|codec_type=video|stream_index=0|pts=528000|pts_time=0.440000|dts=528000|dts_time=0.440000|duration=40000|duration_time=0.033333|size=3500|pos=42064|flags=K__|data_hash=CRC32:ddf731de
+packet|codec_type=video|stream_index=0|pts=568000|pts_time=0.473333|dts=568000|dts_time=0.473333|duration=40000|duration_time=0.033333|size=68|pos=45564|flags=K__|data_hash=CRC32:f8c8ba07
+packet|codec_type=video|stream_index=0|pts=608000|pts_time=0.506667|dts=608000|dts_time=0.506667|duration=40000|duration_time=0.033333|size=58|pos=45632|flags=K__|data_hash=CRC32:22adbb83
+packet|codec_type=video|stream_index=0|pts=648000|pts_time=0.540000|dts=648000|dts_time=0.540000|duration=40000|duration_time=0.033333|size=43|pos=45690|flags=K__|data_hash=CRC32:53fb136c
+packet|codec_type=video|stream_index=0|pts=688000|pts_time=0.573333|dts=688000|dts_time=0.573333|duration=40000|duration_time=0.033333|size=11757|pos=45733|flags=K__|data_hash=CRC32:551e491b
+packet|codec_type=video|stream_index=0|pts=728000|pts_time=0.606667|dts=728000|dts_time=0.606667|duration=40000|duration_time=0.033333|size=98|pos=57490|flags=K__|data_hash=CRC32:4e718dd4
+packet|codec_type=video|stream_index=0|pts=768000|pts_time=0.640000|dts=768000|dts_time=0.640000|duration=40000|duration_time=0.033333|size=79|pos=57588|flags=K__|data_hash=CRC32:4c5a32f5
+packet|codec_type=video|stream_index=0|pts=808000|pts_time=0.673333|dts=808000|dts_time=0.673333|duration=40000|duration_time=0.033333|size=128|pos=57667|flags=K__|data_hash=CRC32:95b8cad1
+packet|codec_type=video|stream_index=0|pts=848000|pts_time=0.706667|dts=848000|dts_time=0.706667|duration=40000|duration_time=0.033333|size=10487|pos=57795|flags=K__|data_hash=CRC32:8646f8f2
+packet|codec_type=video|stream_index=0|pts=888000|pts_time=0.740000|dts=888000|dts_time=0.740000|duration=40000|duration_time=0.033333|size=65|pos=68282|flags=K__|data_hash=CRC32:73687d19
+packet|codec_type=video|stream_index=0|pts=928000|pts_time=0.773333|dts=928000|dts_time=0.773333|duration=40000|duration_time=0.033333|size=46|pos=68347|flags=K__|data_hash=CRC32:ad381ca5
+packet|codec_type=video|stream_index=0|pts=968000|pts_time=0.806667|dts=968000|dts_time=0.806667|duration=40000|duration_time=0.033333|size=67|pos=68393|flags=K__|data_hash=CRC32:89069152
+packet|codec_type=video|stream_index=0|pts=1008000|pts_time=0.840000|dts=1008000|dts_time=0.840000|duration=40000|duration_time=0.033333|size=8403|pos=68460|flags=K__|data_hash=CRC32:a22913dd
+packet|codec_type=video|stream_index=0|pts=1048000|pts_time=0.873333|dts=1048000|dts_time=0.873333|duration=40000|duration_time=0.033333|size=70|pos=76863|flags=K__|data_hash=CRC32:98772596
+packet|codec_type=video|stream_index=0|pts=1088000|pts_time=0.906667|dts=1088000|dts_time=0.906667|duration=40000|duration_time=0.033333|size=63|pos=76933|flags=K__|data_hash=CRC32:cfd62cc4
+packet|codec_type=video|stream_index=0|pts=1128000|pts_time=0.940000|dts=1128000|dts_time=0.940000|duration=40000|duration_time=0.033333|size=70|pos=76996|flags=K__|data_hash=CRC32:9b526357
+packet|codec_type=video|stream_index=0|pts=1168000|pts_time=0.973333|dts=1168000|dts_time=0.973333|duration=40000|duration_time=0.033333|size=7945|pos=77066|flags=K__|data_hash=CRC32:d0f46769
+packet|codec_type=video|stream_index=0|pts=1208000|pts_time=1.006667|dts=1208000|dts_time=1.006667|duration=40000|duration_time=0.033333|size=40558|pos=85011|flags=K__|data_hash=CRC32:4db0bd7d
+packet|codec_type=video|stream_index=0|pts=1248000|pts_time=1.040000|dts=1248000|dts_time=1.040000|duration=40000|duration_time=0.033333|size=1260|pos=125569|flags=K__|data_hash=CRC32:3c4397d7
+packet|codec_type=video|stream_index=0|pts=1288000|pts_time=1.073333|dts=1288000|dts_time=1.073333|duration=40000|duration_time=0.033333|size=27|pos=126829|flags=K__|data_hash=CRC32:5e233c77
+packet|codec_type=video|stream_index=0|pts=1328000|pts_time=1.106667|dts=1328000|dts_time=1.106667|duration=40000|duration_time=0.033333|size=26|pos=126856|flags=K__|data_hash=CRC32:57985e7b
+packet|codec_type=video|stream_index=0|pts=1368000|pts_time=1.140000|dts=1368000|dts_time=1.140000|duration=40000|duration_time=0.033333|size=18|pos=126882|flags=K__|data_hash=CRC32:f4eb01ba
+packet|codec_type=video|stream_index=0|pts=1408000|pts_time=1.173333|dts=1408000|dts_time=1.173333|duration=40000|duration_time=0.033333|size=2931|pos=126900|flags=K__|data_hash=CRC32:ca20964f
+packet|codec_type=video|stream_index=0|pts=1448000|pts_time=1.206667|dts=1448000|dts_time=1.206667|duration=40000|duration_time=0.033333|size=25|pos=129831|flags=K__|data_hash=CRC32:a82bd0b4
+packet|codec_type=video|stream_index=0|pts=1488000|pts_time=1.240000|dts=1488000|dts_time=1.240000|duration=40000|duration_time=0.033333|size=19|pos=129856|flags=K__|data_hash=CRC32:bc5f709d
+packet|codec_type=video|stream_index=0|pts=1528000|pts_time=1.273333|dts=1528000|dts_time=1.273333|duration=40000|duration_time=0.033333|size=30|pos=129875|flags=K__|data_hash=CRC32:c1f8a4c9
+packet|codec_type=video|stream_index=0|pts=1568000|pts_time=1.306667|dts=1568000|dts_time=1.306667|duration=40000|duration_time=0.033333|size=5088|pos=129905|flags=K__|data_hash=CRC32:41ace145
+packet|codec_type=video|stream_index=0|pts=1608000|pts_time=1.340000|dts=1608000|dts_time=1.340000|duration=40000|duration_time=0.033333|size=41|pos=134993|flags=K__|data_hash=CRC32:e169b3c7
+packet|codec_type=video|stream_index=0|pts=1648000|pts_time=1.373333|dts=1648000|dts_time=1.373333|duration=40000|duration_time=0.033333|size=53|pos=135034|flags=K__|data_hash=CRC32:973c5fe3
+packet|codec_type=video|stream_index=0|pts=1688000|pts_time=1.406667|dts=1688000|dts_time=1.406667|duration=40000|duration_time=0.033333|size=54|pos=135087|flags=K__|data_hash=CRC32:665639e6
+packet|codec_type=video|stream_index=0|pts=1728000|pts_time=1.440000|dts=1728000|dts_time=1.440000|duration=40000|duration_time=0.033333|size=7150|pos=135141|flags=K__|data_hash=CRC32:cc910027
+packet|codec_type=video|stream_index=0|pts=1768000|pts_time=1.473333|dts=1768000|dts_time=1.473333|duration=40000|duration_time=0.033333|size=48|pos=142291|flags=K__|data_hash=CRC32:45658f78
+packet|codec_type=video|stream_index=0|pts=1808000|pts_time=1.506667|dts=1808000|dts_time=1.506667|duration=40000|duration_time=0.033333|size=48|pos=142339|flags=K__|data_hash=CRC32:94e359a2
+packet|codec_type=video|stream_index=0|pts=1848000|pts_time=1.540000|dts=1848000|dts_time=1.540000|duration=40000|duration_time=0.033333|size=51|pos=142387|flags=K__|data_hash=CRC32:959ccdd9
+packet|codec_type=video|stream_index=0|pts=1888000|pts_time=1.573333|dts=1888000|dts_time=1.573333|duration=40000|duration_time=0.033333|size=9379|pos=142438|flags=K__|data_hash=CRC32:a3318410
+packet|codec_type=video|stream_index=0|pts=1928000|pts_time=1.606667|dts=1928000|dts_time=1.606667|duration=40000|duration_time=0.033333|size=58|pos=151817|flags=K__|data_hash=CRC32:44b24f03
+packet|codec_type=video|stream_index=0|pts=1968000|pts_time=1.640000|dts=1968000|dts_time=1.640000|duration=40000|duration_time=0.033333|size=43|pos=151875|flags=K__|data_hash=CRC32:f4876e05
+packet|codec_type=video|stream_index=0|pts=2008000|pts_time=1.673333|dts=2008000|dts_time=1.673333|duration=40000|duration_time=0.033333|size=62|pos=151918|flags=K__|data_hash=CRC32:34dce749
+packet|codec_type=video|stream_index=0|pts=2048000|pts_time=1.706667|dts=2048000|dts_time=1.706667|duration=40000|duration_time=0.033333|size=10733|pos=151980|flags=K__|data_hash=CRC32:9012fdfb
+packet|codec_type=video|stream_index=0|pts=2088000|pts_time=1.740000|dts=2088000|dts_time=1.740000|duration=40000|duration_time=0.033333|size=58|pos=162713|flags=K__|data_hash=CRC32:8a3c8760
+packet|codec_type=video|stream_index=0|pts=2128000|pts_time=1.773333|dts=2128000|dts_time=1.773333|duration=40000|duration_time=0.033333|size=41|pos=162771|flags=K__|data_hash=CRC32:28da6bf4
+packet|codec_type=video|stream_index=0|pts=2168000|pts_time=1.806667|dts=2168000|dts_time=1.806667|duration=40000|duration_time=0.033333|size=68|pos=162812|flags=K__|data_hash=CRC32:959dcc10
+packet|codec_type=video|stream_index=0|pts=2208000|pts_time=1.840000|dts=2208000|dts_time=1.840000|duration=40000|duration_time=0.033333|size=9247|pos=162880|flags=K__|data_hash=CRC32:cf1e2a1a
+packet|codec_type=video|stream_index=0|pts=2248000|pts_time=1.873333|dts=2248000|dts_time=1.873333|duration=40000|duration_time=0.033333|size=58|pos=172127|flags=K__|data_hash=CRC32:2efcb7ba
+packet|codec_type=video|stream_index=0|pts=2288000|pts_time=1.906667|dts=2288000|dts_time=1.906667|duration=40000|duration_time=0.033333|size=67|pos=172185|flags=K__|data_hash=CRC32:42484449
+packet|codec_type=video|stream_index=0|pts=2328000|pts_time=1.940000|dts=2328000|dts_time=1.940000|duration=40000|duration_time=0.033333|size=83|pos=172252|flags=K__|data_hash=CRC32:a941bdf0
+packet|codec_type=video|stream_index=0|pts=2368000|pts_time=1.973333|dts=2368000|dts_time=1.973333|duration=40000|duration_time=0.033333|size=5417|pos=172335|flags=K__|data_hash=CRC32:9d0d503b
+stream|index=0|codec_name=cavs|profile=unknown|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=1280|height=720|coded_width=1280|coded_height=720|has_b_frames=0|sample_aspect_ratio=N/A|display_aspect_ratio=N/A|pix_fmt=yuv420p|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=30/1|avg_frame_rate=30/1|time_base=1/1200000|start_pts=N/A|start_time=N/A|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=60|extradata_size=18|extradata_hash=CRC32:1255d52e|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=
0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0
+format|filename=|nb_streams=1|nb_programs=0|nb_stream_groups=0|format_name=cavsvideo|start_time=N/A|duration=N/A|size=177752|bit_rate=N/A|probe_score=51
diff --git a/tests/ref/fate/h264-bsf-dts2pts b/tests/ref/fate/h264-bsf-dts2pts
index f908bb44f5..46c640eab8 100644
--- a/tests/ref/fate/h264-bsf-dts2pts
+++ b/tests/ref/fate/h264-bsf-dts2pts
@@ -1,5 +1,5 @@
-219edd347ce3151f5b5579d300cd7179 *tests/data/fate/h264-bsf-dts2pts.mov
-243937 tests/data/fate/h264-bsf-dts2pts.mov
+451601038b9091014e45660bc98e09dc *tests/data/fate/h264-bsf-dts2pts.mov
+244033 tests/data/fate/h264-bsf-dts2pts.mov
#extradata 0: 26, 0x75e2093d
#tb 0: 1/1200000
#media_type 0: video
@@ -7,52 +7,52 @@
#dimensions 0: 352x288
#sar 0: 0/1
0, -48000, 0, 48000, 13686, 0x5ee9bd4c
-0, 0, 240000, 48000, 9320, 0x17224db1, F=0x0
-0, 48000, 288000, 48000, 8903, 0xe394918b, F=0x0
-0, 96000, 96000, 48000, 10108, 0x98418e7e, F=0x0
-0, 144000, 144000, 48000, 2937, 0x49dccb76, F=0x0
-0, 192000, 192000, 48000, 2604, 0xfc8013cd, F=0x0
-0, 240000, 480000, 48000, 7420, 0xcb4155cd, F=0x0
-0, 288000, 528000, 48000, 5664, 0x060bc948, F=0x0
-0, 336000, 336000, 48000, 4859, 0x0a5a8368, F=0x0
-0, 384000, 384000, 48000, 2883, 0xb9639a19, F=0x0
-0, 432000, 432000, 48000, 2547, 0xba95e99d, F=0x0
-0, 480000, 672000, 48000, 4659, 0x19203a0d, F=0x0
-0, 528000, 696000, 48000, 9719, 0xb500c328, F=0x0
-0, 576000, 576000, 48000, 5078, 0x5359c6b8, F=0x0
-0, 624000, 624000, 48000, 5041, 0x88dfcdf1, F=0x0
-0, 672000, 864000, 48000, 9494, 0x29297319, F=0x0
-0, 720000, 720000, 48000, 4772, 0x80273a60, F=0x0
-0, 768000, 768000, 48000, 3237, 0xd99e742c, F=0x0
-0, 816000, 816000, 48000, 2650, 0xc7cc378a, F=0x0
-0, 864000, 1152000, 48000, 6519, 0x142aa357, F=0x0
-0, 912000, 1176000, 48000, 5878, 0xe70d7e21, F=0x0
-0, 960000, 960000, 48000, 2648, 0xe58b1c4b, F=0x0
-0, 1008000, 1008000, 48000, 4522, 0x33ad0882, F=0x0
-0, 1056000, 1056000, 48000, 3246, 0xdbfa539f, F=0x0
-0, 1104000, 1104000, 48000, 3027, 0xdb5bf675, F=0x0
-0, 1152000, 1392000, 48000, 9282, 0x07973603, F=0x0
-0, 1200000, 1200000, 48000, 2786, 0x14824d92, F=0x0
-0, 1248000, 1248000, 48000, 2719, 0x00614eef, F=0x0
-0, 1296000, 1296000, 48000, 2627, 0xe8e91216, F=0x0
-0, 1344000, 1344000, 48000, 2720, 0xbe974fcc, F=0x0
-0, 1392000, 1584000, 48000, 7687, 0x0de01895, F=0x0
-0, 1440000, 1440000, 48000, 5464, 0x113f954d, F=0x0
-0, 1488000, 1488000, 48000, 3482, 0x5c90cdae, F=0x0
-0, 1536000, 1536000, 48000, 2791, 0x4acb702a, F=0x0
-0, 1584000, 1872000, 48000, 11362, 0x13363bdb, F=0x0
-0, 1632000, 1920000, 48000, 2975, 0x99b1e813, F=0x0
-0, 1680000, 1680000, 48000, 2342, 0xe9587867, F=0x0
-0, 1728000, 1728000, 48000, 2634, 0x8d9814fc, F=0x0
-0, 1776000, 1776000, 48000, 2419, 0x033cbb5f, F=0x0
-0, 1824000, 1824000, 48000, 2498, 0x7dd9e476, F=0x0
-0, 1872000, 2112000, 48000, 2668, 0x358e2bd8, F=0x0
-0, 1920000, 2136000, 48000, 9068, 0x3a639927, F=0x0
-0, 1968000, 1968000, 48000, 4939, 0xa5309a8c, F=0x0
-0, 2016000, 2016000, 48000, 2650, 0x2ab82b97, F=0x0
-0, 2064000, 2064000, 48000, 2503, 0xfd97cd4c, F=0x0
-0, 2112000, 2352000, 48000, 5121, 0xaf88e5b8, F=0x0
-0, 2160000, 2160000, 48000, 2643, 0xa1791db0, F=0x0
-0, 2208000, 2208000, 48000, 2637, 0xe1a42510, F=0x0
-0, 2256000, 2256000, 48000, 2633, 0x08430f15, F=0x0
-0, 2304000, 2304000, 48000, 2721, 0xe6756990, F=0x0
+0, 0, 144000, 24000, 9320, 0x17224db1, F=0x0
+0, 24000, 168000, 24000, 8903, 0xe394918b, F=0x0
+0, 48000, 48000, 48000, 10108, 0x98418e7e, F=0x0
+0, 96000, 96000, 24000, 2937, 0x49dccb76, F=0x0
+0, 120000, 120000, 24000, 2604, 0xfc8013cd, F=0x0
+0, 144000, 288000, 24000, 7420, 0xcb4155cd, F=0x0
+0, 168000, 312000, 24000, 5664, 0x060bc948, F=0x0
+0, 192000, 192000, 48000, 4859, 0x0a5a8368, F=0x0
+0, 240000, 240000, 24000, 2883, 0xb9639a19, F=0x0
+0, 264000, 264000, 24000, 2547, 0xba95e99d, F=0x0
+0, 288000, 432000, 24000, 4659, 0x19203a0d, F=0x0
+0, 312000, 456000, 24000, 9719, 0xb500c328, F=0x0
+0, 336000, 336000, 48000, 5078, 0x5359c6b8, F=0x0
+0, 384000, 384000, 48000, 5041, 0x88dfcdf1, F=0x0
+0, 432000, 576000, 48000, 9494, 0x29297319, F=0x0
+0, 480000, 480000, 48000, 4772, 0x80273a60, F=0x0
+0, 528000, 528000, 24000, 3237, 0xd99e742c, F=0x0
+0, 552000, 552000, 24000, 2650, 0xc7cc378a, F=0x0
+0, 576000, 720000, 24000, 6519, 0x142aa357, F=0x0
+0, 600000, 744000, 24000, 5878, 0xe70d7e21, F=0x0
+0, 624000, 624000, 24000, 2648, 0xe58b1c4b, F=0x0
+0, 648000, 648000, 24000, 4522, 0x33ad0882, F=0x0
+0, 672000, 672000, 24000, 3246, 0xdbfa539f, F=0x0
+0, 696000, 696000, 24000, 3027, 0xdb5bf675, F=0x0
+0, 720000, 864000, 48000, 9282, 0x07973603, F=0x0
+0, 768000, 768000, 24000, 2786, 0x14824d92, F=0x0
+0, 792000, 792000, 24000, 2719, 0x00614eef, F=0x0
+0, 816000, 816000, 24000, 2627, 0xe8e91216, F=0x0
+0, 840000, 840000, 24000, 2720, 0xbe974fcc, F=0x0
+0, 864000, 1008000, 48000, 7687, 0x0de01895, F=0x0
+0, 912000, 912000, 48000, 5464, 0x113f954d, F=0x0
+0, 960000, 960000, 24000, 3482, 0x5c90cdae, F=0x0
+0, 984000, 984000, 24000, 2791, 0x4acb702a, F=0x0
+0, 1008000, 1152000, 24000, 11362, 0x13363bdb, F=0x0
+0, 1032000, 1176000, 24000, 2975, 0x99b1e813, F=0x0
+0, 1056000, 1056000, 24000, 2342, 0xe9587867, F=0x0
+0, 1080000, 1080000, 24000, 2634, 0x8d9814fc, F=0x0
+0, 1104000, 1104000, 24000, 2419, 0x033cbb5f, F=0x0
+0, 1128000, 1128000, 24000, 2498, 0x7dd9e476, F=0x0
+0, 1152000, 1296000, 24000, 2668, 0x358e2bd8, F=0x0
+0, 1176000, 1320000, 24000, 9068, 0x3a639927, F=0x0
+0, 1200000, 1200000, 48000, 4939, 0xa5309a8c, F=0x0
+0, 1248000, 1248000, 24000, 2650, 0x2ab82b97, F=0x0
+0, 1272000, 1272000, 24000, 2503, 0xfd97cd4c, F=0x0
+0, 1296000, 1440000, 48000, 5121, 0xaf88e5b8, F=0x0
+0, 1344000, 1344000, 24000, 2643, 0xa1791db0, F=0x0
+0, 1368000, 1368000, 24000, 2637, 0xe1a42510, F=0x0
+0, 1392000, 1392000, 24000, 2633, 0x08430f15, F=0x0
+0, 1416000, 1416000, 24000, 2721, 0xe6756990, F=0x0
diff --git a/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
b/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
index 0303bc24e6..0a0795df41 100644
--- a/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
+++ b/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
@@ -1,7 +1,7 @@
-#tb 0: 1/25
+#tb 0: 1/50
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 1280x720
#sar 0: 0/1
-0, 0, 0, 1, 1382400, 0xccbe6bf8
-0, 1, 1, 1, 1382400, 0x49c0cfd7
+0, 0, 0, 2, 1382400, 0xccbe6bf8
+0, 2, 2, 2, 1382400, 0x49c0cfd7
diff --git a/tests/ref/lavf-fate/hevc.mp4 b/tests/ref/lavf-fate/hevc.mp4
index aea5ae8979..39dddd49cb 100644
--- a/tests/ref/lavf-fate/hevc.mp4
+++ b/tests/ref/lavf-fate/hevc.mp4
@@ -1,3 +1,3 @@
-37b3a3e84df2350380b05b2af4dc97f5 *tests/data/lavf-fate/lavf.hevc.mp4
+539b0f6daece6656609de0898a1f3d42 *tests/data/lavf-fate/lavf.hevc.mp4
151340 tests/data/lavf-fate/lavf.hevc.mp4
tests/data/lavf-fate/lavf.hevc.mp4 CRC=0xc0a771de
--
2.47.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
