resolve merge conflicts of 1038297e29 to nyc-mr2-dev (009ed800) · Commits · e / os / android_frameworks_av

media/libstagefright/SampleTable.cpp

+12 −9

Original line number	Diff line number	Diff line
		@@ -517,8 +517,6 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		return ERROR_MALFORMED;
		}

		mSyncSampleOffset = data_offset;

		uint8_t header[8];
		if (mDataSource->readAt(
		data_offset, header, sizeof(header)) < (ssize_t)sizeof(header)) {
		@@ -530,13 +528,13 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		return ERROR_MALFORMED;
		}

		mNumSyncSamples = U32_AT(&header[4]);
		uint32_t numSyncSamples = U32_AT(&header[4]);

		if (mNumSyncSamples < 2) {
		if (numSyncSamples < 2) {
		ALOGV("Table of sync samples is empty or has only a single entry!");
		}

		uint64_t allocSize = (uint64_t)mNumSyncSamples * sizeof(uint32_t);
		uint64_t allocSize = (uint64_t)numSyncSamples * sizeof(uint32_t);
		if (allocSize > kMaxTotalSize) {
		ALOGE("Sync sample table size too large.");
		return ERROR_OUT_OF_RANGE;
		@@ -554,19 +552,21 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		return ERROR_OUT_OF_RANGE;
		}

		mSyncSamples = new (std::nothrow) uint32_t[mNumSyncSamples];
		mSyncSamples = new (std::nothrow) uint32_t[numSyncSamples];
		if (!mSyncSamples) {
		ALOGE("Cannot allocate sync sample table with %llu entries.",
		(unsigned long long)mNumSyncSamples);
		(unsigned long long)numSyncSamples);
		return ERROR_OUT_OF_RANGE;
		}

		if (mDataSource->readAt(mSyncSampleOffset + 8, mSyncSamples,
		if (mDataSource->readAt(data_offset + 8, mSyncSamples,
		(size_t)allocSize) != (ssize_t)allocSize) {
		delete mSyncSamples;
		mSyncSamples = NULL;
		return ERROR_IO;
		}

		for (size_t i = 0; i < mNumSyncSamples; ++i) {
		for (size_t i = 0; i < numSyncSamples; ++i) {
		if (mSyncSamples[i] == 0) {
		ALOGE("b/32423862, unexpected zero value in stss");
		continue;
		@@ -574,6 +574,9 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		mSyncSamples[i] = ntohl(mSyncSamples[i]) - 1;
		}

		mSyncSampleOffset = data_offset;
		mNumSyncSamples = numSyncSamples;

		return OK;
		}