Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev

Browse Source
This commit is contained in:
Chien-Yu Chen
2015-06-19 19:51:40 +00:00
committed by Android (Google) Code Review
parent f3e8dca84b 0782aab077
commit be2e38e01c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
View File

@@ -630,8 +630,6 @@ public class SurfaceTextureRenderer {
holder.width = surfaceSize.getWidth();
holder.height = surfaceSize.getHeight();
if (LegacyCameraDevice.needsConversion(s)) {
// Always override to YV12 output for YUV surface formats.
LegacyCameraDevice.setSurfaceFormat(s, ImageFormat.YV12);
mConversionSurfaces.add(holder);
} else {
mSurfaces.add(holder);

5
media/jni/android_media_ImageReader.cpp
View File

@@ -1240,8 +1240,11 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat)
return static_cast<jint>(PublicFormat::PRIVATE);
} else {
CpuConsumer::LockedBuffer* buffer = Image_getLockedBuffer(env, thiz);
int readerHalFormat = android_view_Surface_mapPublicFormatToHalFormat(
static_cast<PublicFormat>(readerFormat));
int32_t fmt = applyFormatOverrides(buffer->flexFormat, readerHalFormat);
PublicFormat publicFmt = android_view_Surface_mapHalFormatDataspaceToPublicFormat(
buffer->flexFormat, buffer->dataSpace);
fmt, buffer->dataSpace);
return static_cast<jint>(publicFmt);
}
}