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

am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

Browse Source 
* commit 'a5f301c7fb048461197a6032f66b35772a3157f9':
  Legacy: Only set user surface dimensions on output surfaces
This commit is contained in:
Eino-Ville Talvala
2015-02-12 05:39:05 +00:00
committed by Android Git Automerger
parent f99551d8a1 a5f301c7fb
commit 4fa3a80b6c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
View File

@@ -598,15 +598,10 @@ static jint LegacyCameraDevice_nativeSetSurfaceDimens(JNIEnv* env, jobject thiz,
ALOGE("%s: Could not retrieve native window from surface.", __FUNCTION__); ALOGE("%s: Could not retrieve native window from surface.", __FUNCTION__);
return BAD_VALUE; return BAD_VALUE;
} }
status_t err = native_window_set_buffers_dimensions(anw.get(), width, height);
if (err != NO_ERROR) {
ALOGE("%s: Error while setting surface dimens %s (%d).", __FUNCTION__, strerror(-err), err);
return err;
}
// WAR - Set user dimensions also to avoid incorrect scaling after TextureView orientation // Set user dimensions only
// change. // The producer dimensions are owned by GL
err = native_window_set_buffers_user_dimensions(anw.get(), width, height); status_t err = native_window_set_buffers_user_dimensions(anw.get(), width, height);
if (err != NO_ERROR) { if (err != NO_ERROR) {
ALOGE("%s: Error while setting surface user dimens %s (%d).", __FUNCTION__, strerror(-err), ALOGE("%s: Error while setting surface user dimens %s (%d).", __FUNCTION__, strerror(-err),
err); err);
@@ -750,4 +745,3 @@ int register_android_hardware_camera2_legacy_LegacyCameraDevice(JNIEnv* env)
gCameraDeviceMethods, gCameraDeviceMethods,
NELEM(gCameraDeviceMethods)); NELEM(gCameraDeviceMethods));
} }