Snap for 6343882 from f10368d25c41f26cfe2a828dadbe67953694162e to rvc-release (27e3ae1f) · Commits · e / os / android_frameworks_av

media/extractors/mp4/MPEG4Extractor.cpp

+7 −28

Original line number	Original line	Diff line number	Diff line
	@@ -165,9 +165,8 @@ private:
	status_t parseTrackFragmentRun(off64_t offset, off64_t size);		status_t parseTrackFragmentRun(off64_t offset, off64_t size);
	status_t parseSampleAuxiliaryInformationSizes(off64_t offset, off64_t size);		status_t parseSampleAuxiliaryInformationSizes(off64_t offset, off64_t size);
	status_t parseSampleAuxiliaryInformationOffsets(off64_t offset, off64_t size);		status_t parseSampleAuxiliaryInformationOffsets(off64_t offset, off64_t size);
	status_t parseClearEncryptedSizes(		status_t parseClearEncryptedSizes(off64_t offset, bool isSubsampleEncryption, uint32_t flags);
	off64_t offset, bool isSubsampleEncryption, uint32_t flags, off64_t size);		status_t parseSampleEncryption(off64_t offset);
	status_t parseSampleEncryption(off64_t offset, off64_t size);
	// returns -1 for invalid layer ID		// returns -1 for invalid layer ID
	int32_t parseHEVCLayerId(const uint8_t *data, size_t size);		int32_t parseHEVCLayerId(const uint8_t *data, size_t size);

	@@ -5187,7 +5186,7 @@ status_t MPEG4Source::parseChunk(off64_t *offset) {

	case FOURCC("senc"): {		case FOURCC("senc"): {
	status_t err;		status_t err;
	if ((err = parseSampleEncryption(data_offset, chunk_data_size)) != OK) {		if ((err = parseSampleEncryption(data_offset)) != OK) {
	return err;		return err;
	}		}
	*offset += chunk_size;		*offset += chunk_size;
	@@ -5379,13 +5378,12 @@ status_t MPEG4Source::parseSampleAuxiliaryInformationOffsets(
	off64_t drmoffset = mCurrentSampleInfoOffsets[0]; // from moof		off64_t drmoffset = mCurrentSampleInfoOffsets[0]; // from moof

	drmoffset += mCurrentMoofOffset;		drmoffset += mCurrentMoofOffset;
	size -= mCurrentMoofOffset;

	return parseClearEncryptedSizes(drmoffset, false, 0, size);		return parseClearEncryptedSizes(drmoffset, false, 0);
	}		}

	status_t MPEG4Source::parseClearEncryptedSizes(		status_t MPEG4Source::parseClearEncryptedSizes(
	off64_t offset, bool isSubsampleEncryption, uint32_t flags, off64_t size) {		off64_t offset, bool isSubsampleEncryption, uint32_t flags) {

	int32_t ivlength;		int32_t ivlength;
	if (!AMediaFormat_getInt32(mFormat, AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE, &ivlength)) {		if (!AMediaFormat_getInt32(mFormat, AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE, &ivlength)) {
	@@ -5400,14 +5398,10 @@ status_t MPEG4Source::parseClearEncryptedSizes(

	uint32_t sampleCount = mCurrentSampleInfoCount;		uint32_t sampleCount = mCurrentSampleInfoCount;
	if (isSubsampleEncryption) {		if (isSubsampleEncryption) {
	if(size < 4){
	return ERROR_MALFORMED;
	}
	if (!mDataSource->getUInt32(offset, &sampleCount)) {		if (!mDataSource->getUInt32(offset, &sampleCount)) {
	return ERROR_IO;		return ERROR_IO;
	}		}
	offset += 4;		offset += 4;
	size -= 4;
	}		}

	// read CencSampleAuxiliaryDataFormats		// read CencSampleAuxiliaryDataFormats
	@@ -5422,15 +5416,11 @@ status_t MPEG4Source::parseClearEncryptedSizes(
	}		}

	memset(smpl->iv, 0, 16);		memset(smpl->iv, 0, 16);
	if(size < ivlength){
	return ERROR_MALFORMED;
	}
	if (mDataSource->readAt(offset, smpl->iv, ivlength) != ivlength) {		if (mDataSource->readAt(offset, smpl->iv, ivlength) != ivlength) {
	return ERROR_IO;		return ERROR_IO;
	}		}

	offset += ivlength;		offset += ivlength;
	size -= ivlength;

	bool readSubsamples;		bool readSubsamples;
	if (isSubsampleEncryption) {		if (isSubsampleEncryption) {
	@@ -5445,20 +5435,13 @@ status_t MPEG4Source::parseClearEncryptedSizes(

	if (readSubsamples) {		if (readSubsamples) {
	uint16_t numsubsamples;		uint16_t numsubsamples;
	if(size < 2){
	return ERROR_MALFORMED;
	}
	if (!mDataSource->getUInt16(offset, &numsubsamples)) {		if (!mDataSource->getUInt16(offset, &numsubsamples)) {
	return ERROR_IO;		return ERROR_IO;
	}		}
	offset += 2;		offset += 2;
	size -= 2;
	for (size_t j = 0; j < numsubsamples; j++) {		for (size_t j = 0; j < numsubsamples; j++) {
	uint16_t numclear;		uint16_t numclear;
	uint32_t numencrypted;		uint32_t numencrypted;
	if(size < 6){
	return ERROR_MALFORMED;
	}
	if (!mDataSource->getUInt16(offset, &numclear)) {		if (!mDataSource->getUInt16(offset, &numclear)) {
	return ERROR_IO;		return ERROR_IO;
	}		}
	@@ -5467,7 +5450,6 @@ status_t MPEG4Source::parseClearEncryptedSizes(
	return ERROR_IO;		return ERROR_IO;
	}		}
	offset += 4;		offset += 4;
	size -= 6;
	smpl->clearsizes.add(numclear);		smpl->clearsizes.add(numclear);
	smpl->encryptedsizes.add(numencrypted);		smpl->encryptedsizes.add(numencrypted);
	}		}
	@@ -5480,15 +5462,12 @@ status_t MPEG4Source::parseClearEncryptedSizes(
	return OK;		return OK;
	}		}

	status_t MPEG4Source::parseSampleEncryption(off64_t offset, off64_t chunk_data_size) {		status_t MPEG4Source::parseSampleEncryption(off64_t offset) {
	uint32_t flags;		uint32_t flags;
	if(chunk_data_size < 4) {
	return ERROR_MALFORMED;
	}
	if (!mDataSource->getUInt32(offset, &flags)) { // actually version + flags		if (!mDataSource->getUInt32(offset, &flags)) { // actually version + flags
	return ERROR_MALFORMED;		return ERROR_MALFORMED;
	}		}
	return parseClearEncryptedSizes(offset + 4, true, flags, chunk_data_size - 4);		return parseClearEncryptedSizes(offset + 4, true, flags);
	}		}

	status_t MPEG4Source::parseTrackFragmentHeader(off64_t offset, off64_t size) {		status_t MPEG4Source::parseTrackFragmentHeader(off64_t offset, off64_t size) {