commit 1bc36cafe025ff247b839a2e153b4317e845229f
author Eric Laurent <elaurent@google.com> Tue Sep 27 10:40:33 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 27 10:40:33 2011 -0700
tree 4fba45964efc2c8461c10a3e2e7c7cbceca4c592
parent 078741e31e648d5d7585bb8b6729806e8cc55f69
parent 82fd03b854a5e6879dc9eb6d57962414e7082894

am 53719fc4: Merge "Fix issue 5373048: AudioCache decode errors"

* commit '53719fc4c5c441e8696f26bbfb9166b0bd19ef29':
  Fix issue 5373048: AudioCache decode errors

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index a434614..b7d2b5c 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>
 
@@ -1165,7 +1166,11 @@
     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();
@@ -1208,7 +1213,11 @@
     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();