From cc6116a951888d4851af6d5d6286b3513773676f Mon Sep 17 00:00:00 2001 From: Eduardo Omine Date: Fri, 9 Jun 2017 20:04:17 -0300 Subject: [PATCH 1/2] Fixed landscape orientation of recorded videos --- camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java index ca9e1f48..01de0fb1 100644 --- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java +++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java @@ -427,7 +427,7 @@ public class Camera1 extends CameraImpl { mVideoFile = new File(mPreview.getView().getContext().getExternalFilesDir(null), "video.mp4"); mMediaRecorder.setOutputFile(mVideoFile.getAbsolutePath()); - mMediaRecorder.setOrientationHint(mCameraInfo.orientation); + mMediaRecorder.setOrientationHint(calculatePreviewRotation()); } private void prepareMediaRecorder() { From 4701cdff946a3b0170295a0d1fac08b515c33b29 Mon Sep 17 00:00:00 2001 From: Eduardo Omine Date: Tue, 13 Jun 2017 18:45:46 -0300 Subject: [PATCH 2/2] Fixed distortion of videos recorded in landscape orientation --- .../api16/com/flurgle/camerakit/Camera1.java | 108 +++++++++++------- 1 file changed, 66 insertions(+), 42 deletions(-) diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java index 01de0fb1..6e3944e4 100644 --- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java +++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java @@ -5,6 +5,7 @@ import android.graphics.YuvImage; import android.hardware.Camera; import android.media.CamcorderProfile; import android.media.MediaRecorder; +import android.os.Build; import android.os.Handler; import android.view.MotionEvent; import android.view.SurfaceHolder; @@ -248,59 +249,79 @@ public class Camera1 extends CameraImpl { mCameraListener.onVideoTaken(mVideoFile); } - @Override - Size getCaptureResolution() { - if (mCaptureSize == null && mCameraParameters != null) { - TreeSet sizes = new TreeSet<>(); - for (Camera.Size size : mCameraParameters.getSupportedPictureSizes()) { - sizes.add(new Size(size.width, size.height)); + // Code from SandriosCamera library + // https://github.com/sandrios/sandriosCamera/blob/master/sandriosCamera/src/main/java/com/sandrios/sandriosCamera/internal/utils/CameraHelper.java#L218 + public static Size getSizeWithClosestRatio(List sizes, int width, int height) + { + if (sizes == null) return null; + + double MIN_TOLERANCE = 100; + double targetRatio = (double) height / width; + Size optimalSize = null; + double minDiff = Double.MAX_VALUE; + + int targetHeight = height; + + for (Size size : sizes) { + if (size.getWidth() == width && size.getHeight() == height) + return size; + + double ratio = (double) size.getHeight() / size.getWidth(); + + if (Math.abs(ratio - targetRatio) < MIN_TOLERANCE) MIN_TOLERANCE = ratio; + else continue; + + if (Math.abs(size.getHeight() - targetHeight) < minDiff) { + optimalSize = size; + minDiff = Math.abs(size.getHeight() - targetHeight); } + } - TreeSet aspectRatios = findCommonAspectRatios( - mCameraParameters.getSupportedPreviewSizes(), - mCameraParameters.getSupportedPictureSizes() - ); - AspectRatio targetRatio = aspectRatios.size() > 0 ? aspectRatios.last() : null; - - Iterator descendingSizes = sizes.descendingIterator(); - Size size; - while (descendingSizes.hasNext() && mCaptureSize == null) { - size = descendingSizes.next(); - if (targetRatio == null || targetRatio.matches(size)) { - mCaptureSize = size; - break; + if (optimalSize == null) { + minDiff = Double.MAX_VALUE; + for (Size size : sizes) { + if (Math.abs(size.getHeight() - targetHeight) < minDiff) { + optimalSize = size; + minDiff = Math.abs(size.getHeight() - targetHeight); } } } + return optimalSize; + } + + List sizesFromList(List sizes) { + if (sizes == null) return null; + List result = new ArrayList<>(sizes.size()); + + for (Camera.Size size : sizes) { + result.add(new Size(size.width, size.height)); + } + + return result; + } + + // Code from SandriosCamera library + // https://github.com/sandrios/sandriosCamera/blob/master/sandriosCamera/src/main/java/com/sandrios/sandriosCamera/internal/manager/impl/Camera1Manager.java#L212 + void initResolutions() { + List previewSizes = sizesFromList(mCameraParameters.getSupportedPreviewSizes()); + List videoSizes = (Build.VERSION.SDK_INT > 10) ? sizesFromList(mCameraParameters.getSupportedVideoSizes()) : previewSizes; + + CamcorderProfile camcorderProfile = getCamcorderProfile(mVideoQuality); + + mCaptureSize = getSizeWithClosestRatio( + (videoSizes == null || videoSizes.isEmpty()) ? previewSizes : videoSizes, + camcorderProfile.videoFrameWidth, camcorderProfile.videoFrameHeight); + mPreviewSize = getSizeWithClosestRatio(previewSizes, mCaptureSize.getWidth(), mCaptureSize.getHeight()); + } + + @Override + Size getCaptureResolution() { return mCaptureSize; } @Override Size getPreviewResolution() { - if (mPreviewSize == null && mCameraParameters != null) { - TreeSet sizes = new TreeSet<>(); - for (Camera.Size size : mCameraParameters.getSupportedPreviewSizes()) { - sizes.add(new Size(size.width, size.height)); - } - - TreeSet aspectRatios = findCommonAspectRatios( - mCameraParameters.getSupportedPreviewSizes(), - mCameraParameters.getSupportedPictureSizes() - ); - AspectRatio targetRatio = aspectRatios.size() > 0 ? aspectRatios.last() : null; - - Iterator descendingSizes = sizes.descendingIterator(); - Size size; - while (descendingSizes.hasNext() && mPreviewSize == null) { - size = descendingSizes.next(); - if (targetRatio == null || targetRatio.matches(size)) { - mPreviewSize = size; - break; - } - } - } - return mPreviewSize; } @@ -367,6 +388,8 @@ public class Camera1 extends CameraImpl { } private void adjustCameraParameters() { + initResolutions(); + boolean invertPreviewSizes = mDisplayOrientation%180 != 0; mPreview.setTruePreviewSize( invertPreviewSizes? getPreviewResolution().getHeight() : getPreviewResolution().getWidth(), @@ -428,6 +451,7 @@ public class Camera1 extends CameraImpl { mVideoFile = new File(mPreview.getView().getContext().getExternalFilesDir(null), "video.mp4"); mMediaRecorder.setOutputFile(mVideoFile.getAbsolutePath()); mMediaRecorder.setOrientationHint(calculatePreviewRotation()); + mMediaRecorder.setVideoSize(mCaptureSize.getWidth(), mCaptureSize.getHeight()); } private void prepareMediaRecorder() {