From: U. Artie Eoff <ullysses.a.eoff@intel.com>
Date: Thu, 10 Aug 2017 18:23:57 +0000 (-0700)
Subject: test: fix AVCEContextTest/RateControl regression
X-Git-Tag: android-x86-7.1-r1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fandroid-x86-7.1-r4;p=android-x86%2Fhardware-intel-common-vaapi.git

test: fix AVCEContextTest/RateControl regression

Update AVCEContextTest/RateControl expectations that changed
since PR #197

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
---

diff --git a/test/i965_avce_context_test.cpp b/test/i965_avce_context_test.cpp
index 68335d4..494d51d 100644
--- a/test/i965_avce_context_test.cpp
+++ b/test/i965_avce_context_test.cpp
@@ -92,9 +92,23 @@ TEST_P(AVCEContextTest, RateControl)
         VA_RC_VBR_CONSTRAINED, VA_RC_MB,
     };
 
+    struct i965_driver_data *i965(*this);
+    ASSERT_PTR(i965);
+    const unsigned supportedBRC = (entrypoint == VAEntrypointEncSlice) ?
+        i965->codec_info->h264_brc_mode : i965->codec_info->lp_h264_brc_mode;
+
     for (auto rc : rateControls) {
         ConfigAttribs attribs(1, {type:VAConfigAttribRateControl, value:rc});
-        config = createConfig(profile, entrypoint, attribs);
+
+        const VAStatus expect =
+            ((rc & supportedBRC) ||
+                profile == VAProfileH264MultiviewHigh ||
+                profile == VAProfileH264StereoHigh) ?
+            VA_STATUS_SUCCESS : VA_STATUS_ERROR_INVALID_CONFIG;
+
+        config = createConfig(profile, entrypoint, attribs, expect);
+        if (expect != VA_STATUS_SUCCESS) continue;
+
         context = createContext(config, 1, 1);
         if (HasFailure()) continue;