Dylan McIntyre
8 years ago
parent
5450510b58
commit
0a4a60ac2f
@ -0,0 +1,62 @@ |
||||
package com.flurgle.camerakit; |
||||
|
||||
import android.hardware.Camera; |
||||
import android.support.v4.util.SparseArrayCompat; |
||||
|
||||
public class ConstantMapper { |
||||
|
||||
private abstract static class BaseMapper<T> { |
||||
|
||||
protected int mCameraKitConstant; |
||||
|
||||
protected BaseMapper(int cameraKitConstant) { |
||||
this.mCameraKitConstant = cameraKitConstant; |
||||
} |
||||
|
||||
abstract T map(); |
||||
|
||||
} |
||||
|
||||
public static class Flash extends BaseMapper<String> { |
||||
|
||||
private static final SparseArrayCompat<String> FLASH_MODES = new SparseArrayCompat<>(); |
||||
|
||||
static { |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_OFF, Camera.Parameters.FLASH_MODE_OFF); |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_ON, Camera.Parameters.FLASH_MODE_ON); |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_AUTO, Camera.Parameters.FLASH_MODE_AUTO); |
||||
} |
||||
|
||||
protected Flash(int cameraKitConstant) { |
||||
super(cameraKitConstant); |
||||
} |
||||
|
||||
@Override |
||||
String map() { |
||||
return FLASH_MODES.get(mCameraKitConstant, FLASH_MODES.get(CameraKit.Constants.FLASH_OFF)); |
||||
} |
||||
|
||||
} |
||||
|
||||
public static class Facing extends BaseMapper<Integer> { |
||||
|
||||
private static final SparseArrayCompat<Integer> FACING_MODES = new SparseArrayCompat<>(); |
||||
|
||||
static { |
||||
FACING_MODES.put(CameraKit.Constants.FACING_BACK, Camera.CameraInfo.CAMERA_FACING_BACK); |
||||
FACING_MODES.put(CameraKit.Constants.FACING_FRONT, Camera.CameraInfo.CAMERA_FACING_FRONT); |
||||
} |
||||
|
||||
protected Facing(int cameraKitConstant) { |
||||
super(cameraKitConstant); |
||||
} |
||||
|
||||
@Override |
||||
Integer map() { |
||||
return FACING_MODES.get(mCameraKitConstant, FACING_MODES.get(Camera.CameraInfo.CAMERA_FACING_BACK)); |
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,55 @@ |
||||
package com.flurgle.camerakit; |
||||
|
||||
import android.graphics.YuvImage; |
||||
import android.hardware.Camera; |
||||
|
||||
class ProcessStillTask implements Runnable { |
||||
|
||||
private byte[] data; |
||||
private Camera camera; |
||||
private Camera.CameraInfo cameraInfo; |
||||
private OnStillProcessedListener onStillProcessedListener; |
||||
|
||||
public ProcessStillTask(byte[] data, Camera camera, Camera.CameraInfo cameraInfo, OnStillProcessedListener onStillProcessedListener) { |
||||
this.data = data; |
||||
this.camera = camera; |
||||
this.cameraInfo = cameraInfo; |
||||
this.onStillProcessedListener = onStillProcessedListener; |
||||
} |
||||
|
||||
@Override |
||||
public void run() { |
||||
Camera.Parameters parameters = camera.getParameters(); |
||||
int width = parameters.getPreviewSize().width; |
||||
int height = parameters.getPreviewSize().height; |
||||
int rotation = cameraInfo.orientation; |
||||
byte[] rotatedData = new Rotation(data, width, height, rotation).getYuv(); |
||||
|
||||
int postWidth; |
||||
int postHeight; |
||||
|
||||
switch (rotation) { |
||||
case 90: |
||||
case 270: |
||||
postWidth = height; |
||||
postHeight = width; |
||||
break; |
||||
|
||||
case 0: |
||||
case 180: |
||||
default: |
||||
postWidth = width; |
||||
postHeight = height; |
||||
break; |
||||
} |
||||
|
||||
YuvImage yuv = new YuvImage(rotatedData, parameters.getPreviewFormat(), postWidth, postHeight, null); |
||||
|
||||
onStillProcessedListener.onStillProcessed(yuv); |
||||
} |
||||
|
||||
interface OnStillProcessedListener { |
||||
void onStillProcessed(YuvImage yuv); |
||||
} |
||||
|
||||
} |
||||
@ -1,493 +1,84 @@ |
||||
package com.flurgle.camerakit; |
||||
|
||||
import android.graphics.YuvImage; |
||||
import android.hardware.Camera; |
||||
import android.media.CamcorderProfile; |
||||
import android.media.MediaRecorder; |
||||
import android.os.Build; |
||||
import android.support.annotation.NonNull; |
||||
import android.support.v4.util.SparseArrayCompat; |
||||
import android.view.SurfaceHolder; |
||||
class Camera2 extends CameraImpl { |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
import java.util.Iterator; |
||||
import java.util.List; |
||||
import java.util.SortedSet; |
||||
import java.util.TreeSet; |
||||
|
||||
public class Camera2 extends CameraImpl { |
||||
|
||||
private static final SparseArrayCompat<String> FLASH_MODES = new SparseArrayCompat<>(); |
||||
|
||||
static { |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_OFF, Camera.Parameters.FLASH_MODE_OFF); |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_ON, Camera.Parameters.FLASH_MODE_ON); |
||||
FLASH_MODES.put(CameraKit.Constants.FLASH_AUTO, Camera.Parameters.FLASH_MODE_AUTO); |
||||
} |
||||
|
||||
private static final SparseArrayCompat<Integer> FACING_MODES = new SparseArrayCompat<>(); |
||||
|
||||
static { |
||||
FACING_MODES.put(CameraKit.Constants.FACING_BACK, Camera.CameraInfo.CAMERA_FACING_BACK); |
||||
FACING_MODES.put(CameraKit.Constants.FACING_FRONT, Camera.CameraInfo.CAMERA_FACING_FRONT); |
||||
} |
||||
|
||||
private File mVideoFile; |
||||
|
||||
private int mCameraId; |
||||
private Camera mCamera; |
||||
private Camera.Parameters mCameraParameters; |
||||
private final Camera.CameraInfo mCameraInfo = new Camera.CameraInfo(); |
||||
private Size mPreviewSize; |
||||
private Size mCaptureSize; |
||||
|
||||
private boolean mShowingPreview; |
||||
private boolean mAutoFocus; |
||||
private int mFacing; |
||||
private int mFlash; |
||||
private int mDisplayOrientation; |
||||
|
||||
private TreeSet<Size> mPreviewSizes; |
||||
private TreeSet<Size> mCaptureSizes; |
||||
|
||||
private MediaRecorder mMediaRecorder; |
||||
|
||||
private CameraListener mCameraListener; |
||||
|
||||
Camera2(@NonNull CameraListener cameraListener, @NonNull PreviewImpl preview) { |
||||
super(cameraListener, preview); |
||||
|
||||
this.mCameraListener = cameraListener; |
||||
this.mPreviewSizes = new TreeSet<>(); |
||||
this.mCaptureSizes = new TreeSet<>(); |
||||
this.mVideoFile = new File(mPreview.getView().getContext().getExternalFilesDir(null), "video.mp4"); |
||||
|
||||
preview.setCallback(new PreviewImpl.Callback() { |
||||
@Override |
||||
public void onSurfaceChanged() { |
||||
if (mCamera != null) { |
||||
setUpPreview(); |
||||
adjustCameraParameters(); |
||||
} |
||||
} |
||||
}); |
||||
Camera2(CameraListener callback, PreviewImpl preview) { |
||||
super(callback, preview); |
||||
} |
||||
|
||||
@Override |
||||
void start() { |
||||
setFacingInternal(mFacing); |
||||
openCamera(); |
||||
if (mPreview.isReady()) { |
||||
setUpPreview(); |
||||
} |
||||
mShowingPreview = true; |
||||
mCamera.startPreview(); |
||||
|
||||
} |
||||
|
||||
@Override |
||||
void stop() { |
||||
if (mCamera != null) { |
||||
mCamera.stopPreview(); |
||||
} |
||||
mShowingPreview = false; |
||||
releaseCamera(); |
||||
} |
||||
|
||||
@Override |
||||
boolean isCameraOpened() { |
||||
return mCamera != null; |
||||
} |
||||
|
||||
@Override |
||||
void setFacing(int facing) { |
||||
if (mFacing == facing) { |
||||
return; |
||||
} |
||||
if (setFacingInternal(facing) && isCameraOpened()) { |
||||
stop(); |
||||
start(); |
||||
} |
||||
} |
||||
void setFacing(@Facing int facing) { |
||||
|
||||
private boolean setFacingInternal(int facing) { |
||||
int trueValue = FACING_MODES.get(facing, -1); |
||||
if (trueValue == -1) { |
||||
return false; |
||||
} |
||||
|
||||
for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) { |
||||
Camera.getCameraInfo(i, mCameraInfo); |
||||
if (mCameraInfo.facing == trueValue) { |
||||
mCameraId = i; |
||||
mFacing = facing; |
||||
return true; |
||||
} |
||||
} |
||||
|
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
void setFlash(int flash) { |
||||
if (flash == mFlash) { |
||||
return; |
||||
} |
||||
if (setFlashInternal(flash)) { |
||||
mCamera.setParameters(mCameraParameters); |
||||
} |
||||
} |
||||
void setFlash(@Flash int flash) { |
||||
|
||||
private boolean setFlashInternal(int flash) { |
||||
if (isCameraOpened()) { |
||||
List<String> modes = mCameraParameters.getSupportedFlashModes(); |
||||
String mode = FLASH_MODES.get(flash); |
||||
if (modes != null && modes.contains(mode)) { |
||||
mCameraParameters.setFlashMode(mode); |
||||
mFlash = flash; |
||||
return true; |
||||
} |
||||
String currentMode = FLASH_MODES.get(mFlash); |
||||
if (modes == null || !modes.contains(currentMode)) { |
||||
mCameraParameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF); |
||||
mFlash = CameraKit.Constants.FLASH_OFF; |
||||
return true; |
||||
} |
||||
return false; |
||||
} else { |
||||
mFlash = flash; |
||||
return false; |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
void setAutoFocus(boolean autoFocus) { |
||||
if (autoFocus == mAutoFocus) { |
||||
return; |
||||
} |
||||
if (setAutoFocusInternal(autoFocus)) { |
||||
mCamera.setParameters(mCameraParameters); |
||||
} |
||||
} |
||||
|
||||
private boolean setAutoFocusInternal(boolean autoFocus) { |
||||
mAutoFocus = autoFocus; |
||||
if (isCameraOpened()) { |
||||
final List<String> modes = mCameraParameters.getSupportedFocusModes(); |
||||
if (autoFocus && modes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) { |
||||
mCameraParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE); |
||||
} else if (modes.contains(Camera.Parameters.FOCUS_MODE_FIXED)) { |
||||
mCameraParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_FIXED); |
||||
} else if (modes.contains(Camera.Parameters.FOCUS_MODE_INFINITY)) { |
||||
mCameraParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY); |
||||
} else { |
||||
mCameraParameters.setFocusMode(modes.get(0)); |
||||
} |
||||
void setContinuousFocus(boolean autoFocus) { |
||||
|
||||
mCameraParameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO); |
||||
return true; |
||||
} else { |
||||
return false; |
||||
} |
||||
} |
||||
|
||||
@Override |
||||
void captureStandard() { |
||||
if (!isCameraOpened()) { |
||||
throw new IllegalStateException("Camera is not ready. Call start() before takePicture()."); |
||||
} |
||||
if (mAutoFocus) { |
||||
mCamera.cancelAutoFocus(); |
||||
mCamera.autoFocus(new Camera.AutoFocusCallback() { |
||||
@Override |
||||
public void onAutoFocus(boolean success, Camera camera) { |
||||
takePictureInternal(); |
||||
} |
||||
}); |
||||
} else { |
||||
takePictureInternal(); |
||||
} |
||||
} |
||||
void setDisplayOrientation(int displayOrientation) { |
||||
|
||||
void takePictureInternal() { |
||||
mCamera.takePicture(null, null, null, new Camera.PictureCallback() { |
||||
@Override |
||||
public void onPictureTaken(byte[] data, Camera camera) { |
||||
mCameraListener.onPictureTaken(data); |
||||
camera.startPreview(); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
@Override |
||||
void captureStill() { |
||||
mCamera.setOneShotPreviewCallback(new Camera.PreviewCallback() { |
||||
@Override |
||||
public void onPreviewFrame(byte[] data, Camera camera) { |
||||
new Thread(new ProcessStillTask(data, camera, mCameraInfo, new ProcessStillTask.OnStillProcessedListener() { |
||||
@Override |
||||
public void onStillProcessed(final YuvImage yuv) { |
||||
mPreview.getView().post(new Runnable() { |
||||
@Override |
||||
public void run() { |
||||
mCameraListener.onPictureTaken(yuv); |
||||
} |
||||
}); |
||||
} |
||||
})).start(); |
||||
} |
||||
}); |
||||
} |
||||
|
||||
static class ProcessStillTask implements Runnable { |
||||
|
||||
byte[] data; |
||||
Camera camera; |
||||
Camera.CameraInfo cameraInfo; |
||||
OnStillProcessedListener onStillProcessedListener; |
||||
void focus() { |
||||
|
||||
public ProcessStillTask(byte[] data, Camera camera, Camera.CameraInfo cameraInfo, OnStillProcessedListener onStillProcessedListener) { |
||||
this.data = data; |
||||
this.camera = camera; |
||||
this.cameraInfo = cameraInfo; |
||||
this.onStillProcessedListener = onStillProcessedListener; |
||||
} |
||||
|
||||
@Override |
||||
public void run() { |
||||
Camera.Parameters parameters = camera.getParameters(); |
||||
int width = parameters.getPreviewSize().width; |
||||
int height = parameters.getPreviewSize().height; |
||||
int rotation = cameraInfo.orientation; |
||||
byte[] rotatedData = YuvUtils.rotateNV21(data, width, height, rotation); |
||||
|
||||
int postWidth; |
||||
int postHeight; |
||||
|
||||
switch (rotation) { |
||||
case 90: |
||||
case 270: |
||||
postWidth = height; |
||||
postHeight = width; |
||||
break; |
||||
void zoom(float percentZoom) { |
||||
|
||||
case 0: |
||||
case 180: |
||||
default: |
||||
postWidth = width; |
||||
postHeight = height; |
||||
break; |
||||
} |
||||
|
||||
YuvImage yuv = new YuvImage(rotatedData, parameters.getPreviewFormat(), postWidth, postHeight, null); |
||||
@Override |
||||
void captureStandard() { |
||||
|
||||
onStillProcessedListener.onStillProcessed(yuv); |
||||
} |
||||
|
||||
interface OnStillProcessedListener { |
||||
void onStillProcessed(YuvImage yuv); |
||||
} |
||||
@Override |
||||
void captureStill() { |
||||
|
||||
} |
||||
|
||||
@Override |
||||
void startVideo() { |
||||
try { |
||||
prepareMediaRecorder(); |
||||
} catch (IOException e) { |
||||
if (mMediaRecorder != null) { |
||||
mMediaRecorder.release(); |
||||
} |
||||
|
||||
return; |
||||
} |
||||
} |
||||
|
||||
void prepareMediaRecorder() throws IOException { |
||||
mCamera.unlock(); |
||||
|
||||
mMediaRecorder = new MediaRecorder(); |
||||
mMediaRecorder.setCamera(mCamera); |
||||
|
||||
mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER); |
||||
mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); |
||||
mMediaRecorder.setProfile(CamcorderProfile.get(CamcorderProfile.QUALITY_480P)); |
||||
|
||||
mMediaRecorder.setOutputFile(mVideoFile.getAbsolutePath()); |
||||
mMediaRecorder.setOrientationHint(mCameraInfo.orientation); |
||||
|
||||
mMediaRecorder.prepare(); |
||||
mMediaRecorder.start(); |
||||
} |
||||
|
||||
@Override |
||||
void endVideo() { |
||||
if (mMediaRecorder != null) { |
||||
mMediaRecorder.stop(); |
||||
mMediaRecorder = null; |
||||
} |
||||
|
||||
mCameraListener.onVideoTaken(mVideoFile); |
||||
|
||||
} |
||||
|
||||
@Override |
||||
void focus() { |
||||
mCamera.autoFocus(null); |
||||
Size getCaptureResolution() { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
void setDisplayOrientation(int displayOrientation) { |
||||
if (mDisplayOrientation == displayOrientation) { |
||||
return; |
||||
} |
||||
mDisplayOrientation = displayOrientation; |
||||
if (isCameraOpened()) { |
||||
int cameraRotation = calcCameraRotation(displayOrientation); |
||||
mCameraParameters.setRotation(cameraRotation); |
||||
mCamera.setParameters(mCameraParameters); |
||||
final boolean needsToStopPreview = mShowingPreview && Build.VERSION.SDK_INT < 14; |
||||
if (needsToStopPreview) { |
||||
mCamera.stopPreview(); |
||||
} |
||||
mCamera.setDisplayOrientation(cameraRotation); |
||||
if (needsToStopPreview) { |
||||
mCamera.startPreview(); |
||||
} |
||||
} |
||||
} |
||||
|
||||
private int calcCameraRotation(int rotation) { |
||||
if (mCameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { |
||||
return (360 - (mCameraInfo.orientation + rotation) % 360) % 360; |
||||
} else { |
||||
return (mCameraInfo.orientation - rotation + 360) % 360; |
||||
} |
||||
} |
||||
|
||||
private void setUpPreview() { |
||||
try { |
||||
if (mPreview.getOutputClass() == SurfaceHolder.class) { |
||||
final boolean needsToStopPreview = mShowingPreview && Build.VERSION.SDK_INT < 14; |
||||
if (needsToStopPreview) { |
||||
mCamera.stopPreview(); |
||||
} |
||||
mCamera.setPreviewDisplay(mPreview.getSurfaceHolder()); |
||||
if (needsToStopPreview) { |
||||
mCamera.startPreview(); |
||||
} |
||||
} else { |
||||
mCamera.setPreviewTexture(mPreview.getSurfaceTexture()); |
||||
} |
||||
} catch (IOException e) { |
||||
throw new RuntimeException(e); |
||||
} |
||||
} |
||||
|
||||
private void adjustCameraParameters() { |
||||
SortedSet<Size> sizes = mPreviewSizes; |
||||
mPreviewSize = chooseOptimalSize(sizes); |
||||
final Camera.Size currentSize = mCameraParameters.getPictureSize(); |
||||
if (currentSize.width != mPreviewSize.getWidth() || currentSize.height != mPreviewSize.getHeight()) { |
||||
Iterator<Size> iterator = mCaptureSizes.descendingIterator(); |
||||
Size pictureSize; |
||||
while ((pictureSize = iterator.next()) != null) { |
||||
if (AspectRatio.of(mPreviewSize.getWidth(), mPreviewSize.getHeight()).matches(pictureSize)) { |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (pictureSize == null) { |
||||
pictureSize = mCaptureSizes.last(); |
||||
} |
||||
|
||||
mCaptureSize = pictureSize; |
||||
|
||||
if (mShowingPreview) { |
||||
mCamera.stopPreview(); |
||||
} |
||||
|
||||
mCameraParameters.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight()); |
||||
mPreview.setTruePreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight()); |
||||
mCameraParameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight()); |
||||
mCameraParameters.setRotation(calcCameraRotation(mDisplayOrientation) + (mFacing == CameraKit.Constants.FACING_FRONT ? 180 : 0)); |
||||
|
||||
setAutoFocusInternal(mAutoFocus); |
||||
|
||||
//setFlashInternal(mFlash);
|
||||
|
||||
mCamera.setParameters(mCameraParameters); |
||||
if (mShowingPreview) { |
||||
mCamera.startPreview(); |
||||
} |
||||
} |
||||
} |
||||
|
||||
private Size chooseOptimalSize(SortedSet<Size> sizes) { |
||||
if (!mPreview.isReady()) { // Not yet laid out
|
||||
return sizes.last(); // Return the smallest size
|
||||
} |
||||
|
||||
int desiredWidth; |
||||
int desiredHeight; |
||||
final int surfaceWidth = mPreview.getWidth(); |
||||
final int surfaceHeight = mPreview.getHeight(); |
||||
if (mDisplayOrientation == 90 || mDisplayOrientation == 270) { |
||||
desiredWidth = surfaceHeight; |
||||
desiredHeight = surfaceWidth; |
||||
} else { |
||||
desiredWidth = surfaceWidth; |
||||
desiredHeight = surfaceHeight; |
||||
} |
||||
Size result = null; |
||||
for (Size size : sizes) { // Iterate from small to large
|
||||
if (desiredWidth <= size.getWidth() && desiredHeight <= size.getHeight()) { |
||||
return size; |
||||
|
||||
} |
||||
result = size; |
||||
} |
||||
return result; |
||||
} |
||||
|
||||
private void openCamera() { |
||||
if (mCamera != null) { |
||||
releaseCamera(); |
||||
} |
||||
mCamera = Camera.open(mCameraId); |
||||
mCameraParameters = mCamera.getParameters(); |
||||
// Supported preview sizes
|
||||
mPreviewSizes.clear(); |
||||
for (Camera.Size size : mCameraParameters.getSupportedPreviewSizes()) { |
||||
mPreviewSizes.add(new Size(size.width, size.height)); |
||||
} |
||||
// Supported picture sizes;
|
||||
mCaptureSizes.clear(); |
||||
for (Camera.Size size : mCameraParameters.getSupportedPictureSizes()) { |
||||
mCaptureSizes.add(new Size(size.width, size.height)); |
||||
} |
||||
|
||||
adjustCameraParameters(); |
||||
mCamera.setDisplayOrientation(calcCameraRotation(mDisplayOrientation)); |
||||
|
||||
mCameraListener.onCameraOpened(); |
||||
} |
||||
|
||||
private void releaseCamera() { |
||||
if (mCamera != null) { |
||||
mCamera.release(); |
||||
mCamera = null; |
||||
mCameraListener.onCameraClosed(); |
||||
} |
||||
Size getPreviewResolution() { |
||||
return null; |
||||
} |
||||
|
||||
@Override |
||||
Size getCaptureResolution() { |
||||
return mCaptureSize; |
||||
boolean isCameraOpened() { |
||||
return false; |
||||
} |
||||
|
||||
@Override |
||||
Size getPreviewResolution() { |
||||
return mPreviewSize; |
||||
} |
||||
} |
||||
|
||||
@ -1,3 +0,0 @@ |
||||
<resources> |
||||
<string name="app_name">CameraKit</string> |
||||
</resources> |
||||
Loading…
Reference in new issue