commit dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f
author Chong Zhang <chz@google.com> Tue Aug 12 00:22:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 11 18:48:29 2014 +0000
tree bc8d6146f69c5ed647262574c86bec7a3d57f1af
parent 306c92dabc524f408445f7da2524c7a5e77ade63
parent f4c0a94ab32541611f5ed6d407fc25b394c1988b

Merge "propogate heartbeat error code to app" into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 55fd708..9a4e811 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -901,7 +901,11 @@
                 ALOGE("Received error from %s decoder, aborting playback.",
                      audio ? "audio" : "video");
 
-                mRenderer->queueEOS(audio, UNKNOWN_ERROR);
+                status_t err;
+                if (!msg->findInt32("err", &err)) {
+                    err = UNKNOWN_ERROR;
+                }
+                mRenderer->queueEOS(audio, err);
             } else if (what == Decoder::kWhatDrainThisBuffer) {
                 renderBuffer(audio, msg);
             } else {