Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-release

2 files changed, 18 insertions, 0 deletions

diff --git a/vss/mcs/src/M4MCS_API.c b/vss/mcs/src/M4MCS_API.c
index b48dfe7..2ac0be1 100755
--- a/vss/mcs/src/M4MCS_API.c
+++ b/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/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp b/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
index d73352a..38e667c 100755
--- a/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
+++ b/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);