diff options
| author | Chong Zhang <chz@google.com> | 2014-08-12 00:22:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 18:48:29 +0000 |
| commit | dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f (patch) | |
| tree | bc8d6146f69c5ed647262574c86bec7a3d57f1af /media | |
| parent | 306c92dabc524f408445f7da2524c7a5e77ade63 (diff) | |
| parent | f4c0a94ab32541611f5ed6d407fc25b394c1988b (diff) | |
| download | frameworks_av-dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f.zip frameworks_av-dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f.tar.gz frameworks_av-dbdaa08cbed61b9ba4afc43f0ce0230346a1ca2f.tar.bz2 | |
Merge "propogate heartbeat error code to app" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 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 { |