diff options
author | TreeHugger Robot | 2018-05-30 18:57:58 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2018-05-30 18:57:58 -0500 |
commit | 739c3177ea3228a26ae7a8293158f417d6105dff (patch) | |
tree | 6206873e0b36cff58687b393e994a20a3ce04e7e | |
parent | a7b7111f30be226b89810b7f27b9c3b68ff74c84 (diff) | |
parent | 8f5a17d1e8b1bb646b99083b91359a0f23e67015 (diff) | |
download | platform-hardware-interfaces-739c3177ea3228a26ae7a8293158f417d6105dff.tar.gz platform-hardware-interfaces-739c3177ea3228a26ae7a8293158f417d6105dff.tar.xz platform-hardware-interfaces-739c3177ea3228a26ae7a8293158f417d6105dff.zip |
Merge "graphics: COLORIMETRIC is optional for HDR modes" into pi-dev
4 files changed, 27 insertions, 6 deletions
diff --git a/current.txt b/current.txt index f45af273..413efae2 100644 --- a/current.txt +++ b/current.txt | |||
@@ -342,7 +342,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar | |||
342 | 0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types | 342 | 0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types |
343 | 7d2cef99c838fb58038de8bbfd3cdb76ff4797241987077721715297f8d45e34 android.hardware.graphics.common@1.1::types # b/78135149 | 343 | 7d2cef99c838fb58038de8bbfd3cdb76ff4797241987077721715297f8d45e34 android.hardware.graphics.common@1.1::types # b/78135149 |
344 | d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer | 344 | d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer |
345 | e7717f2ff2f6db43b24370ff08e14cd353da3004b32b17740e4a7ed4894b7e45 android.hardware.graphics.composer@2.2::IComposerClient | 345 | a2f183f7fcc79aabedaef11095ab223aac0ed5ef984d850893872515e7f560c7 android.hardware.graphics.composer@2.2::IComposerClient |
346 | dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper | 346 | dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper |
347 | 675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth | 347 | 675682dd3007805c985eaaec91612abc88f4c25b3431fb84070b7584a1a741fb android.hardware.health@2.0::IHealth |
348 | 434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback | 348 | 434c4c32c00b0e54bb05e40c79503208b40f786a318029a2a4f66e34f10f2a76 android.hardware.health@2.0::IHealthInfoCallback |
diff --git a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp index 8b8b530a..747c66c9 100644 --- a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp +++ b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp | |||
@@ -292,9 +292,16 @@ TEST_F(GraphicsComposerHidlTest, SetActiveConfig) { | |||
292 | * Test that IComposerClient::setColorMode succeeds for all color modes. | 292 | * Test that IComposerClient::setColorMode succeeds for all color modes. |
293 | */ | 293 | */ |
294 | TEST_F(GraphicsComposerHidlTest, SetColorMode) { | 294 | TEST_F(GraphicsComposerHidlTest, SetColorMode) { |
295 | std::unordered_set<ColorMode> validModes; | ||
296 | for (auto mode : hidl_enum_iterator<ColorMode>()) { | ||
297 | validModes.insert(mode); | ||
298 | } | ||
299 | |||
295 | std::vector<ColorMode> modes = mComposerClient->getColorModes(mPrimaryDisplay); | 300 | std::vector<ColorMode> modes = mComposerClient->getColorModes(mPrimaryDisplay); |
296 | for (auto mode : modes) { | 301 | for (auto mode : modes) { |
297 | mComposerClient->setColorMode(mPrimaryDisplay, mode); | 302 | if (validModes.count(mode)) { |
303 | mComposerClient->setColorMode(mPrimaryDisplay, mode); | ||
304 | } | ||
298 | } | 305 | } |
299 | } | 306 | } |
300 | 307 | ||
diff --git a/graphics/composer/2.2/IComposerClient.hal b/graphics/composer/2.2/IComposerClient.hal index 2f0a3cca..d4a87e6f 100644 --- a/graphics/composer/2.2/IComposerClient.hal +++ b/graphics/composer/2.2/IComposerClient.hal | |||
@@ -355,7 +355,8 @@ interface IComposerClient extends @2.1::IComposerClient { | |||
355 | * Returns the render intents supported by the specified display and color | 355 | * Returns the render intents supported by the specified display and color |
356 | * mode. | 356 | * mode. |
357 | * | 357 | * |
358 | * RenderIntent::COLORIMETRIC is always supported. | 358 | * For SDR color modes, RenderIntent::COLORIMETRIC must be supported. For |
359 | * HDR color modes, RenderIntent::TONE_MAP_COLORIMETRIC must be supported. | ||
359 | * | 360 | * |
360 | * @param display is the display to query. | 361 | * @param display is the display to query. |
361 | * @param mode is the color mode to query. | 362 | * @param mode is the color mode to query. |
diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp index f0d22504..23bf5583 100644 --- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp +++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp | |||
@@ -347,9 +347,22 @@ TEST_F(GraphicsComposerHidlTest, GetRenderIntent) { | |||
347 | for (auto mode : modes) { | 347 | for (auto mode : modes) { |
348 | std::vector<RenderIntent> intents = | 348 | std::vector<RenderIntent> intents = |
349 | mComposerClient->getRenderIntents(mPrimaryDisplay, mode); | 349 | mComposerClient->getRenderIntents(mPrimaryDisplay, mode); |
350 | auto colorimetricIntent = | 350 | |
351 | std::find(intents.cbegin(), intents.cend(), RenderIntent::COLORIMETRIC); | 351 | bool isHdr; |
352 | EXPECT_NE(intents.cend(), colorimetricIntent); | 352 | switch (mode) { |
353 | case ColorMode::BT2100_PQ: | ||
354 | case ColorMode::BT2100_HLG: | ||
355 | isHdr = true; | ||
356 | break; | ||
357 | default: | ||
358 | isHdr = false; | ||
359 | break; | ||
360 | } | ||
361 | RenderIntent requiredIntent = | ||
362 | isHdr ? RenderIntent::TONE_MAP_COLORIMETRIC : RenderIntent::COLORIMETRIC; | ||
363 | |||
364 | auto iter = std::find(intents.cbegin(), intents.cend(), requiredIntent); | ||
365 | EXPECT_NE(intents.cend(), iter); | ||
353 | } | 366 | } |
354 | } | 367 | } |
355 | 368 | ||