diff options
author | Camera Software Integration <camswint@localhost> | 2016-12-05 01:40:20 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-05 01:40:20 -0800 |
commit | 1faccedafea1dfd535261d5935e457ba353296ef (patch) | |
tree | 693e4e50e72ae25af6fd0a35e4b9c017b8175e0f /src | |
parent | 221902bd9889403b31a181574d9a16cc0824973e (diff) | |
parent | 6ca2ccc20d75ac92e2423c71e03d04a579838050 (diff) | |
download | android_packages_apps_Snap-1faccedafea1dfd535261d5935e457ba353296ef.tar.gz android_packages_apps_Snap-1faccedafea1dfd535261d5935e457ba353296ef.tar.bz2 android_packages_apps_Snap-1faccedafea1dfd535261d5935e457ba353296ef.zip |
Merge "SnapdragonCamera:Fix preview is flipped on 8996" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--] | src/com/android/camera/imageprocessor/FrameProcessor.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/imageprocessor/FrameProcessor.java b/src/com/android/camera/imageprocessor/FrameProcessor.java index a2ae18c1c..5dc50c4e5 100644..100755 --- a/src/com/android/camera/imageprocessor/FrameProcessor.java +++ b/src/com/android/camera/imageprocessor/FrameProcessor.java @@ -40,6 +40,7 @@ import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; import android.renderscript.Type; +import android.util.Log; import android.util.Size; import android.view.Surface; import android.widget.Toast; @@ -155,10 +156,12 @@ public class FrameProcessor { mRsRotator.set_width(width); mRsRotator.set_height(height); mRsRotator.set_pad(stridePad); - if(mModule.getMainCameraCharacteristics() != null && - mModule.getMainCameraCharacteristics().get(CameraCharacteristics.SENSOR_ORIENTATION) == 270) { - mRsRotator.set_gFlip(true); + int degree = 90; + if(mModule.getMainCameraCharacteristics() != null) { + degree = mModule.getMainCameraCharacteristics(). + get(CameraCharacteristics.SENSOR_ORIENTATION); } + mRsRotator.set_degree(degree); mRsYuvToRGB.set_gIn(mProcessAllocation); mRsYuvToRGB.set_width(height); mRsYuvToRGB.set_height(width); |