Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef (87f1a304) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

+12 −6

Original line number	Diff line number	Diff line
		@@ -856,6 +856,12 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		ALOGE("moov: depth %d", depth);
		return ERROR_MALFORMED;
		}

		if (chunk_type == FOURCC('m', 'o', 'o', 'v') && mInitCheck == OK) {
		ALOGE("duplicate moov");
		return ERROR_MALFORMED;
		}

		if (chunk_type == FOURCC('s', 't', 'b', 'l')) {
		ALOGV("sampleTable chunk is %d bytes long.", (size_t)chunk_size);

		@@ -923,6 +929,12 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		if (!mLastTrack->meta->findInt32(kKeyTrackID, &trackId)) {
		mLastTrack->skipTrack = true;
		}

		status_t err = verifyTrack(mLastTrack);
		if (err != OK) {
		mLastTrack->skipTrack = true;
		}

		if (mLastTrack->skipTrack) {
		Track *cur = mFirstTrack;

		@@ -940,12 +952,6 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {

		return OK;
		}

		status_t err = verifyTrack(mLastTrack);

		if (err != OK) {
		return err;
		}
		} else if (chunk_type == FOURCC('m', 'o', 'o', 'v')) {
		mInitCheck = OK;