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

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

Merge "MediaCodec: require Crypto/Descrambler object for secure codecs" into... 

Merge "MediaCodec: require Crypto/Descrambler object for secure codecs" into main am: 28c70d58 am: 62ec24fc

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



Change-Id: I1d73330c46b6e7c8d19cdbb82892dd6d61ad5984
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 749910d5 62ec24fc

media/aconfig/codec_fwk.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ flag { 
  bug: "325549730"

}



flag {

  name: "secure_codecs_require_crypto"

  namespace: "codec_fwk"

  description: "Bugfix flag for requiring setting crypto for secure codecs"

  bug: "365162324"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "set_callback_stall"

  namespace: "codec_fwk"

media/libstagefright/MediaCodec.cpp

+6 −1
Original line number Diff line number Diff line
@@ -2462,8 +2462,13 @@ 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 {

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

        }

    }



    if (mConfigureMsg != nullptr) {

        // if re-configuring, we have one of these from before.