From f5e479ff422fcadd685de29b44f5f2c282cd7353 Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Thu, 10 Aug 2017 11:23:57 -0700 Subject: [PATCH] test: fix AVCEContextTest/RateControl regression Update AVCEContextTest/RateControl expectations that changed since PR #197 Signed-off-by: U. Artie Eoff --- test/i965_avce_context_test.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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; -- 2.11.0