diff options
Diffstat (limited to 'src/com/android/camera/imageprocessor')
7 files changed, 367 insertions, 11 deletions
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index f39845346..8c0d2ff88 100644 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -29,9 +29,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package com.android.camera.imageprocessor; import android.content.ContentResolver; +import android.content.Context; import android.graphics.ImageFormat; import android.graphics.Rect; import android.graphics.YuvImage; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureRequest; import android.media.Image; import android.media.ImageReader; @@ -50,9 +53,11 @@ import com.android.camera.SettingsManager; import com.android.camera.exif.ExifInterface; import com.android.camera.imageprocessor.filter.OptizoomFilter; import com.android.camera.imageprocessor.filter.SharpshooterFilter; +import com.android.camera.imageprocessor.filter.UbifocusFilter; import com.android.camera.ui.RotateTextToast; import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -70,7 +75,8 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ public static final int FILTER_NONE = 0; public static final int FILTER_OPTIZOOM = 1; public static final int FILTER_SHARPSHOOTER = 2; - public static final int FILTER_MAX = 3; + public static final int FILTER_UBIFOCUS = 3; + public static final int FILTER_MAX = 4; private int mCurrentNumImage = 0; private ImageFilter mFilter; @@ -86,6 +92,7 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ private Image[] mImages; private PhotoModule.NamedImages mNamedImages; private WatchdogThread mWatchdog; + private int mOrientation = 0; //This is for the debug feature. private static boolean DEBUG_FILTER = false; @@ -139,11 +146,17 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ } } + public boolean isManualMode() { + return mFilter.isManualMode(); + } + + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) throws CameraAccessException { + mFilter.manualCapture(builder, captureSession, callback, handler); + } + public boolean isFilterOn() { - if(mFilter != null) { - return true; - } - if(mController.getFrameFilters().size() != 0) { + if (mFilter != null) { return true; } return false; @@ -269,6 +282,9 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ case FILTER_SHARPSHOOTER: mFilter = new SharpshooterFilter(mController); break; + case FILTER_UBIFOCUS: + mFilter = new UbifocusFilter(mController, mActivity); + break; } } @@ -333,6 +349,7 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ if(mWatchdog != null) { mWatchdog.startMonitor(); } + mOrientation = CameraUtil.getJpegRotation(mController.getMainCameraId(), mController.getDisplayOrientation()); } if(mFilter != null && mCurrentNumImage >= mFilter.getNumRequiredImage()) { return; @@ -374,7 +391,7 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ }); } - private byte[] addExifTags(byte[] jpeg, int orientationInDegree) { + public static byte[] addExifTags(byte[] jpeg, int orientationInDegree) { ExifInterface exif = new ExifInterface(); exif.addOrientationTag(orientationInDegree); exif.addDateTimeStampTag(ExifInterface.TAG_DATE_TIME, System.currentTimeMillis(), @@ -434,17 +451,16 @@ public class PostProcessor implements ImageReader.OnImageAvailableListener{ ) { Log.e(TAG, "Processed outRoi is not within picture range"); } else { - int orientation = CameraUtil.getJpegRotation(mController.getMainCameraId(), mController.getDisplayOrientation()); if(mFilter != null && DEBUG_FILTER) { - bytes = nv21ToJpeg(mDebugResultImage, orientation); + bytes = nv21ToJpeg(mDebugResultImage, mOrientation); mActivity.getMediaSaveService().addImage( bytes, title + "_beforeApplyingFilter", date, null, mDebugResultImage.outRoi.width(), mDebugResultImage.outRoi.height(), - orientation, null, mediaSavedListener, contentResolver, "jpeg"); + mOrientation, null, mediaSavedListener, contentResolver, "jpeg"); } - bytes = nv21ToJpeg(resultImage, orientation); + bytes = nv21ToJpeg(resultImage, mOrientation); mActivity.getMediaSaveService().addImage( bytes, title, date, null, resultImage.outRoi.width(), resultImage.outRoi.height(), - orientation, null, mediaSavedListener, contentResolver, "jpeg"); + mOrientation, null, mediaSavedListener, contentResolver, "jpeg"); mController.updateThumbnailJpegData(bytes); } } diff --git a/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java b/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java index 7a13895f4..77e6ead6e 100644 --- a/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java +++ b/src/com/android/camera/imageprocessor/filter/BeautificationFilter.java @@ -30,8 +30,10 @@ package com.android.camera.imageprocessor.filter; import android.graphics.Rect; import android.hardware.Camera; +import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.params.Face; +import android.os.Handler; import android.util.Log; import android.util.Size; @@ -120,11 +122,26 @@ public class BeautificationFilter implements ImageFilter { return mIsSupported; } + public static boolean isSupportedStatic() { + return mIsSupported; + } + @Override public boolean isFrameListener() { return false; } + @Override + public boolean isManualMode() { + return false; + } + + @Override + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) { + + } + private native int nativeBeautificationProcess(ByteBuffer yB, ByteBuffer vuB, int width, int height, int stride, int fleft, int ftop, int fright, int fbottom); diff --git a/src/com/android/camera/imageprocessor/filter/ImageFilter.java b/src/com/android/camera/imageprocessor/filter/ImageFilter.java index b778dee03..bb581c965 100644 --- a/src/com/android/camera/imageprocessor/filter/ImageFilter.java +++ b/src/com/android/camera/imageprocessor/filter/ImageFilter.java @@ -29,7 +29,10 @@ 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.CaptureRequest; +import android.os.Handler; import java.nio.ByteBuffer; import java.util.List; @@ -41,6 +44,7 @@ public interface ImageFilter { String getStringName(); + /* This is used for auto mode burst picture */ int getNumRequiredImage(); void init(int width, int height, int strideY, int strideVU); @@ -72,5 +76,13 @@ public interface ImageFilter { } } + /* Whether it is post proc filter or frame proc filter */ boolean isFrameListener(); + + /* Whether it will use burst capture or manual capture */ + boolean isManualMode(); + + /* if it's manual mode, this function has to be implemented */ + void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) throws CameraAccessException; } diff --git a/src/com/android/camera/imageprocessor/filter/OptizoomFilter.java b/src/com/android/camera/imageprocessor/filter/OptizoomFilter.java index 16b8ae163..486ea7a0c 100644 --- a/src/com/android/camera/imageprocessor/filter/OptizoomFilter.java +++ b/src/com/android/camera/imageprocessor/filter/OptizoomFilter.java @@ -29,7 +29,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package com.android.camera.imageprocessor.filter; import android.graphics.Rect; +import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureRequest; +import android.os.Handler; import android.util.Log; import com.android.camera.CaptureModule; @@ -132,6 +134,16 @@ public class OptizoomFilter implements ImageFilter{ return false; } + @Override + public boolean isManualMode() { + return false; + } + + @Override + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) { + } + public static boolean isSupportedStatic() { return mIsSupported; } diff --git a/src/com/android/camera/imageprocessor/filter/SharpshooterFilter.java b/src/com/android/camera/imageprocessor/filter/SharpshooterFilter.java index e123f3439..c51e13c59 100644 --- a/src/com/android/camera/imageprocessor/filter/SharpshooterFilter.java +++ b/src/com/android/camera/imageprocessor/filter/SharpshooterFilter.java @@ -29,9 +29,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package com.android.camera.imageprocessor.filter; import android.graphics.Rect; +import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; +import android.os.Handler; import android.util.Log; import android.util.Range; import android.util.Rational; @@ -155,6 +157,17 @@ public class SharpshooterFilter implements ImageFilter{ return false; } + @Override + public boolean isManualMode() { + return false; + } + + @Override + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) { + + } + public static boolean isSupportedStatic() { return mIsSupported; } diff --git a/src/com/android/camera/imageprocessor/filter/TrackingFocusFrameListener.java b/src/com/android/camera/imageprocessor/filter/TrackingFocusFrameListener.java index a12eef91a..8d9a7fc1a 100644 --- a/src/com/android/camera/imageprocessor/filter/TrackingFocusFrameListener.java +++ b/src/com/android/camera/imageprocessor/filter/TrackingFocusFrameListener.java @@ -32,8 +32,10 @@ package com.android.camera.imageprocessor.filter; import android.graphics.Point; import android.graphics.Rect; import android.hardware.Camera; +import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.params.Face; +import android.os.Handler; import android.util.Log; import android.util.Size; @@ -256,11 +258,26 @@ public class TrackingFocusFrameListener implements ImageFilter { return mIsSupported; } + public static boolean isSupportedStatic() { + return mIsSupported; + } + @Override public boolean isFrameListener() { return true; } + @Override + public boolean isManualMode() { + return false; + } + + @Override + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) { + + } + private native int nInit(int operationMode, int precision, int width, int height, int stride); private native void nRelease(); private native int nGetMinRoiDimension(); diff --git a/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java b/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java new file mode 100644 index 000000000..b410e01b4 --- /dev/null +++ b/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java @@ -0,0 +1,269 @@ +/* +Copyright (c) 2016, 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.app.ProgressDialog; +import android.content.Context; +import android.graphics.Camera; +import android.graphics.ImageFormat; +import android.graphics.Rect; +import android.graphics.YuvImage; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCaptureSession; +import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CaptureRequest; +import android.hardware.camera2.CaptureResult; +import android.os.Handler; +import android.util.Log; +import android.util.Range; + +import com.android.camera.CameraActivity; +import com.android.camera.CaptureModule; +import com.android.camera.imageprocessor.PostProcessor; +import com.android.camera.util.CameraUtil; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +public class UbifocusFilter implements ImageFilter { + public static final int NUM_REQUIRED_IMAGE = 5; + private int mWidth; + private int mHeight; + private int mStrideY; + private int mStrideVU; + private static String TAG = "UbifocusFilter"; + private static final boolean DEBUG = true; + private static final int FOCUS_ADJUST_TIME_OUT = 200; + private static final int META_BYTES_SIZE = 25; + private int temp; + private static boolean mIsSupported = true; + private ByteBuffer mOutBuf; + private CaptureModule mModule; + private CameraActivity mActivity; + private int mOrientation = 0; + private float mMinFocusDistance = -1f; + final String[] NAMES = {"00.jpg", "01.jpg", "02.jpg", "03.jpg", + "04.jpg", "DepthMapImage.y", "AllFocusImage.jpg"}; + + private static void Log(String msg) { + if (DEBUG) { + Log.d(TAG, msg); + } + } + + public UbifocusFilter(CaptureModule module, CameraActivity activity) { + mModule = module; + mActivity = activity; + } + + @Override + public List<CaptureRequest> setRequiredImages(CaptureRequest.Builder builder) { + return null; + } + + @Override + public String getStringName() { + return "UbifocusFilter"; + } + + @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); + Log("width: "+mWidth+" height: "+mHeight+" strideY: "+mStrideY+" strideVU: "+mStrideVU); + nativeInit(mWidth, mHeight, mStrideY, mStrideVU, NUM_REQUIRED_IMAGE); + } + + @Override + public void deinit() { + Log("deinit"); + mOutBuf = null; + nativeDeinit(); + } + + @Override + public void addImage(ByteBuffer bY, ByteBuffer bVU, int imageNum, Object param) { + Log("addImage"); + if(imageNum == 0) { + mModule.setRefocusLastTaken(false); + mOrientation = CameraUtil.getJpegRotation(mModule.getMainCameraId(), mModule.getDisplayOrientation()); + } + saveToPrivateFile(imageNum, nv21ToJpeg(bY, bVU, new Rect(0, 0, mWidth, mHeight), mOrientation)); + int yActualSize = bY.remaining(); + int vuActualSize = bVU.remaining(); + if(nativeAddImage(bY, bVU, yActualSize, vuActualSize, imageNum) < 0) { + Log.e(TAG, "Fail to add image"); + } + } + + @Override + public ResultImage processImage() { + Log("processImage "); + int[] roi = new int[4]; + int[] depthMapSize = new int[2]; + int status = nativeProcessImage(mOutBuf.array(), roi, depthMapSize); + if(status < 0) { //In failure case, library will return the first image as it is. + Log.w(TAG, "Fail to process the "+getStringName()); + } else { + byte[] depthMapBuf = new byte[depthMapSize[0] * depthMapSize[1] + META_BYTES_SIZE]; + nativeGetDepthMap(depthMapBuf, depthMapSize[0], depthMapSize[1]); + saveToPrivateFile(NAMES.length - 2, depthMapBuf); + saveToPrivateFile(NAMES.length - 1, nv21ToJpeg(mOutBuf, null, new Rect(roi[0], roi[1], roi[0] + roi[2], roi[1] + roi[3]), mOrientation)); + mModule.setRefocusLastTaken(true); + } + + ResultImage result = new ResultImage(mOutBuf, new Rect(roi[0], roi[1], roi[0]+roi[2], roi[1] + roi[3]), mWidth, mHeight, mStrideY); + Log("processImage done"); + return result; + } + + @Override + public boolean isSupported() { + return mIsSupported; + } + + @Override + public boolean isFrameListener() { + return false; + } + + @Override + public boolean isManualMode() { + return true; + } + + @Override + public void manualCapture(CaptureRequest.Builder builder, CameraCaptureSession captureSession, + CameraCaptureSession.CaptureCallback callback, Handler handler) throws CameraAccessException { + if (mMinFocusDistance == -1f) { + mMinFocusDistance = mModule.getMainCameraCharacteristics().get(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE); + } + float step = mMinFocusDistance / NUM_REQUIRED_IMAGE; + for(int i=0; i < NUM_REQUIRED_IMAGE; i++) { + float value = (i * step); + mModule.setAFModeToPreview(mModule.getMainCameraId(), CaptureRequest.CONTROL_AF_MODE_OFF); + mModule.setFocusDistanceToPreview(mModule.getMainCameraId(), value); + try { + int count = FOCUS_ADJUST_TIME_OUT; + do { + Thread.sleep(5); + count -= 5; + if(count <= 0) { + break; + } + } while(Math.abs(mModule.getPreviewCaptureResult().get(CaptureResult.LENS_FOCUS_DISTANCE) + - value) >= 0.5f); + } catch (InterruptedException e) { + } + builder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF); + builder.set(CaptureRequest.LENS_FOCUS_DISTANCE, value); + captureSession.capture(builder.build(), callback, handler); + Log.d(TAG, "Request: " + value); + } + } + + public static boolean isSupportedStatic() { + return mIsSupported; + } + + private byte[] nv21ToJpeg(ByteBuffer bY, ByteBuffer bVU, Rect roi, int orientation) { + ByteBuffer buf = ByteBuffer.allocate(mStrideY*mHeight*3/2); + buf.put(bY); + bY.rewind(); + if(bVU != null) { + buf.put(bVU); + bVU.rewind(); + } + BitmapOutputStream bos = new BitmapOutputStream(1024); + YuvImage im = new YuvImage(buf.array(), ImageFormat.NV21, + mWidth, mHeight, new int[]{mStrideY, mStrideVU}); + im.compressToJpeg(roi, 50, bos); + byte[] bytes = bos.getArray(); + bytes = PostProcessor.addExifTags(bytes, orientation); + return bytes; + } + + private class BitmapOutputStream extends ByteArrayOutputStream { + public BitmapOutputStream(int size) { + super(size); + } + + public byte[] getArray() { + return buf; + } + } + + private void saveToPrivateFile(final int index, final byte[] bytes) { + new Thread() { + public void run() { + String filesPath = mActivity.getFilesDir()+"/Ubifocus"; + File file = new File(filesPath); + if(!file.exists()) { + file.mkdir(); + } + file = new File(filesPath+"/"+NAMES[index]); + try { + FileOutputStream out = new FileOutputStream(file); + out.write(bytes, 0, bytes.length); + out.close(); + } catch (Exception e) { + } + } + }.start(); + } + + private native int nativeInit(int width, int height, int yStride, int vuStride, int numImages); + private native int nativeDeinit(); + private native int nativeAddImage(ByteBuffer yB, ByteBuffer vuB, int ySize, int vuSize, int imageNum); + private native int nativeGetDepthMap(byte[] depthMapBuf, int depthMapWidth, int depthMapHeight); + private native int nativeProcessImage(byte[] buffer, int[] roi, int[] depthMapSize); + + static { + try { + System.loadLibrary("jni_ubifocus"); + mIsSupported = true; + }catch(UnsatisfiedLinkError e) { + mIsSupported = false; + } + } +} |