diff options
| author | Chong Zhang <chz@google.com> | 2014-08-11 15:14:10 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-08-11 16:31:15 -0700 |
| commit | f4c0a94ab32541611f5ed6d407fc25b394c1988b (patch) | |
| tree | 345e7e7179fa38707c2c82926b14a16ed8f6f4f4 /media | |
| parent | ced1c2f8f6c422063092f5cc5c675ccdebb2dc10 (diff) | |
| download | frameworks_av-f4c0a94ab32541611f5ed6d407fc25b394c1988b.zip frameworks_av-f4c0a94ab32541611f5ed6d407fc25b394c1988b.tar.gz frameworks_av-f4c0a94ab32541611f5ed6d407fc25b394c1988b.tar.bz2 | |
propogate heartbeat error code to app
Bug: 16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018
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 6f6c9d9..4889dbc 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -876,7 +876,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 { |