diff options
author | James Dong <jdong@google.com> | 2011-10-20 00:19:00 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 00:19:00 -0700 |
commit | e20c2c1775349da6d4a5700f0c7faaa07d62f409 (patch) | |
tree | 99d48f7f1bf93bfbed36ff5bb06d8a6cba61be43 /libvideoeditor | |
parent | ee0ef8b405dd308cae26ead9772e9aea5be6ac14 (diff) | |
parent | a6fa59c6a798f16cb3253da7566023de3991e8aa (diff) | |
download | frameworks_av-e20c2c1775349da6d4a5700f0c7faaa07d62f409.zip frameworks_av-e20c2c1775349da6d4a5700f0c7faaa07d62f409.tar.gz frameworks_av-e20c2c1775349da6d4a5700f0c7faaa07d62f409.tar.bz2 |
am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
* commit 'f23f725773de1eb394655e657cd12f95f6250b3d':
Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-x | libvideoeditor/vss/mcs/src/M4MCS_API.c | 7 | ||||
-rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c index b48dfe7..2ac0be1 100755 --- a/libvideoeditor/vss/mcs/src/M4MCS_API.c +++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c @@ -10575,6 +10575,13 @@ M4OSA_ERR M4MCS_intCheckAndGetCodecProperties( pC->pReaderAudioStream, pC->m_pCurrentAudioDecoderUserData); } + if (M4NO_ERROR != err) { + + M4OSA_TRACE1_1( + "M4MCS_intCheckAndGetCodecProperties: m_pFctCreateAudioDec \ + returns 0x%x", err); + return err; + } pC->m_pAudioDecoder->m_pFctSetOptionAudioDec(pC->pAudioDecCtxt, M4AD_kOptionID_3gpReaderInterface, (M4OSA_DataOption) pC->m_pReaderDataIt); diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp index d73352a..38e667c 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp @@ -341,9 +341,20 @@ M4OSA_ERR VideoEditorAudioDecoder_parse_AAC_DSI(M4OSA_Int8* pDSI, VIDEOEDITOR_CHECK(M4NO_ERROR == err, err); switch( result ) { case 2: + /* Audio Object Type is 2 (AAC Low Complexity) */ pProperties->aPSPresent = 0; pProperties->aSBRPresent = 0; break; + case 5: + /* Audio Object Type is 5 (Spectral Band Replication) */ + pProperties->aPSPresent = 0; + pProperties->aSBRPresent = 1; + break; + case 29: + /* Audio Object Type is 29 (Parametric Stereo) */ + pProperties->aPSPresent = 1; + pProperties->aSBRPresent = 1; + break; default: LOGV("parse_AAC_DSI ERROR : object type %d is not supported", result); |