summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-08-20 14:30:09 -0700
committerWei Jia <wjia@google.com>2014-08-22 14:23:02 -0700
commit3fb9f68dea5d991288f0ea8037742b50c7df5767 (patch)
tree763a8fd629b95444c2bd30e3b1eb99d779905d3e /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
parenta8143b2bbaabc3f704b05078ccc930dbc28591b9 (diff)
downloadframeworks_av-3fb9f68dea5d991288f0ea8037742b50c7df5767.zip
frameworks_av-3fb9f68dea5d991288f0ea8037742b50c7df5767.tar.gz
frameworks_av-3fb9f68dea5d991288f0ea8037742b50c7df5767.tar.bz2
ACodec: handle errors related to native window.
Bug: 17068327 Bug: 13133027 Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 8fce2f4..37ecbf1 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";
}