Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 697ba8e1 authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

Merge "C2 VTS: Update checks for secure codecs" am: cb6e7393 am: c2da7da1... 

Merge "C2 VTS: Update checks for secure codecs" am: cb6e7393 am: c2da7da1 am: 19719098 am: fc3714d2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1654429

Change-Id: Ib9499c4b332b5c5cc33617b91ee7fe58f79bc781
parents 65f8d615 fc3714d2

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ class Codec2VideoDecHidlTestBase : public ::testing::Test { 


        C2SecureModeTuning secureModeTuning{};

        mComponent->query({&secureModeTuning}, {}, C2_MAY_BLOCK, nullptr);

        if (secureModeTuning.value == C2Config::SM_READ_PROTECTED) {

        if (secureModeTuning.value == C2Config::SM_READ_PROTECTED ||

            secureModeTuning.value == C2Config::SM_READ_PROTECTED_WITH_ENCRYPTED) {

            mDisableTest = true;

        }

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ class Codec2VideoEncHidlTestBase : public ::testing::Test { 


        C2SecureModeTuning secureModeTuning{};

        mComponent->query({&secureModeTuning}, {}, C2_MAY_BLOCK, nullptr);

        if (secureModeTuning.value == C2Config::SM_READ_PROTECTED) {

        if (secureModeTuning.value == C2Config::SM_READ_PROTECTED ||

            secureModeTuning.value == C2Config::SM_READ_PROTECTED_WITH_ENCRYPTED) {

            mDisableTest = true;

        }