diff options
| author | James Dong <jdong@google.com> | 2012-12-28 09:46:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-28 09:46:54 -0800 |
| commit | 41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429 (patch) | |
| tree | 38b4cd3972ae0424c389395524737c41cbdc7bec /media | |
| parent | 856ff4e4c3c43550f013e80277358fdf514342bf (diff) | |
| parent | 035f6c9c06791b75e6162433c6b2106d8f1851fb (diff) | |
| download | frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.zip frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.tar.gz frameworks_av-41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429.tar.bz2 | |
am cd2d2631: am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails."
* commit 'cd2d263116576dc9770d31bb792e7cf2d6840b53':
Use default values when MPEG4 audio config parsing fails.
Diffstat (limited to 'media')
| -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 f9a44f0..aa8ffc6 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); } |