From 062b9f2cdb895e64a7085b30539aea94da901011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Raulet?= <mraulet@insa-rennes.fr>
Date: Tue, 22 Jul 2014 12:09:34 +0200
Subject: [PATCH] fate/hevc: update with new Rext bitstreams

cherry picked from commit d0924959f16d42630cfd7b3b4fce9fead60a4aa8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 tests/fate/hevc.mak                           | 13 ++++++++++--
 ...c-conformance-PERSIST_RPARAM_A_RExt_Sony_1 |  3 +++
 .../hevc-conformance-QMATRIX_A_RExt_Sony_1    | 21 +++++++++++++++++++
 .../hevc-conformance-SAO_A_RExt_MediaTek_1    |  9 ++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
 create mode 100644 tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
 create mode 100644 tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 5e1000d267..546a88e9cd 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -151,8 +151,13 @@ HEVC_SAMPLES_422_10BIN =        \
     Main_422_10_A_RExt_Sony_1   \
     Main_422_10_B_RExt_Sony_1   \
 
+HEVC_SAMPLES_444_8BIT =         \
+    QMATRIX_A_RExt_Sony_1       \
+
 HEVC_SAMPLES_444_12BIT =        \
     IPCM_B_RExt_NEC             \
+    PERSIST_RPARAM_A_RExt_Sony_1\
+    SAO_A_RExt_MediaTek_1       \
 
 
 # equivalent bitstreams
@@ -166,8 +171,6 @@ HEVC_SAMPLES_444_12BIT =        \
 # do not pass:
 # TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault mix 9-10bits)
 # PERSIST_RPARAM_A_RExt_Sony_1 (rext)
-# QMATRIX_A_RExt_Sony_1 (rext)
-# SAO_A_RExt_MediaTek_1 (rext)
 
 
 define FATE_HEVC_TEST
@@ -190,6 +193,11 @@ FATE_HEVC += fate-hevc-conformance-$(1)
 fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le
 endef
 
+define FATE_HEVC_TEST_444_8BIT
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+endef
+
 define FATE_HEVC_TEST_444_12BIT
 FATE_HEVC += fate-hevc-conformance-$(1)
 fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le
@@ -199,6 +207,7 @@ $(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
 $(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
 $(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N))))
 $(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N))))
+$(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N))))
 $(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N))))
 
 FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
diff --git a/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
new file mode 100644
index 0000000000..4e49caac6d
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
@@ -0,0 +1,3 @@
+#tb 0: 1/25
+0,          0,          0,        1,   921600, 0x702f0d67
+0,          1,          1,        1,   921600, 0x99822b52
diff --git a/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
new file mode 100644
index 0000000000..63baa95e77
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
@@ -0,0 +1,21 @@
+#tb 0: 1/25
+0,          0,          0,        1,  2764800, 0xde442361
+0,          1,          1,        1,  2764800, 0x8d482fdf
+0,          2,          2,        1,  2764800, 0x9b431e37
+0,          3,          3,        1,  2764800, 0x8b7d893d
+0,          4,          4,        1,  2764800, 0xa471ac17
+0,          5,          5,        1,  2764800, 0xe990790f
+0,          6,          6,        1,  2764800, 0x8f3f8285
+0,          7,          7,        1,  2764800, 0xeaf9f242
+0,          8,          8,        1,  2764800, 0xfd37f69d
+0,          9,          9,        1,  2764800, 0x31d29f19
+0,         10,         10,        1,  2764800, 0x92f56414
+0,         11,         11,        1,  2764800, 0xb909e334
+0,         12,         12,        1,  2764800, 0x9f2fad13
+0,         13,         13,        1,  2764800, 0xbf9090b2
+0,         14,         14,        1,  2764800, 0xa39c7b78
+0,         15,         15,        1,  2764800, 0x83e77296
+0,         16,         16,        1,  2764800, 0x737a5a9d
+0,         17,         17,        1,  2764800, 0x356c51d6
+0,         18,         18,        1,  2764800, 0xd498468c
+0,         19,         19,        1,  2764800, 0xd25a396d
diff --git a/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1 b/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
new file mode 100644
index 0000000000..b6ed2112ae
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
@@ -0,0 +1,9 @@
+#tb 0: 1/25
+0,          0,          0,        1, 24576000, 0x5b01ceed
+0,          1,          1,        1, 24576000, 0x043fa798
+0,          2,          2,        1, 24576000, 0x9ec62721
+0,          3,          3,        1, 24576000, 0x5533793b
+0,          4,          4,        1, 24576000, 0x125f859e
+0,          5,          5,        1, 24576000, 0xe3b916b4
+0,          6,          6,        1, 24576000, 0x1fc1a62c
+0,          7,          7,        1, 24576000, 0xe3507948