Merge commit 'a381e0cec87bcb28ebc05fe840bb937a495de736'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:31:08 +0000 (03:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:33:42 +0000 (03:33 +0100)
* commit 'a381e0cec87bcb28ebc05fe840bb937a495de736':
  fate: add a DPX parser test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/image.mak
tests/ref/fate/dpxparser

index 89b91aa189a8d9b6682136586d440d8873d69b00,3864896fc7fe0d53b6bcdaf554124531ebff6276..fb617cd7a30d46d85887a2669a2f6493bc7fcbc4
@@@ -24,15 -24,18 +24,18 @@@ FATE_BRENDERPIX += fate-brenderpix-y400
  fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix
  
  FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX)
 -FATE_SAMPLES_AVCONV += $(FATE_BRENDERPIX-yes)
 +FATE_IMAGE += $(FATE_BRENDERPIX-yes)
  fate-brenderpix: $(FATE_BRENDERPIX-yes)
  
 -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
 -fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/libav_4x_concat.bmp -pix_fmt rgb24
 +FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
 +fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
  fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
  
 -fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/libav_4x_concat.dpx
+ FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser
++fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx
  FATE_EXR += fate-exr-slice-raw
  fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le
  
index 0000000000000000000000000000000000000000,025c87d30d9eaa1f5d5bbc36fa4ea4e5ad94b42c..0ecc36cab2da9c773fa455428c6570e4ee7b2e6e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,5 +1,5 @@@
 -0,          0,          0,        1,   203280, 0xa7d03ff5
 -0,          1,          1,        1,   203280, 0xb908d8d4
 -0,          2,          2,        1,   203280, 0xf7900408
 -0,          3,          3,        1,   203280, 0xb74ed6a8
+ #tb 0: 1/25
++0,          0,          0,        1,    50700, 0xe7153545
++0,          1,          1,        1,    50700, 0x2bc92ece
++0,          2,          2,        1,    50700, 0x83c731bb
++0,          3,          3,        1,    50700, 0x92f52f19