Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'

Browse Source 
* commit '8e4d4efc67e154fdffd65964a7cfeef740320827':
  fate: Add another SVQ3 test to increase coverage

Also included a fix from da8093f712.

The demuxer option "-ignore_editlist 1 " is temporarily added to the
test as well, to workaround a regression in the edit list mov parsing
code.

Merged-by: James Almer <jamrial@gmail.com>
pull/273/head
James Almer 7 years ago
parent 9f5d238a66 8e4d4efc67
commit b591329c3a
3 changed files with 34 additions and 2 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. 12
      tests/fate/qt.mak
  2. 0
      tests/ref/fate/svq3-1
  3. 24
      tests/ref/fate/svq3-2

12
tests/fate/qt.mak
Unescape View File

@ -49,10 +49,18 @@ fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t
FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4
FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3 fate-svq3-watermark
fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
FATE_SVQ3 += fate-svq3-1
fate-svq3-1: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
FATE_SVQ3 += fate-svq3-2
fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
FATE_SVQ3 += fate-svq3-watermark
fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov
FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
fate-svq3: $(FATE_SVQ3)
FATE_QT += $(FATE_QT-yes)
FATE_SAMPLES_FFMPEG += $(FATE_QT)

0
tests/ref/fate/svq3 → tests/ref/fate/svq3-1
Unescape View File

24
tests/ref/fate/svq3-2
Unescape View File

@ -0,0 +1,24 @@
#tb 0: 1/24
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 480x257
#sar 0: 0/1
0, 1, 1, 1, 185280, 0x044209c4
0, 2, 2, 1, 185280, 0x427ef9a7
0, 3, 3, 1, 185280, 0x8f771cc8
0, 4, 4, 1, 185280, 0xb40d0e52
0, 5, 5, 1, 185280, 0x2e6ee461
0, 6, 6, 1, 185280, 0x681ba513
0, 7, 7, 1, 185280, 0x998c5676
0, 8, 8, 1, 185280, 0xf91003ec
0, 9, 9, 1, 185280, 0x322ed3de
0, 10, 10, 1, 185280, 0xb1c9370a
0, 11, 11, 1, 185280, 0x41423b36
0, 12, 12, 1, 185280, 0x0b9284e4
0, 13, 13, 1, 185280, 0x185789b2
0, 14, 14, 1, 185280, 0x8f0bece0
0, 15, 15, 1, 185280, 0xfcd9450e
0, 16, 16, 1, 185280, 0x509d868b
0, 17, 17, 1, 185280, 0x71fd9ae3
0, 18, 18, 1, 185280, 0x3dad1b3c
0, 19, 19, 1, 185280, 0x69ba37dd
Write Preview
Loading…
Cancel
Save