Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lavf/rawdec: set avg_frame_rate

Browse Source 
Timestamps in two FATE H.264 conformance tests now start at 1 instead
of 0, which also happens in some other H.264 tests before this commit
and so is not a big issue.
Conversely, timestamps in some HEVC conformance tests start from a
smaller value now.
Ideally this should be addressed later in a more general way.

h264-conformance-frext-frext2_panasonic_b no longer requires -vsync
passthrough.
pull/389/head
Anton Khirnov 2 years ago
parent d56652fdc8
commit ba4b73c977
8 changed files with 34 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      libavformat/rawdec.c
  2. 2
      tests/fate/h264.mak
  3. 30
      tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
  4. 20
      tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
  5. 4
      tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
  6. 4
      tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
  7. 4
      tests/ref/fate/hevc-conformance-SDH_A_Orange_3
  8. 2
      tests/ref/fate/hevc-small422chroma

1
libavformat/rawdec.c
Unescape View File

@ -86,6 +86,7 @@ int ff_raw_video_read_header(AVFormatContext *s)
st->codecpar->codec_id = s->iformat->raw_codec_id;
sti->need_parsing = AVSTREAM_PARSE_FULL_RAW;
st->avg_frame_rate = s1->framerate;
sti->avctx->framerate = s1->framerate;
avpriv_set_pts_info(st, 64, 1, 1200000);

2
tests/fate/h264.mak
Unescape View File

@ -346,7 +346,7 @@ fate-h264-conformance-frext-freh7_b: CMD = framecrc -i $(TARGET_SAM
fate-h264-conformance-frext-frext01_jvc_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
fate-h264-conformance-frext-frext02_jvc_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
fate-h264-conformance-frext-frext1_panasonic_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync passthrough
fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc
fate-h264-conformance-frext-frext3_panasonic_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
fate-h264-conformance-frext-frext4_panasonic_a: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264

30
tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
Unescape View File

@ -3,18 +3,18 @@
#codec_id 0: rawvideo
#dimensions 0: 352x288
#sar 0: 0/1
0, 0, 0, 1, 152064, 0x0147a2a9
0, 1, 1, 1, 152064, 0xe2365351
0, 2, 2, 1, 152064, 0xb5f9daee
0, 3, 3, 1, 152064, 0xd60818b2
0, 4, 4, 1, 152064, 0x21b528e5
0, 5, 5, 1, 152064, 0x9c9dda18
0, 6, 6, 1, 152064, 0x387fe7de
0, 7, 7, 1, 152064, 0x8f0c5a1e
0, 8, 8, 1, 152064, 0x02409694
0, 9, 9, 1, 152064, 0x2b36a7a7
0, 10, 10, 1, 152064, 0x3c6d3863
0, 11, 11, 1, 152064, 0xaa7835e1
0, 12, 12, 1, 152064, 0x6d105fe7
0, 13, 13, 1, 152064, 0x9a348732
0, 14, 14, 1, 152064, 0x96a3af13
0, 1, 1, 1, 152064, 0x0147a2a9
0, 2, 2, 1, 152064, 0xe2365351
0, 3, 3, 1, 152064, 0xb5f9daee
0, 4, 4, 1, 152064, 0xd60818b2
0, 5, 5, 1, 152064, 0x21b528e5
0, 6, 6, 1, 152064, 0x9c9dda18
0, 7, 7, 1, 152064, 0x387fe7de
0, 8, 8, 1, 152064, 0x8f0c5a1e
0, 9, 9, 1, 152064, 0x02409694
0, 10, 10, 1, 152064, 0x2b36a7a7
0, 11, 11, 1, 152064, 0x3c6d3863
0, 12, 12, 1, 152064, 0xaa7835e1
0, 13, 13, 1, 152064, 0x6d105fe7
0, 14, 14, 1, 152064, 0x9a348732
0, 15, 15, 1, 152064, 0x96a3af13

20
tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
Unescape View File

@ -3,13 +3,13 @@
#codec_id 0: rawvideo
#dimensions 0: 352x288
#sar 0: 0/1
0, 0, 0, 1, 152064, 0xd604d440
0, 1, 1, 1, 152064, 0x08ef262c
0, 2, 2, 1, 152064, 0x992fca8e
0, 3, 3, 1, 152064, 0x5a02ee15
0, 4, 4, 1, 152064, 0xf15d5c66
0, 5, 5, 1, 152064, 0x360dda12
0, 6, 6, 1, 152064, 0x18b54985
0, 7, 7, 1, 152064, 0xf12b6cde
0, 8, 8, 1, 152064, 0x3b2e63f7
0, 9, 9, 1, 152064, 0x140abcfd
0, 1, 1, 1, 152064, 0xd604d440
0, 2, 2, 1, 152064, 0x08ef262c
0, 3, 3, 1, 152064, 0x992fca8e
0, 4, 4, 1, 152064, 0x5a02ee15
0, 5, 5, 1, 152064, 0xf15d5c66
0, 6, 6, 1, 152064, 0x360dda12
0, 7, 7, 1, 152064, 0x18b54985
0, 8, 8, 1, 152064, 0xf12b6cde
0, 9, 9, 1, 152064, 0x3b2e63f7
0, 10, 10, 1, 152064, 0x140abcfd

4
tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
Unescape View File

@ -3,5 +3,5 @@
#codec_id 0: rawvideo
#dimensions 0: 416x240
#sar 0: 0/1
0, 2, 2, 1, 149760, 0x6e1f16d0
0, 3, 3, 1, 149760, 0x5be5bde9
0, 0, 0, 1, 149760, 0x6e1f16d0
0, 1, 1, 1, 149760, 0x5be5bde9

4
tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
Unescape View File

@ -3,5 +3,5 @@
#codec_id 0: rawvideo
#dimensions 0: 416x240
#sar 0: 0/1
0, 2, 2, 1, 149760, 0xcd1019b2
0, 3, 3, 1, 149760, 0xeb39efeb
0, 0, 0, 1, 149760, 0xcd1019b2
0, 1, 1, 1, 149760, 0xeb39efeb

4
tests/ref/fate/hevc-conformance-SDH_A_Orange_3
Unescape View File

@ -3,5 +3,5 @@
#codec_id 0: rawvideo
#dimensions 0: 1920x1080
#sar 0: 0/1
0, 2, 2, 1, 3110400, 0x0117aa5d
0, 3, 3, 1, 3110400, 0xa737bc56
0, 0, 0, 1, 3110400, 0x0117aa5d
0, 1, 1, 1, 3110400, 0xa737bc56

2
tests/ref/fate/hevc-small422chroma
Unescape View File

@ -3,4 +3,4 @@
#codec_id 0: rawvideo
#dimensions 0: 3840x2160
#sar 0: 1/1
0, 11, 11, 1, 33177600, 0x53015e18
0, 7, 7, 1, 33177600, 0x53015e18

Write Preview
Loading…
Cancel
Save