commit b54cedabdf0261211241e2f3af09c75cffd911ed
author James Dong <jdong@google.com> Thu Dec 20 18:25:12 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 20 18:25:12 2012 -0800
tree 4a6ec04010d7c3a7f4b341131ba50612bc36658e
parent 2a55b5964c6ae167cc1bc57eca5ca7a1c4aa452c
parent 8af5fe5a2431522a7d30bc546dcd31c0c64db70c

Merge "Use default values when MPEG4 audio config parsing fails."

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
index f9a44f0..aa8ffc6 100644
--- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -311,9 +311,7 @@
 
         case 2:
         {
-            // reserved
-            TRESPASS();
-            break;
+            return ERROR_UNSUPPORTED;
         }
 
         case 3:
@@ -460,6 +458,15 @@
             &mFixedFrameLength,
             &mOtherDataPresent, &mOtherDataLenBits);
 
+    if (err == ERROR_UNSUPPORTED) {
+        ALOGW("Failed to parse stream mux config, using default values for playback.");
+        mMuxConfigPresent = false;
+        mNumSubFrames = 0;
+        mFrameLengthType = 0;
+        mOtherDataPresent = false;
+        mOtherDataLenBits = 0;
+        return;
+    }
     CHECK_EQ(err, (status_t)NO_ERROR);
 }