diff options
| author | Wei Jia <wjia@google.com> | 2014-08-22 21:53:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 21:53:39 +0000 |
| commit | d1de9bb33a2f645fb9dc54e7fc69ca45304850a5 (patch) | |
| tree | d28fd9f147cc6aac57dacd89ee5516c0791d8564 /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | |
| parent | 7992a5d0f6d995d46bf649dbac45e0e8267f1397 (diff) | |
| parent | 3fb9f68dea5d991288f0ea8037742b50c7df5767 (diff) | |
| download | frameworks_av-d1de9bb33a2f645fb9dc54e7fc69ca45304850a5.zip frameworks_av-d1de9bb33a2f645fb9dc54e7fc69ca45304850a5.tar.gz frameworks_av-d1de9bb33a2f645fb9dc54e7fc69ca45304850a5.tar.bz2 | |
Merge "ACodec: handle errors related to native window." into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 60c645a..47c46d6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -478,10 +478,13 @@ void NuPlayer::Decoder::onShutdown() { if (mNativeWindow != NULL) { // reconnect to surface as MediaCodec disconnected from it - CHECK_EQ((int)NO_ERROR, + status_t error = native_window_api_connect( mNativeWindow->getNativeWindow().get(), - NATIVE_WINDOW_API_MEDIA)); + NATIVE_WINDOW_API_MEDIA); + ALOGW_IF(error != NO_ERROR, + "[%s] failed to connect to native window, error=%d", + mComponentName.c_str(), error); } mComponentName = "decoder"; } |