Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 10:32:51 +0000 (11:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 11:03:23 +0000 (12:03 +0100)
* qatar/master:
  fate: add a bmpparser test

Conflicts:
tests/fate/image.mak

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

@@@ -24,39 -24,22 +24,42 @@@ 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_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
index 0000000,e7022b1..3cdd986
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,5 +1,5 @@@
 -0,          0,          0,        1,   203280, 0x47c3e3a0
 -0,          1,          1,        1,   203280, 0x6494c4db
 -0,          2,          2,        1,   203280, 0x042fe3a0
 -0,          3,          3,        1,   203280, 0xba9be3a0
+ #tb 0: 1/25
++0,          0,          0,        1,     3600, 0xd3a7c583
++0,          1,          1,        1,     3600, 0x4602bbf9
++0,          2,          2,        1,     3600, 0x3a96b8f8
++0,          3,          3,        1,     3600, 0xb343b17f