summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-05-21 10:02:14 -0700
committerAndreas Huber <andih@google.com>2012-05-21 10:06:42 -0700
commite35ac2860e99d809a2ccca59bd4eb2f8c02d15ad (patch)
treede93d3a9fafe23a6d7f9e97ffa0e0a1148c74cf3 /media/libstagefright/codecs/aacdec/SoftAAC2.cpp
parent8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc (diff)
downloadframeworks_av-e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad.zip
frameworks_av-e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad.tar.gz
frameworks_av-e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad.tar.bz2
Add more verbose ADTS error logging to SoftAAC.
and fix the corresponding code in SoftAAC2. Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912 related-to-bug: 6519161
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 9f6db4c..76c3854 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -367,17 +367,17 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) {
inHeader->nOffset += adtsHeaderSize;
inHeader->nFilledLen -= adtsHeaderSize;
}
+ }
- if (signalError) {
- mSignalledError = true;
+ if (signalError) {
+ mSignalledError = true;
- notify(OMX_EventError,
- OMX_ErrorStreamCorrupt,
- ERROR_MALFORMED,
- NULL);
+ notify(OMX_EventError,
+ OMX_ErrorStreamCorrupt,
+ ERROR_MALFORMED,
+ NULL);
- return;
- }
+ return;
}
} else {
inBuffer[0] = inHeader->pBuffer + inHeader->nOffset;