Commit d56245f7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'rbultje/vp9-profile1-wip'

* rbultje/vp9-profile1-wip:
  vp9: add fate test for 422.
  vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
  vp9: add yuv440 fate test.
  vp9: fix mask_edges and filter_plane_rows/cols() for 440.
  vp9: more specifically specify mask destination to mask_edges().
  vp9: add fate test for profile 1 444.
  vp9: don't create special u/v filter masks for 444.
  vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
  vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
  vp9: invert order of two conditions.
  vp9: use correct chroma subsampling for profile 1 inter block recon.
  vp9: use correct chroma subsampling for profile 1 intra block recon.
  vp9: take chroma subsampling into account when walking the block tree.
  vp9: support non-420 chroma subsampling for profile 1 token decoding.
  vp9: increase buffer sizes for non-420 chroma subsamplings.
  vp9: profile 1 header decoding.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c8de8f7e b005d097
This diff is collapsed.
This diff is collapsed.
......@@ -85,6 +85,12 @@ fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9
fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1)
endef
define FATE_VP9_PROFILE_SUITE
FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1)
fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm
fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1)
endef
VP9_Q = 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 \
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \
......@@ -94,24 +100,27 @@ VP9_SIZE_A = 08 10 16 18 32 34 64 66
VP9_SIZE_B = 196 198 200 202 208 210 224 226
define FATE_VP9_FULL
$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q),$(1),$(2))))
$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP),$(1),$(2))))
$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H),$(1),$(2))))))
$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2))))))
$(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,06-bilinear,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,09-lf_deltas,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame2,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,15-segkey_adpq,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,16-intra-only,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,trac3849,$(1),$(2)))
$(eval $(call FATE_VP9_SUITE,trac4359,$(1),$(2)))
$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q))))
$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP))))
$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H))))))
$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H))))))
$(eval $(call FATE_VP9_SUITE,03-deltaq))
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv444,1))
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv440,1))
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv422,1))
$(eval $(call FATE_VP9_SUITE,06-bilinear))
$(eval $(call FATE_VP9_SUITE,09-lf_deltas))
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame))
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame2))
$(eval $(call FATE_VP9_SUITE,15-segkey_adpq))
$(eval $(call FATE_VP9_SUITE,16-intra-only))
$(eval $(call FATE_VP9_SUITE,2pass-akiyo))
$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo))
$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo))
$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo))
$(eval $(call FATE_VP9_SUITE,tiling-pedestrian))
$(eval $(call FATE_VP9_SUITE,trac3849))
$(eval $(call FATE_VP9_SUITE,trac4359))
endef
$(eval $(call FATE_VP9_FULL))
......
#format: frame checksums
#version: 1
#hash: MD5
#tb 0: 1/50
#stream#, dts, pts, duration, size, hash
0, 0, 0, 1, 28800, b81b8a8444ac6ce4a4807c37e0a44c8b
0, 1, 1, 1, 28800, 344458b82d35ea9944dc841643fc25c2
0, 2, 2, 1, 28800, 376a4bb3944f052191963740b980eb26
0, 3, 3, 1, 28800, 2fecb02c842bd7d588415904f2d3a82d
0, 4, 4, 1, 28800, 0fda2f1dabba5c179599190f179b9782
0, 5, 5, 1, 28800, a88ac885ee59e3a3a01fa483cdd40274
0, 6, 6, 1, 28800, e76b488ffa70a05457fc046e7b999c56
0, 7, 7, 1, 28800, 74ae5e52162f5bbc95258d44a2dd647c
0, 8, 8, 1, 28800, 0c017e2b12e5192c8d598941d9c93306
0, 9, 9, 1, 28800, ca3941ee43b7033cb48f8498af127d53
#format: frame checksums
#version: 1
#hash: MD5
#tb 0: 1/50
#stream#, dts, pts, duration, size, hash
0, 0, 0, 1, 28800, 61157ad4fb02a254de8f34ae7b8915dc
0, 1, 1, 1, 28800, 9431337382bf90d40aa417e297ac05da
0, 2, 2, 1, 28800, 56b739049cc9e97a1d82018bba3db0ee
0, 3, 3, 1, 28800, 75138a9b6bb905b2f79a1ebb959ddfea
0, 4, 4, 1, 28800, 141b2fc9625fad86577838d84a276ef8
0, 5, 5, 1, 28800, b364668c44a237d4e532e086a55401a9
0, 6, 6, 1, 28800, a4ca6014d5194e4c921a4cb4289eb315
0, 7, 7, 1, 28800, cfcacb3d5086d3861f4712a3c87a6b6c
0, 8, 8, 1, 28800, 228d3fd3d849d021f3690cc538edb0a3
0, 9, 9, 1, 28800, 97ecf281eb1130723d70e3c8803fa814
#format: frame checksums
#version: 1
#hash: MD5
#tb 0: 1/25
#stream#, dts, pts, duration, size, hash
0, 0, 0, 1, 304128, 859df7b3661783e337a16ee79f3c20bc
0, 1, 1, 1, 304128, 3b3ccf344cd5a478c4c1fa422497183d
0, 2, 2, 1, 304128, 3be1f565823cb88013a14a93a3cf9480
0, 3, 3, 1, 304128, 6e188a963deaf46c2d6e741b03c4240c
0, 4, 4, 1, 304128, 82ead184ae478ac821b1b4b72f28c9cd
0, 5, 5, 1, 304128, 59bb43badc76b39a228b1ad96b6339ca
0, 6, 6, 1, 304128, 2eaee790fc188e2251b92dd4ea90c42a
0, 7, 7, 1, 304128, 2a95f8727589e710dc1b95400916b72e
0, 8, 8, 1, 304128, b7032f73544a7108fcdcaca2832ecc32
0, 9, 9, 1, 304128, b7778c35b30bcc400b25ed0e5b7913e1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment