Merge "Clean Opus headers after parse failure" (87a837c6) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/opus/dec/SoftOpus.cpp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -431,7 +431,7 @@ void SoftOpus::onQueueFilled(OMX_U32 /* portIndex */) {
	}		}

	if (mInputBufferCount == 0) {		if (mInputBufferCount == 0) {
	CHECK(mHeader == NULL);		delete mHeader;
	mHeader = new OpusHeader();		mHeader = new OpusHeader();
	memset(mHeader, 0, sizeof(*mHeader));		memset(mHeader, 0, sizeof(*mHeader));
	if (!ParseOpusHeader(data, size, mHeader)) {		if (!ParseOpusHeader(data, size, mHeader)) {
	@@ -452,6 +452,9 @@ void SoftOpus::onQueueFilled(OMX_U32 /* portIndex */) {
	}		}

	int status = OPUS_INVALID_STATE;		int status = OPUS_INVALID_STATE;
			if (mDecoder != NULL) {
			opus_multistream_decoder_destroy(mDecoder);
			}
	mDecoder = opus_multistream_decoder_create(kRate,		mDecoder = opus_multistream_decoder_create(kRate,
	mHeader->channels,		mHeader->channels,
	mHeader->num_streams,		mHeader->num_streams,