Merge "Wrong format used in seamless check" into lmp-mr1-dev (7a434265) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -823,7 +823,7 @@ bool NuPlayer::Decoder::supportsSeamlessAudioFormatChange(
		const char * keys[] = { "channel-count", "sample-rate", "is-adts" };
		for (unsigned int i = 0; i < sizeof(keys) / sizeof(keys[0]); i++) {
		int32_t oldVal, newVal;
		if (!mOutputFormat->findInt32(keys[i], &oldVal) \|\|
		if (!mInputFormat->findInt32(keys[i], &oldVal) \|\|
		!targetFormat->findInt32(keys[i], &newVal) \|\|
		oldVal != newVal) {
		return false;
		@@ -831,7 +831,7 @@ bool NuPlayer::Decoder::supportsSeamlessAudioFormatChange(
		}

		sp<ABuffer> oldBuf, newBuf;
		if (mOutputFormat->findBuffer("csd-0", &oldBuf) &&
		if (mInputFormat->findBuffer("csd-0", &oldBuf) &&
		targetFormat->findBuffer("csd-0", &newBuf)) {
		if (oldBuf->size() != newBuf->size()) {
		return false;
		@@ -843,7 +843,7 @@ bool NuPlayer::Decoder::supportsSeamlessAudioFormatChange(
		}

		bool NuPlayer::Decoder::supportsSeamlessFormatChange(const sp<AMessage> &targetFormat) const {
		if (mOutputFormat == NULL) {
		if (mInputFormat == NULL) {
		return false;
		}

		@@ -852,7 +852,7 @@ bool NuPlayer::Decoder::supportsSeamlessFormatChange(const sp<AMessage> &targetF
		}

		AString oldMime, newMime;
		if (!mOutputFormat->findString("mime", &oldMime)
		if (!mInputFormat->findString("mime", &oldMime)
		\|\| !targetFormat->findString("mime", &newMime)
		\|\| !(oldMime == newMime)) {
		return false;