summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-09-18 08:00:02 -0700
committerZhijun He <zhijunhe@google.com>2013-09-18 10:30:50 -0700
commit4eda9f5359347c11914e47f477535c9533674d32 (patch)
tree24907a83b37a6311307b67b80763bba0dc9c2920 /media/jni
parentc255a7113a6a6b058f1b3b5b128fba1d24bbd3d9 (diff)
downloadframeworks_base-4eda9f5359347c11914e47f477535c9533674d32.zip
frameworks_base-4eda9f5359347c11914e47f477535c9533674d32.tar.gz
frameworks_base-4eda9f5359347c11914e47f477535c9533674d32.tar.bz2
ImageReader: disable NV21 support
Bug: 10787131 Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_media_ImageReader.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index a03dbf3..0030dbd 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -721,13 +721,18 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz,
return ACQUIRE_NO_BUFFERS;
}
+ if (buffer->format == HAL_PIXEL_FORMAT_YCrCb_420_SP) {
+ jniThrowException(env, "java/lang/UnsupportedOperationException",
+ "NV21 format is not supported by ImageReader");
+ return -1;
+ }
+
// Check if the left-top corner of the crop rect is origin, we currently assume this point is
// zero, will revist this once this assumption turns out problematic.
Point lt = buffer->crop.leftTop();
if (lt.x != 0 || lt.y != 0) {
- ALOGE("crop left: %d, top = %d", lt.x, lt.y);
- jniThrowException(env, "java/lang/UnsupportedOperationException",
- "crop left top corner need to at origin");
+ jniThrowExceptionFmt(env, "java/lang/UnsupportedOperationException",
+ "crop left top corner [%d, %d] need to be at origin", lt.x, lt.y);
return -1;
}