Merge "Report error when using buffers for secure codec without providing crypto" into oc-dev (b0b882fb) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaCodec.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -734,6 +734,8 @@ status_t MediaCodec::configure(
		// XXX: save indication that it's crypto in some way...
		mAnalyticsItem->setInt32(kCodecCrypto, 1);
		}
		} else if (mFlags & kFlagIsSecure) {
		ALOGW("Crypto or descrambler should be given for secure codec");
		}

		// save msg for reset
		@@ -2593,6 +2595,10 @@ status_t MediaCodec::queueCSDInputBuffer(size_t bufferIndex) {
		if (csd->size() > codecInputData->capacity()) {
		return -EINVAL;
		}
		if (codecInputData->data() == NULL) {
		ALOGV("Input buffer %zu is not properly allocated", bufferIndex);
		return -EINVAL;
		}

		memcpy(codecInputData->data(), csd->data(), csd->size());