diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-04-25 19:44:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-25 19:44:20 +0000 |
| commit | 50ec7cbf9f77a46a4cafbfb3795d5b12c28785ff (patch) | |
| tree | 52439cab37c35453964e0bdb0e9371fd75494219 /media/jni | |
| parent | 47ffde252e550f86ed99f4b46c6d674bf69bbf37 (diff) | |
| parent | a5e1528f80f0472701dcbfc42d2f45ffc4a16466 (diff) | |
| download | frameworks_base-50ec7cbf9f77a46a4cafbfb3795d5b12c28785ff.zip frameworks_base-50ec7cbf9f77a46a4cafbfb3795d5b12c28785ff.tar.gz frameworks_base-50ec7cbf9f77a46a4cafbfb3795d5b12c28785ff.tar.bz2 | |
Merge "ImageReader: remove RAW_SENSOR format translation"
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_ImageReader.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 716418c..7a86811 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -274,17 +274,11 @@ static int Image_getPixelFormat(JNIEnv* env, int format) fid = env->GetStaticFieldID(imageFormatClazz, "JPEG", "I"); jpegFormat = env->GetStaticIntField(imageFormatClazz, fid); - fid = env->GetStaticFieldID(imageFormatClazz, "RAW_SENSOR", "I"); - rawSensorFormat = env->GetStaticIntField(imageFormatClazz, fid); - // Translate the JPEG to BLOB for camera purpose, an add more if more mismatch is found. + // Translate the JPEG to BLOB for camera purpose. if (format == jpegFormat) { format = HAL_PIXEL_FORMAT_BLOB; } - // Same thing for RAW_SENSOR format - if (format == rawSensorFormat) { - format = HAL_PIXEL_FORMAT_RAW_SENSOR; - } return format; } |