summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-26 16:02:19 -0700
committerAndreas Huber <andih@google.com>2011-08-26 16:02:19 -0700
commitcb67cd1b51ff9ab221e3124cf7e546515fef3c87 (patch)
tree9bc33d4f184b31279929c4f59544444fe5442984 /media/libmediaplayerservice/nuplayer/NuPlayer.cpp
parent8d9d585ce5b1aa284289a27dda048c6317b104e7 (diff)
downloadframeworks_av-cb67cd1b51ff9ab221e3124cf7e546515fef3c87.zip
frameworks_av-cb67cd1b51ff9ab221e3124cf7e546515fef3c87.tar.gz
frameworks_av-cb67cd1b51ff9ab221e3124cf7e546515fef3c87.tar.bz2
Signal errors to the client instead of asserting in ACodec.
Also make sure NuPlayer can properly shutdown in certain edge cases. Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 7fb141a..1f08a91 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -316,9 +316,11 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
&cropLeft, &cropTop, &cropRight, &cropBottom));
LOGV("Video output format changed to %d x %d "
- "(crop: %d, %d, %d, %d)",
+ "(crop: %d x %d @ (%d, %d))",
width, height,
- cropLeft, cropTop, cropRight, cropBottom);
+ (cropRight - cropLeft + 1),
+ (cropBottom - cropTop + 1),
+ cropLeft, cropTop);
notifyListener(
MEDIA_SET_VIDEO_SIZE,