diff options
| author | James Dong <jdong@google.com> | 2012-12-20 18:25:12 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-20 18:25:12 -0800 |
| commit | cc4e6091bd24f84e69d4baf4fce6ceae67676ee5 (patch) | |
| tree | 6277d0e5e817354203dd1514ab7903a791f782df /media/libstagefright/rtsp | |
| parent | 93c4d74d3d6bd953ff711f865bfc5fc92b2888cb (diff) | |
| parent | a45a600d69a5d8ab99eeb7e0dfa58c3cb99a2e61 (diff) | |
| download | frameworks_av-cc4e6091bd24f84e69d4baf4fce6ceae67676ee5.zip frameworks_av-cc4e6091bd24f84e69d4baf4fce6ceae67676ee5.tar.gz frameworks_av-cc4e6091bd24f84e69d4baf4fce6ceae67676ee5.tar.bz2 | |
Merge "Use default values when MPEG4 audio config parsing fails."
Diffstat (limited to 'media/libstagefright/rtsp')
| -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); } |