From dff1c19140e70cd7bf868394b6f573221185928f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 6 Feb 2014 23:52:18 +0100 Subject: vp9: add a new segmentation sample. The old one didn't use segmentation. One uses segmentation in all frame types (--aq-mode=1), and the other uses all segmentation features, but only in inter frames (mbgraph). Signed-off-by: Anton Khirnov --- tests/fate/vpx.mak | 3 +- tests/ref/fate/vp9-segmentation-akiyo | 51 -------------------------------- tests/ref/fate/vp9-segmentation-aq-akiyo | 26 ++++++++++++++++ tests/ref/fate/vp9-segmentation-sf-akiyo | 26 ++++++++++++++++ 4 files changed, 54 insertions(+), 52 deletions(-) delete mode 100644 tests/ref/fate/vp9-segmentation-akiyo create mode 100644 tests/ref/fate/vp9-segmentation-aq-akiyo create mode 100644 tests/ref/fate/vp9-segmentation-sf-akiyo (limited to 'tests') diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 5bb0243a6d..f9e99ee22c 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -74,7 +74,8 @@ $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP $(eval $(call FATE_VP9_SUITE,03-deltaq,$(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-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))) endef diff --git a/tests/ref/fate/vp9-segmentation-akiyo b/tests/ref/fate/vp9-segmentation-akiyo deleted file mode 100644 index 63c0caed7a..0000000000 --- a/tests/ref/fate/vp9-segmentation-akiyo +++ /dev/null @@ -1,51 +0,0 @@ -#tb 0: 1/1000 -0, 0, 0, 0, 152064, 20cf714300c5e28ffb77bf9c682129bc -0, 33, 33, 0, 152064, 2f271e4de29f87d6b90511fbafdf9fbb -0, 66, 66, 0, 152064, 2f271e4de29f87d6b90511fbafdf9fbb -0, 100, 100, 0, 152064, a88532a043f5f2c6bce729a8e20ee5af -0, 133, 133, 0, 152064, 8d7b5482ed8072a7c95d722783773436 -0, 166, 166, 0, 152064, 04872d8619b163b5e0c20123ccddf7dc -0, 200, 200, 0, 152064, ed6d9677782aa6e87b6576541391557f -0, 233, 233, 0, 152064, 689f71108e9bf024cd9ccf48800dcdc7 -0, 266, 266, 0, 152064, f7c555792884499bb62a8e739b201739 -0, 300, 300, 0, 152064, 7fed82c38ce428a178c56f6131eff5ec -0, 333, 333, 0, 152064, fb638e587ade05baa027bb63edc7ec7c -0, 367, 367, 0, 152064, 319295f5aa44661a80570e844050156a -0, 400, 400, 0, 152064, de2d8635966a1cd57290eac449a5fb4b -0, 433, 433, 0, 152064, 9ac3d711a00aac6b17004bb6451e4cab -0, 467, 467, 0, 152064, d12eced084e72b5230493e2dc2de0f0a -0, 500, 500, 0, 152064, 197761d11407fed723a63b8e28cb8e19 -0, 533, 533, 0, 152064, 28d8e807bc142b74f1eaf30dbbf1b7bd -0, 567, 567, 0, 152064, abe88f1f7490d13ba3def9511beaceec -0, 600, 600, 0, 152064, 7d297b9c989ebc0408fd41b14900242a -0, 633, 633, 0, 152064, d5e7adfa2b207d860feff5c894585fd1 -0, 667, 667, 0, 152064, aea3e9de9de237f8379785f3467dc9c9 -0, 700, 700, 0, 152064, 211967cd949c1d83a8cc4c8267aa6034 -0, 734, 734, 0, 152064, 3f49bf8e0434114c15b867be2d53d283 -0, 767, 767, 0, 152064, 8d5e629c0e941ca6f049ed2bb59d09a8 -0, 800, 800, 0, 152064, d359620957877534bc94cd137dc652fe -0, 834, 834, 0, 152064, 83610fc1969fdfa267e7e462a83ea40c -0, 867, 867, 0, 152064, b2d20dcc3f77a238ce7210991eebe1a7 -0, 900, 900, 0, 152064, a42ad37808f30e1d968882bf42e9c641 -0, 934, 934, 0, 152064, 55084cded938266a2c3c658dcc162781 -0, 967, 967, 0, 152064, e392a3a7d33e10e95fc9cdf0a2080eac -0, 1001, 1001, 0, 152064, 73977c4827463c17e63c0769bb90722f -0, 1034, 1034, 0, 152064, cb5dd87344af7d6fd4ed0e06cb90d9c2 -0, 1067, 1067, 0, 152064, 533338860124e392cef2039468c22f75 -0, 1101, 1101, 0, 152064, da30f077490042367502a6fe11a46e0f -0, 1134, 1134, 0, 152064, 860ab1bfbd3fe6a27bee5ef8c4e0b600 -0, 1167, 1167, 0, 152064, 339ec3863eaed689d46289ffe47bc45d -0, 1201, 1201, 0, 152064, ffa6c990577093106796ed0dee56c483 -0, 1234, 1234, 0, 152064, 3fcdc2bc064c79f35ea81a715ff089d0 -0, 1267, 1267, 0, 152064, adaef9ec97e23a542db22bcd23c740bd -0, 1301, 1301, 0, 152064, ddcff4bd2c9579181182eb49add0ce3c -0, 1334, 1334, 0, 152064, b3b039c84cffb9272c8ddf9086748696 -0, 1368, 1368, 0, 152064, 70939a961ec1e4697031b79e7ebb7919 -0, 1401, 1401, 0, 152064, 6b3ff2e003749c6ffeb2d71edecf884c -0, 1434, 1434, 0, 152064, 5e4efc96971f81218c472482b5a79374 -0, 1468, 1468, 0, 152064, 279132c87d81a5747824b06423bf6785 -0, 1501, 1501, 0, 152064, 1da48caa08007523aab41a56e21dd99b -0, 1534, 1534, 0, 152064, 36ecffb2bfcb587d2556fddcbbd3448b -0, 1568, 1568, 0, 152064, 7823e3c86cd5a05c2959c7ef4d1cfa89 -0, 1601, 1601, 0, 152064, b53f78afbad1a43f7aea58814eacd824 -0, 1634, 1634, 0, 152064, b9b127b4bc54123bec19b2f4a3fa157c diff --git a/tests/ref/fate/vp9-segmentation-aq-akiyo b/tests/ref/fate/vp9-segmentation-aq-akiyo new file mode 100644 index 0000000000..2be837a9ed --- /dev/null +++ b/tests/ref/fate/vp9-segmentation-aq-akiyo @@ -0,0 +1,26 @@ +#tb 0: 1/1000 +0, 0, 0, 0, 152064, b208eac12f0ae74a812bc9e314bdfac7 +0, 33, 33, 0, 152064, ebb2259451c3acf3ad6379d1f4092efb +0, 66, 66, 0, 152064, 33de46060afd14aa359b7bd0d9ff1be8 +0, 100, 100, 0, 152064, 33de46060afd14aa359b7bd0d9ff1be8 +0, 133, 133, 0, 152064, 5d087d8df10fd406d59172710ea0341a +0, 166, 166, 0, 152064, 3570ed7fb90ac9b5335b97adf0539e94 +0, 200, 200, 0, 152064, 68a8c56b889a3befc75c9ec4293c7fda +0, 233, 233, 0, 152064, f871f7c0456f644cfb0ec896132a097f +0, 266, 266, 0, 152064, 14e939bfeb2b878e0782a7ce68ecd214 +0, 300, 300, 0, 152064, bd3e97881ebece0f876d46d067c6a7ff +0, 333, 333, 0, 152064, a20529c091ef3e68a901c574371224b3 +0, 367, 367, 0, 152064, 5253f16c8b0329d33d38d275124487fb +0, 400, 400, 0, 152064, c9c2f7d8835e620709a53ff8adfe72bf +0, 433, 433, 0, 152064, dc8f1df0d7ab8e4f9daf2ccfd96de855 +0, 467, 467, 0, 152064, d09d43208d4de7f81d54f48cff310b6f +0, 500, 500, 0, 152064, 0dcf7212075c1f15219690ad6ffe2940 +0, 533, 533, 0, 152064, 3b52e3eb4f972318c6912dd29a95dcf3 +0, 567, 567, 0, 152064, aa1414343067749fbd743ace93553492 +0, 600, 600, 0, 152064, 6951cb7a78e0a03f9a3f6264084de6dc +0, 633, 633, 0, 152064, 5324f2f03c4d5fe35446561af654e9ec +0, 667, 667, 0, 152064, dff11b046a02ca34c6b1aecc857632ec +0, 700, 700, 0, 152064, 971182c013c1524d4864fd946b8c1550 +0, 734, 734, 0, 152064, 3306f1dcd5760ba92dd9cec8bfc21b08 +0, 767, 767, 0, 152064, f1f7b13c33332fece576b4d175f91832 +0, 800, 800, 0, 152064, 9e66573fbfe847149eb32e8a9c242c18 diff --git a/tests/ref/fate/vp9-segmentation-sf-akiyo b/tests/ref/fate/vp9-segmentation-sf-akiyo new file mode 100644 index 0000000000..bfef222a42 --- /dev/null +++ b/tests/ref/fate/vp9-segmentation-sf-akiyo @@ -0,0 +1,26 @@ +#tb 0: 1/1000 +0, 0, 0, 0, 152064, f4e04a0f92fab3a52d858bb222807ac0 +0, 33, 33, 0, 152064, 493cb96b8202a1518c6c9bdb848540e4 +0, 66, 66, 0, 152064, 60b5b63f832cff119a43de82102758f4 +0, 100, 100, 0, 152064, 0d9bd42e279d480603f9c670f0a8ffe3 +0, 133, 133, 0, 152064, 25ca563f233688f32f40fec985a116a2 +0, 166, 166, 0, 152064, dd14b43d538708a91de41606703dbe1c +0, 200, 200, 0, 152064, 01bb23cb43960ff185a97ea79936d3b4 +0, 233, 233, 0, 152064, 85045c4310ee80cd12979bdea4f3f86e +0, 266, 266, 0, 152064, c8e015ea13359a05483de349313a6686 +0, 300, 300, 0, 152064, 8dbb0406bf6fe19c30a9c9253fcdfe7f +0, 333, 333, 0, 152064, 84881463643069036d03e8120a5f15e9 +0, 367, 367, 0, 152064, 9abcd3f2f86ff31f8d357389b330df59 +0, 400, 400, 0, 152064, 19ada6395c4e656578d2ceeaba291bb2 +0, 433, 433, 0, 152064, fc29773a6f32eed2bfa44143f8f505b1 +0, 467, 467, 0, 152064, 5e56bd91f5e3d1457c124b5702bdc3b6 +0, 500, 500, 0, 152064, 5b920d73e301adb6c45699a209f09a33 +0, 533, 533, 0, 152064, 4d06ec294270638c6abdd1c2303b34fc +0, 567, 567, 0, 152064, dc99797067851f74708d7e6ff54367d8 +0, 600, 600, 0, 152064, 5df68b49124219592b043916affb1311 +0, 633, 633, 0, 152064, cfb52d101fad76acb1bb0d48c513bffd +0, 667, 667, 0, 152064, 206dbd55680b8a83d8bafe33c54c3e36 +0, 700, 700, 0, 152064, 171f2e26771db631788065eecf6c44d9 +0, 734, 734, 0, 152064, b10809dcf9ecfdb4f86a6f3236ac273e +0, 767, 767, 0, 152064, b354107bdea9bd011b09d9f4a32d4e89 +0, 800, 800, 0, 152064, 0c18be13dc6fbf79a613f2b24bb301c1 -- cgit v1.2.3