diff options
| author | Andreas Huber <andih@google.com> | 2012-02-22 15:13:44 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 15:13:44 -0800 |
| commit | 79af02c6a813b5d31fba3e7b72686a02f0ae7e0f (patch) | |
| tree | 662f61b610a5b0ee180d4b7940e1e1860b098eab /media/libmediaplayerservice | |
| parent | d6fd85a157ce2054b2304e6d171fa87ae09c363d (diff) | |
| parent | 5778822d86b0337407514b9372562b86edfa91cd (diff) | |
| download | frameworks_av-79af02c6a813b5d31fba3e7b72686a02f0ae7e0f.zip frameworks_av-79af02c6a813b5d31fba3e7b72686a02f0ae7e0f.tar.gz frameworks_av-79af02c6a813b5d31fba3e7b72686a02f0ae7e0f.tar.bz2 | |
Merge "Implementation of a java media codec interface and associated tools."
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index b731d0f..04415cd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -387,10 +387,10 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { audio ? "audio" : "video"); mRenderer->queueEOS(audio, UNKNOWN_ERROR); - } else { - CHECK_EQ((int)what, (int)ACodec::kWhatDrainThisBuffer); - + } else if (what == ACodec::kWhatDrainThisBuffer) { renderBuffer(audio, codecRequest); + } else { + ALOGV("Unhandled codec notification %d.", what); } break; |