Snap for 6342437 from 050bbc71673803cf4520a4092b4a1005059995dc to rvc-release (73f12608) · Commits · e / os / android_frameworks_av

media/extractors/mp4/MPEG4Extractor.cpp

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1076,6 +1076,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
	// drop it now to reduce our footprint		// drop it now to reduce our footprint
	free(mLastTrack->mTx3gBuffer);		free(mLastTrack->mTx3gBuffer);
	mLastTrack->mTx3gBuffer = NULL;		mLastTrack->mTx3gBuffer = NULL;
			mLastTrack->mTx3gFilled = 0;
			mLastTrack->mTx3gSize = 0;
	}		}

	const char *mime;		const char *mime;
	@@ -2784,6 +2786,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
	// if those apps are compensating for it, we'd break them with such a change		// if those apps are compensating for it, we'd break them with such a change
	//		//

			if (mLastTrack->mTx3gBuffer == NULL) {
			mLastTrack->mTx3gSize = 0;
			mLastTrack->mTx3gFilled = 0;
			}
	if (mLastTrack->mTx3gSize - mLastTrack->mTx3gFilled < chunk_size) {		if (mLastTrack->mTx3gSize - mLastTrack->mTx3gFilled < chunk_size) {
	size_t growth = kTx3gGrowth;		size_t growth = kTx3gGrowth;
	if (growth < chunk_size) {		if (growth < chunk_size) {
	@@ -5963,7 +5969,11 @@ media_status_t MPEG4Source::read(
	sampleTime += mElstInitialEmptyEditTicks;		sampleTime += mElstInitialEmptyEditTicks;
	}		}
	if (mElstShiftStartTicks > 0){		if (mElstShiftStartTicks > 0){
			if (sampleTime > mElstShiftStartTicks) {
	sampleTime -= mElstShiftStartTicks;		sampleTime -= mElstShiftStartTicks;
			} else {
			sampleTime = 0;
			}
	}		}
	targetSampleTimeUs = (sampleTime * 1000000ll) / mTimescale;		targetSampleTimeUs = (sampleTime * 1000000ll) / mTimescale;
	}		}