From 6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Fri, 7 Feb 2014 14:42:22 -0800 Subject: Fix regression CTS DecoderTest.testBug11696552 started failing again, and this fixes that Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6 --- media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp') diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 2f5eff4..4ac8999 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -377,7 +377,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { mNumSamplesOutput = 0; } - if (mIsADTS) { + if (mIsADTS && inHeader->nFilledLen) { size_t adtsHeaderSize = 0; // skip 30 bits, aac_frame_length follows. // ssssssss ssssiiip ppffffPc ccohCCll llllllll lll????? -- cgit v1.1