Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:32:38 +0000 (21:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 20:33:41 +0000 (21:33 +0100)
* qatar/master:
  fate: add BRender PIX tests

Conflicts:
tests/fate/image.mak

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

@@@ -5,38 -5,38 +5,58 @@@ FATE_ALIASPIX += fate-aliaspix-gra
  fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray
  
  FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX)
 -FATE_SAMPLES_AVCONV += $(FATE_ALIASPIX-yes)
 +FATE_IMAGE += $(FATE_ALIASPIX-yes)
  fate-aliaspix: $(FATE_ALIASPIX-yes)
 -FATE_SAMPLES_AVCONV += $(FATE_BRENDERPIX-yes)
+ FATE_BRENDERPIX += fate-brenderpix-24
+ fate-brenderpix-24: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/sbwheel.pix
+ FATE_BRENDERPIX += fate-brenderpix-565
+ fate-brenderpix-565: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/maximafront.pix
+ FATE_BRENDERPIX += fate-brenderpix-defpal
+ fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix
+ FATE_BRENDERPIX += fate-brenderpix-intpal
+ fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix
+ FATE_BRENDERPIX += fate-brenderpix-y400a
+ 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-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
++FATE_IMAGE += $(FATE_BRENDERPIX-yes)
+ fate-brenderpix: $(FATE_BRENDERPIX-yes)
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
  fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
 +FATE_EXR += fate-exr-slice-raw
 +fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-rle
 +fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-zip1
 +fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-zip16
 +fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-pxr24
 +fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt rgb48le
 +
 +FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
 +
 +FATE_IMAGE += $(FATE_EXR-yes)
 +fate-exr: $(FATE_EXR-yes)
 +
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
  fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 -fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba
 +FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 +fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
  fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
  
  FATE_SUNRASTER += fate-sunraster-1bit-raw