Merge "MediaCodec: move crypto check to onQueueInputBuffer" into main (01dd111f) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaCodec.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -2460,13 +2460,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.
		@@ -6210,6 +6206,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;