diff options
| author | Eric Laurent <elaurent@google.com> | 2011-09-27 10:32:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 10:32:17 -0700 |
| commit | 82fd03b854a5e6879dc9eb6d57962414e7082894 (patch) | |
| tree | 761dbf7ef3ac4853c5b0e3806568376ddf639141 /media | |
| parent | 797ab6072402b12721dc226a9ebde3546e7640e9 (diff) | |
| parent | 9cb839a0fcc98fe4278b39afb8b6d664c04f1673 (diff) | |
| download | frameworks_av-82fd03b854a5e6879dc9eb6d57962414e7082894.zip frameworks_av-82fd03b854a5e6879dc9eb6d57962414e7082894.tar.gz frameworks_av-82fd03b854a5e6879dc9eb6d57962414e7082894.tar.bz2 | |
Merge "Fix issue 5373048: AudioCache decode errors"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 0386d4b..b5eef94 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -52,6 +52,7 @@ #include <media/Metadata.h> #include <media/AudioTrack.h> #include <media/MemoryLeakTrackUtil.h> +#include <media/stagefright/MediaErrors.h> #include <system/audio.h> @@ -1132,7 +1133,11 @@ sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, i player->start(); LOGV("wait for playback complete"); - if (cache->wait() != NO_ERROR) goto Exit; + cache->wait(); + // in case of error, return what was successfully decoded. + if (cache->size() == 0) { + goto Exit; + } mem = new MemoryBase(cache->getHeap(), 0, cache->size()); *pSampleRate = cache->sampleRate(); @@ -1175,7 +1180,11 @@ sp<IMemory> MediaPlayerService::decode(int fd, int64_t offset, int64_t length, u player->start(); LOGV("wait for playback complete"); - if (cache->wait() != NO_ERROR) goto Exit; + cache->wait(); + // in case of error, return what was successfully decoded. + if (cache->size() == 0) { + goto Exit; + } mem = new MemoryBase(cache->getHeap(), 0, cache->size()); *pSampleRate = cache->sampleRate(); |