diff options
| author | Andreas Huber <andih@google.com> | 2010-05-13 09:15:21 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-13 09:19:35 -0700 |
| commit | a945bfd91aa291fba4d9201ffcb38fce40eab7fe (patch) | |
| tree | daf784212302922f821dbcf99d85e55697ac610d /media/libstagefright/AwesomePlayer.cpp | |
| parent | d2333bda49f9d76f1b30b81dfc093d407bc6dbf0 (diff) | |
| download | frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.zip frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.tar.gz frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.tar.bz2 | |
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 475160e..f668caa 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -778,7 +778,12 @@ status_t AwesomePlayer::initAudioDecoder() { } } - mAudioSource->start(); + status_t err = mAudioSource->start(); + + if (err != OK) { + mAudioSource.clear(); + return err; + } } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_QCELP)) { // For legacy reasons we're simply going to ignore the absence // of an audio decoder for QCELP instead of aborting playback |