Merge "MP3Extractor: return EOS code correctly" (e3924eb7) · Commits · e / os / android_frameworks_av

media/extractors/mp3/MP3Extractor.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -546,7 +546,8 @@ media_status_t MP3Source::read(
		buffer->release();
		buffer = NULL;

		return (n < 0 ? AMEDIA_ERROR_UNKNOWN : AMEDIA_ERROR_END_OF_STREAM);
		return ((n < 0 && n != ERROR_END_OF_STREAM) ?
		AMEDIA_ERROR_UNKNOWN : AMEDIA_ERROR_END_OF_STREAM);
		}

		uint32_t header = U32_AT((const uint8_t *)buffer->data());
		@@ -590,7 +591,8 @@ media_status_t MP3Source::read(
		buffer->release();
		buffer = NULL;

		return (n < 0 ? AMEDIA_ERROR_UNKNOWN : AMEDIA_ERROR_END_OF_STREAM);
		return ((n < 0 && n != ERROR_END_OF_STREAM) ?
		AMEDIA_ERROR_UNKNOWN : AMEDIA_ERROR_END_OF_STREAM);
		}

		buffer->set_range(0, frame_size);