resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp (5a88501c) · Commits · e / os / android_frameworks_av

media/libstagefright/AACWriter.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -79,10 +79,6 @@ status_t AACWriter::initCheck() const {
		return mInitCheck;
		}

		static int writeInt8(int fd, uint8_t x) {
		return ::write(fd, &x, 1);
		}


		status_t AACWriter::addSource(const sp<MediaSource> &source) {
		if (mInitCheck != OK) {

media/libstagefright/ACodec.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -922,7 +922,6 @@ status_t ACodec::cancelBufferToNativeWindow(BufferInfo *info) {

		ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() {
		ANativeWindowBuffer *buf;
		int fenceFd = -1;
		CHECK(mNativeWindow.get() != NULL);

		if (mTunneled) {
		@@ -3024,7 +3023,6 @@ bool ACodec::allYourBuffersAreBelongToUs() {
		}

		void ACodec::deferMessage(const sp<AMessage> &msg) {
		bool wasEmptyBefore = mDeferredQueue.empty();
		mDeferredQueue.push_back(msg);
		}

		@@ -3659,7 +3657,6 @@ status_t ACodec::pushBlankBuffersToNativeWindow() {
		// on the screen and then been replaced, so an previous video frames are
		// guaranteed NOT to be currently displayed.
		for (int i = 0; i < numBufs + 1; i++) {
		int fenceFd = -1;
		err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), &anb);
		if (err != NO_ERROR) {
		ALOGE("error pushing blank frames: dequeueBuffer failed: %s (%d)",

media/libstagefright/MPEG4Extractor.cpp

+43 −43

Original line number	Diff line number	Diff line
		@@ -265,6 +265,8 @@ status_t MPEG4DataSource::setCachedRange(off64_t offset, size_t size) {

		////////////////////////////////////////////////////////////////////////////////

		static const bool kUseHexDump = false;

		static void hexdump(const void *_data, size_t size) {
		const uint8_t data = (const uint8_t )_data;
		size_t offset = 0;
		@@ -607,7 +609,6 @@ status_t MPEG4Extractor::parseDrmSINF(
		if (size < 0) {
		return ERROR_IO;
		}
		int32_t classSize = size;
		data_offset += numOfBytes;

		while(size >= 11 ) {
		@@ -668,7 +669,6 @@ status_t MPEG4Extractor::parseDrmSINF(
		if (size < 0) {
		return ERROR_IO;
		}
		classSize = size;
		data_offset += numOfBytes;

		while (size > 0) {
		@@ -806,7 +806,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		MakeFourCCString(chunk_type, chunk);
		ALOGV("chunk: %s @ %lld, %d", chunk, *offset, depth);

		#if 0
		if (kUseHexDump) {
		static const char kWhitespace[] = " ";
		const char indent = &kWhitespace[sizeof(kWhitespace) - 1 - 2 depth];
		printf("%sfound chunk '%s' of size %" PRIu64 "\n", indent, chunk, chunk_size);
		@@ -822,7 +822,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		}

		hexdump(buffer, n);
		#endif
		}

		PathAdder autoAdder(&mPath, chunk_type);

		@@ -1298,7 +1298,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		return ERROR_IO;
		}

		uint16_t data_ref_index = U16_AT(&buffer[6]);
		uint16_t data_ref_index __unused = U16_AT(&buffer[6]);
		uint32_t num_channels = U16_AT(&buffer[16]);

		uint16_t sample_size = U16_AT(&buffer[18]);
		@@ -1351,7 +1351,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		return ERROR_IO;
		}

		uint16_t data_ref_index = U16_AT(&buffer[6]);
		uint16_t data_ref_index __unused = U16_AT(&buffer[6]);
		uint16_t width = U16_AT(&buffer[6 + 18]);
		uint16_t height = U16_AT(&buffer[6 + 20]);

		@@ -1867,7 +1867,6 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		if (chunk_data_size < 24) {
		return ERROR_IO;
		}
		uint32_t duration;
		Trex trex;
		if (!mDataSource->getUInt32(data_offset + 4, &trex.track_ID) \|\|
		!mDataSource->getUInt32(data_offset + 8, &trex.default_sample_description_index) \|\|
		@@ -2139,7 +2138,7 @@ status_t MPEG4Extractor::parseTrackHeader(
		return ERROR_IO;
		}

		uint64_t ctime, mtime, duration;
		uint64_t ctime __unused, mtime __unused, duration __unused;
		int32_t id;

		if (version == 1) {
		@@ -2161,12 +2160,13 @@ status_t MPEG4Extractor::parseTrackHeader(
		size_t matrixOffset = dynSize + 16;
		int32_t a00 = U32_AT(&buffer[matrixOffset]);
		int32_t a01 = U32_AT(&buffer[matrixOffset + 4]);
		int32_t dx = U32_AT(&buffer[matrixOffset + 8]);
		int32_t a10 = U32_AT(&buffer[matrixOffset + 12]);
		int32_t a11 = U32_AT(&buffer[matrixOffset + 16]);
		int32_t dy = U32_AT(&buffer[matrixOffset + 20]);

		#if 0
		int32_t dx = U32_AT(&buffer[matrixOffset + 8]);
		int32_t dy = U32_AT(&buffer[matrixOffset + 20]);

		ALOGI("x' = %.2f * x + %.2f * y + %.2f",
		a00 / 65536.0f, a01 / 65536.0f, dx / 65536.0f);
		ALOGI("y' = %.2f * x + %.2f * y + %.2f",
		@@ -2718,10 +2718,10 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
		return ERROR_MALFORMED;
		}

		#if 0
		if (kUseHexDump) {
		printf("ESD of size %d\n", csd_size);
		hexdump(csd, csd_size);
		#endif
		}

		if (csd_size == 0) {
		// There's no further information, i.e. no codec specific data
		@@ -2772,7 +2772,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(

		if (objectType == AOT_SBR \|\| objectType == AOT_PS) {//SBR specific config per 14496-3 table 1.13
		uint32_t extFreqIndex = br.getBits(4);
		int32_t extSampleRate;
		int32_t extSampleRate __unused;
		if (extFreqIndex == 15) {
		if (csd_size < 8) {
		return ERROR_MALFORMED;
		@@ -2822,12 +2822,12 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
		if (objectType == AOT_AAC_LC \|\| objectType == AOT_ER_AAC_LC \|\|
		objectType == AOT_ER_AAC_LD \|\| objectType == AOT_ER_AAC_SCAL \|\|
		objectType == AOT_ER_BSAC) {
		const int32_t frameLengthFlag = br.getBits(1);
		const int32_t frameLengthFlag __unused = br.getBits(1);

		const int32_t dependsOnCoreCoder = br.getBits(1);

		if (dependsOnCoreCoder ) {
		const int32_t coreCoderDelay = br.getBits(14);
		const int32_t coreCoderDelay __unused = br.getBits(14);
		}

		int32_t extensionFlag = -1;
		@@ -2856,54 +2856,54 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
		if (numChannels == 0) {
		int32_t channelsEffectiveNum = 0;
		int32_t channelsNum = 0;
		const int32_t ElementInstanceTag = br.getBits(4);
		const int32_t Profile = br.getBits(2);
		const int32_t SamplingFrequencyIndex = br.getBits(4);
		const int32_t ElementInstanceTag __unused = br.getBits(4);
		const int32_t Profile __unused = br.getBits(2);
		const int32_t SamplingFrequencyIndex __unused = br.getBits(4);
		const int32_t NumFrontChannelElements = br.getBits(4);
		const int32_t NumSideChannelElements = br.getBits(4);
		const int32_t NumBackChannelElements = br.getBits(4);
		const int32_t NumLfeChannelElements = br.getBits(2);
		const int32_t NumAssocDataElements = br.getBits(3);
		const int32_t NumValidCcElements = br.getBits(4);
		const int32_t NumAssocDataElements __unused = br.getBits(3);
		const int32_t NumValidCcElements __unused = br.getBits(4);

		const int32_t MonoMixdownPresent = br.getBits(1);
		if (MonoMixdownPresent != 0) {
		const int32_t MonoMixdownElementNumber = br.getBits(4);
		const int32_t MonoMixdownElementNumber __unused = br.getBits(4);
		}

		const int32_t StereoMixdownPresent = br.getBits(1);
		if (StereoMixdownPresent != 0) {
		const int32_t StereoMixdownElementNumber = br.getBits(4);
		const int32_t StereoMixdownElementNumber __unused = br.getBits(4);
		}

		const int32_t MatrixMixdownIndexPresent = br.getBits(1);
		if (MatrixMixdownIndexPresent != 0) {
		const int32_t MatrixMixdownIndex = br.getBits(2);
		const int32_t PseudoSurroundEnable = br.getBits(1);
		const int32_t MatrixMixdownIndex __unused = br.getBits(2);
		const int32_t PseudoSurroundEnable __unused = br.getBits(1);
		}

		int i;
		for (i=0; i < NumFrontChannelElements; i++) {
		const int32_t FrontElementIsCpe = br.getBits(1);
		const int32_t FrontElementTagSelect = br.getBits(4);
		const int32_t FrontElementTagSelect __unused = br.getBits(4);
		channelsNum += FrontElementIsCpe ? 2 : 1;
		}

		for (i=0; i < NumSideChannelElements; i++) {
		const int32_t SideElementIsCpe = br.getBits(1);
		const int32_t SideElementTagSelect = br.getBits(4);
		const int32_t SideElementTagSelect __unused = br.getBits(4);
		channelsNum += SideElementIsCpe ? 2 : 1;
		}

		for (i=0; i < NumBackChannelElements; i++) {
		const int32_t BackElementIsCpe = br.getBits(1);
		const int32_t BackElementTagSelect = br.getBits(4);
		const int32_t BackElementTagSelect __unused = br.getBits(4);
		channelsNum += BackElementIsCpe ? 2 : 1;
		}
		channelsEffectiveNum = channelsNum;

		for (i=0; i < NumLfeChannelElements; i++) {
		const int32_t LfeElementTagSelect = br.getBits(4);
		const int32_t LfeElementTagSelect __unused = br.getBits(4);
		channelsNum += 1;
		}
		ALOGV("mpeg4 audio channelsNum = %d", channelsNum);

media/libstagefright/OMXCodec.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -451,7 +451,7 @@ status_t OMXCodec::parseAVCCodecSpecificData(
		// assertion, let's be lenient for now...
		// CHECK((ptr[4] >> 2) == 0x3f); // reserved

		size_t lengthSize = 1 + (ptr[4] & 3);
		size_t lengthSize __unused = 1 + (ptr[4] & 3);

		// commented out check below as H264_QVGA_500_NO_AUDIO.3gp
		// violates it...
		@@ -2006,7 +2006,6 @@ status_t OMXCodec::cancelBufferToNativeWindow(BufferInfo *info) {
		OMXCodec::BufferInfo* OMXCodec::dequeueBufferFromNativeWindow() {
		// Dequeue the next buffer from the native window.
		ANativeWindowBuffer* buf;
		int fenceFd = -1;
		int err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), &buf);
		if (err != 0) {
		CODEC_LOGE("dequeueBuffer failed w/ error 0x%08x", err);
		@@ -2111,7 +2110,6 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() {
		// on the screen and then been replaced, so an previous video frames are
		// guaranteed NOT to be currently displayed.
		for (int i = 0; i < numBufs + 1; i++) {
		int fenceFd = -1;
		err = native_window_dequeue_buffer_and_wait(mNativeWindow.get(), &anb);
		if (err != NO_ERROR) {
		ALOGE("error pushing blank frames: dequeueBuffer failed: %s (%d)",

media/libstagefright/Utils.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -181,14 +181,14 @@ status_t convertMetaDataToMessage(

		CHECK(size >= 7);
		CHECK_EQ((unsigned)ptr[0], 1u); // configurationVersion == 1
		uint8_t profile = ptr[1];
		uint8_t level = ptr[3];
		uint8_t profile __unused = ptr[1];
		uint8_t level __unused = ptr[3];

		// There is decodable content out there that fails the following
		// assertion, let's be lenient for now...
		// CHECK((ptr[4] >> 2) == 0x3f); // reserved

		size_t lengthSize = 1 + (ptr[4] & 3);
		size_t lengthSize __unused = 1 + (ptr[4] & 3);

		// commented out check below as H264_QVGA_500_NO_AUDIO.3gp
		// violates it...
		@@ -257,8 +257,8 @@ status_t convertMetaDataToMessage(

		CHECK(size >= 7);
		CHECK_EQ((unsigned)ptr[0], 1u); // configurationVersion == 1
		uint8_t profile = ptr[1] & 31;
		uint8_t level = ptr[12];
		uint8_t profile __unused = ptr[1] & 31;
		uint8_t level __unused = ptr[12];
		ptr += 22;
		size -= 22;