diff options
author | James Dong <jdong@google.com> | 2012-12-21 10:05:52 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-21 10:05:52 -0800 |
commit | cd2d263116576dc9770d31bb792e7cf2d6840b53 (patch) | |
tree | e5295b8e0efb8a7233c398aabfa0fc18da9b70cb /media/libstagefright | |
parent | 9c891ca36a7f2acecd70d41ff39a2025048bb0b1 (diff) | |
parent | b54cedabdf0261211241e2f3af09c75cffd911ed (diff) |
am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."
* commit 'b54cedabdf0261211241e2f3af09c75cffd911ed':
Use default values when MPEG4 audio config parsing fails.
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp index f9a44f02..aa8ffc65 100644 --- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp @@ -311,9 +311,7 @@ static status_t parseStreamMuxConfig( case 2: { - // reserved - TRESPASS(); - break; + return ERROR_UNSUPPORTED; } case 3: @@ -460,6 +458,15 @@ AMPEG4AudioAssembler::AMPEG4AudioAssembler( &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); } |