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

Commit 480f8458 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: move crypto check to onQueueInputBuffer" into main am: 01dd111f am: efaf44a3 

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



Change-Id: I6b8530fbeb6bef83315ced069f2fdd535532e232
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f578f8c3 efaf44a3

media/libstagefright/MediaCodec.cpp

+8 −6
Original line number Diff line number Diff line
@@ -2463,13 +2463,9 @@ status_t MediaCodec::configure( 
            mediametrics_setInt32(nextMetricsHandle, kCodecCrypto, 1);

        }

    } else if (mFlags & kFlagIsSecure) {

        if (android::media::codec::provider_->secure_codecs_require_crypto()) {

            mErrorLog.log(LOG_TAG, "Crypto or descrambler must be given for secure codec");

            return INVALID_OPERATION;

        } else {

        // We'll catch this later when we process the buffers.

        ALOGW("Crypto or descrambler should be given for secure codec");

    }

    }



    if (mConfigureMsg != nullptr) {

        // if re-configuring, we have one of these from before.
@@ -6213,6 +6209,12 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 
    CryptoPlugin::SubSample ss;

    CryptoPlugin::Pattern pattern;



    if (android::media::codec::provider_->secure_codecs_require_crypto()

            && (mFlags & kFlagIsSecure) && !hasCryptoOrDescrambler()) {

        mErrorLog.log(LOG_TAG, "Crypto or descrambler must be given for secure codec");

        return INVALID_OPERATION;

    }



    if (msg->findSize("size", &size)) {

        if (hasCryptoOrDescrambler()) {

            ss.mNumBytesOfClearData = size;