From 067d85f08851d08994d4a83865529d88cb6c333e Mon Sep 17 00:00:00 2001 From: Abhijit Trivedi Date: Sat, 11 Nov 2017 14:21:45 -0800 Subject: Revert latest SnapdragonCamera Promotion reverts commit db126f27692565bba5f45f0523df6449e1654ba2. reverts commit 85076fda04296ed1ba8f41bf1f5bdb4e56716749. Change-Id: Idc8dffc562d09a3e6369121465e1c8cd352d9979 --- src/com/android/camera/CaptureModule.java | 30 +--- src/com/android/camera/SettingsManager.java | 3 - .../camera/imageprocessor/PostProcessor.java | 7 +- .../imageprocessor/filter/DeepZoomFilter.java | 178 --------------------- 4 files changed, 5 insertions(+), 213 deletions(-) delete mode 100755 src/com/android/camera/imageprocessor/filter/DeepZoomFilter.java (limited to 'src') diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index eeed50a19..3cff8aad1 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -262,7 +262,6 @@ public class CaptureModule implements CameraModule, PhotoController, private boolean[] mTakingPicture = new boolean[MAX_NUM_CAM]; private int mControlAFMode = CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE; - private int mLastAFmode = mControlAFMode; private int mLastResultAFState = -1; private Rect[] mCropRegion = new Rect[MAX_NUM_CAM]; private boolean mAutoFocusRegionSupported; @@ -2129,7 +2128,7 @@ public class CaptureModule implements CameraModule, PhotoController, private void applyCommonSettings(CaptureRequest.Builder builder, int id) { builder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO); - applyAfModes(builder); + builder.set(CaptureRequest.CONTROL_AF_MODE, mControlAFMode); applyFaceDetection(builder); applyWhiteBalance(builder); applyExposure(builder); @@ -2141,6 +2140,7 @@ public class CaptureModule implements CameraModule, PhotoController, applySaturationLevel(builder); applyAntiBandingLevel(builder); applySharpnessControlModes(builder); + applyAfModes(builder); applyExposureMeteringModes(builder); applyHistogram(builder); } @@ -2346,8 +2346,6 @@ public class CaptureModule implements CameraModule, PhotoController, return PostProcessor.FILTER_SHARPSHOOTER; } else if (mode == SettingsManager.SCENE_MODE_BESTPICTURE_INT) { return PostProcessor.FILTER_BESTPICTURE; - } else if (mode == SettingsManager.SCENE_MODE_DEEPZOOM_INT) { - return PostProcessor.FILTER_DEEPZOOM; } return PostProcessor.FILTER_NONE; } @@ -4039,19 +4037,10 @@ public class CaptureModule implements CameraModule, PhotoController, private void applyAfModes(CaptureRequest.Builder request) { String value = mSettingsManager.getValue(SettingsManager.KEY_AF_MODE); - int intValue = mLastAFmode; if (value != null) { - intValue = Integer.parseInt(value); - } - if (mLastAFmode != intValue) { - // means afmode value changed manually + int intValue = Integer.parseInt(value); request.set(CaptureRequest.CONTROL_AF_MODE, intValue); - mControlAFMode = intValue; - } else { - request.set(CaptureRequest.CONTROL_AF_MODE, mControlAFMode); - mSettingsManager.setValue(SettingsManager.KEY_AF_MODE, String.valueOf(mControlAFMode)); } - mLastAFmode = mControlAFMode; } private void applyExposureMeteringModes(CaptureRequest.Builder request) { @@ -4672,17 +4661,6 @@ public class CaptureModule implements CameraModule, PhotoController, return false; } - private boolean isDeepZoom(String value) { - try { - int mode = Integer.parseInt(value); - if(mode == SettingsManager.SCENE_MODE_DEEPZOOM_INT) { - return true; - } - } catch(Exception e) { - } - return false; - } - private void updateFaceDetection() { final String value = mSettingsManager.getValue(SettingsManager.KEY_FACE_DETECTION); mActivity.runOnUiThread(new Runnable() { @@ -5260,4 +5238,4 @@ class DrawAutoHDR2 extends View{ public void setCaptureModuleObject (CaptureModule captureModule) { mCaptureModule = captureModule; } -} \ No newline at end of file +} diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 70d8a4ed0..c99702708 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -57,7 +57,6 @@ import com.android.camera.imageprocessor.filter.SharpshooterFilter; import com.android.camera.imageprocessor.filter.StillmoreFilter; import com.android.camera.imageprocessor.filter.TrackingFocusFrameListener; import com.android.camera.imageprocessor.filter.UbifocusFilter; -import com.android.camera.imageprocessor.filter.DeepZoomFilter; import com.android.camera.ui.ListMenu; import com.android.camera.ui.PanoCaptureProcessView; import com.android.camera.ui.TrackingFocusRenderer; @@ -98,7 +97,6 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final int SCENE_MODE_SHARPSHOOTER_INT = SCENE_MODE_CUSTOM_START + 7; public static final int SCENE_MODE_TRACKINGFOCUS_INT = SCENE_MODE_CUSTOM_START + 8; public static final int SCENE_MODE_PROMODE_INT = SCENE_MODE_CUSTOM_START + 9; - public static final int SCENE_MODE_DEEPZOOM_INT = SCENE_MODE_CUSTOM_START + 10; public static final String SCENE_MODE_DUAL_STRING = "100"; public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key"; public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key"; @@ -1307,7 +1305,6 @@ public class SettingsManager implements ListMenu.SettingsListener { if (BlurbusterFilter.isSupportedStatic()) modes.add(SCENE_MODE_BLURBUSTER_INT + ""); if (SharpshooterFilter.isSupportedStatic()) modes.add(SCENE_MODE_SHARPSHOOTER_INT + ""); if (TrackingFocusFrameListener.isSupportedStatic()) modes.add(SCENE_MODE_TRACKINGFOCUS_INT + ""); - if (DeepZoomFilter.isSupportedStatic()) modes.add(SCENE_MODE_DEEPZOOM_INT + ""); modes.add("" + SCENE_MODE_PROMODE_INT); for (int mode : sceneModes) { modes.add("" + mode); diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index d0ce4a6a1..d70743be9 100644 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -68,7 +68,6 @@ import com.android.camera.imageprocessor.filter.OptizoomFilter; import com.android.camera.imageprocessor.filter.SharpshooterFilter; import com.android.camera.imageprocessor.filter.StillmoreFilter; import com.android.camera.imageprocessor.filter.UbifocusFilter; -import com.android.camera.imageprocessor.filter.DeepZoomFilter; import com.android.camera.ui.RotateTextToast; import java.io.ByteArrayOutputStream; @@ -100,8 +99,7 @@ public class PostProcessor{ public static final int FILTER_BESTPICTURE = 5; public static final int FILTER_CHROMAFLASH = 6; public static final int FILTER_BLURBUSTER = 7; - public static final int FILTER_DEEPZOOM = 8; - public static final int FILTER_MAX = 9; + public static final int FILTER_MAX = 8; //BestPicture requires 10 which is the biggest among filters private static final int MAX_REQUIRED_IMAGE_NUM = 11; @@ -877,9 +875,6 @@ public class PostProcessor{ case FILTER_CHROMAFLASH: mFilter = new ChromaflashFilter(mController); break; - case FILTER_DEEPZOOM: - mFilter = new DeepZoomFilter(mController); - break; } } diff --git a/src/com/android/camera/imageprocessor/filter/DeepZoomFilter.java b/src/com/android/camera/imageprocessor/filter/DeepZoomFilter.java deleted file mode 100755 index 003b4582f..000000000 --- a/src/com/android/camera/imageprocessor/filter/DeepZoomFilter.java +++ /dev/null @@ -1,178 +0,0 @@ -/* -Copyright (c) 2017, The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.android.camera.imageprocessor.filter; - -import android.graphics.Rect; -import android.hardware.camera2.CameraAccessException; -import android.hardware.camera2.CameraCaptureSession; -import android.hardware.camera2.CameraCharacteristics; -import android.hardware.camera2.CameraDevice; -import android.hardware.camera2.CaptureRequest; -import android.hardware.camera2.CaptureResult; -import android.hardware.camera2.TotalCaptureResult; -import android.os.Handler; -import android.util.Log; - -import com.android.camera.CaptureModule; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; - -public class DeepZoomFilter implements ImageFilter{ - public static final int NUM_REQUIRED_IMAGE = 1; - private int mWidth; - private int mHeight; - private int mStrideY; - private int mStrideVU; - private static String TAG = "DeepZoomFilter"; - - private static boolean mIsSupported = false; - private ByteBuffer mOutBuf; - private CaptureModule mModule; - private int mImageNum = -1; - - private static void Log(String msg) { - if(DEBUG) { - Log.d(TAG, msg); - } - } - - public DeepZoomFilter(CaptureModule module) { - mModule = module; - } - - @Override - public List setRequiredImages(CaptureRequest.Builder builder) { - List list = new ArrayList(); - for(int i=0; i < NUM_REQUIRED_IMAGE; i++) { - list.add(builder.build()); - } - return list; - } - - @Override - public String getStringName() { - return TAG; - } - - @Override - public int getNumRequiredImage() { - return NUM_REQUIRED_IMAGE; - } - - @Override - public void init(int width, int height, int strideY, int strideVU) { - Log("init"); - mWidth = width/2*2; - mHeight = height/2*2; - mStrideY = strideY/2*2; - mStrideVU = strideVU/2*2; - mOutBuf = ByteBuffer.allocate(mStrideY*mHeight*3/2); - mImageNum = -1; - Log("width: "+mWidth+" height: "+mHeight+" strideY: "+mStrideY+" strideVU: "+mStrideVU); - nativeInit(mWidth, mHeight, mStrideY, mStrideVU, - 0, 0, mWidth, mHeight, NUM_REQUIRED_IMAGE); - } - - @Override - public void deinit() { - Log("deinit"); - mOutBuf = null; - mImageNum = -1; - nativeDeinit(); - } - - @Override - public void addImage(ByteBuffer bY, ByteBuffer bVU, int imageNum, Object param) { - Log("addImage imageNum :" + imageNum); - int yActualSize = bY.remaining(); - int vuActualSize = bVU.remaining(); - mImageNum = imageNum; - int status = nativeAddImage(bY, bVU, yActualSize, vuActualSize, imageNum); - Log("addImage status :" + status); - if(status != 0) { - Log.e(TAG, "Fail to add image"); - } - } - - @Override - public ResultImage processImage() { - float zoomValue = mModule.getZoomValue(); - Log("processImage zoomValue :" + zoomValue); - int[] roi = new int[4]; - int status = nativeProcessImage(mOutBuf.array(), zoomValue, roi); - Log("processImage done status :" + status); - mImageNum = -1; - if(status < 0) { //In failure case, library will return the first image as it is. - Log.w(TAG, "Fail to process the image."); - } - return new ResultImage(mOutBuf, new Rect(roi[0], roi[1], roi[0]+roi[2], roi[1] + roi[3]), mWidth, mHeight, mStrideY); - } - - @Override - public boolean isSupported() { - return mIsSupported; - } - - @Override - public boolean isFrameListener() { - return false; - } - - @Override - public boolean isManualMode() { - return false; - } - - @Override - public void manualCapture(final CaptureRequest.Builder builder, final CameraCaptureSession captureSession, - final CameraCaptureSession.CaptureCallback callback, final Handler handler) throws CameraAccessException { - } - - public static boolean isSupportedStatic() { - return mIsSupported; - } - - private native int nativeInit(int width, int height, int yStride, int vuStride, - int roiX, int roiY, int roiW, int roiH, int numImages); - private native int nativeDeinit(); - private native int nativeAddImage(ByteBuffer yB, ByteBuffer vuB, int ySize, int vuSize, int imageNum); - private native int nativeProcessImage(byte[] buffer, float zoomValue, int[] roi); - - static { - try { - System.loadLibrary("jni_deepzoom"); - mIsSupported = true; - }catch(UnsatisfiedLinkError e) { - Log.d(TAG, e.toString()); - mIsSupported = false; - } - } -} -- cgit v1.2.3