fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-01-22 19:40:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure the provided preview/video/picture sizes are sorted

Browse Source
This commit is contained in:
tibbi 2016-07-12 13:26:27 +02:00
parent fc9702ca06
commit d33e481e27
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/simplemobiletools/camera/Preview.java
View File

@ -23,7 +23,10 @@ import com.simplemobiletools.camera.activities.MainActivity;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener, public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener,
@ -114,6 +117,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
if (mCamera != null) { if (mCamera != null) {
mParameters = mCamera.getParameters(); mParameters = mCamera.getParameters();
mSupportedPreviewSizes = mParameters.getSupportedPreviewSizes(); mSupportedPreviewSizes = mParameters.getSupportedPreviewSizes();
Collections.sort(mSupportedPreviewSizes, new SizesComparator());
requestLayout(); requestLayout();
invalidate(); invalidate();
mSetupPreviewAfterMeasure = true; mSetupPreviewAfterMeasure = true;
@ -257,6 +261,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
private Camera.Size getOptimalPictureSize() { private Camera.Size getOptimalPictureSize() {
final int maxResolution = getMaxResolution(); final int maxResolution = getMaxResolution();
final List<Camera.Size> sizes = mParameters.getSupportedPictureSizes(); final List<Camera.Size> sizes = mParameters.getSupportedPictureSizes();
Collections.sort(sizes, new SizesComparator());
Camera.Size maxSize = sizes.get(0); Camera.Size maxSize = sizes.get(0);
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
final boolean isProperRatio = isProperRatio(size); final boolean isProperRatio = isProperRatio(size);
@ -296,6 +301,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
private Camera.Size getOptimalVideoSize() { private Camera.Size getOptimalVideoSize() {
final List<Camera.Size> sizes = mParameters.getSupportedVideoSizes(); final List<Camera.Size> sizes = mParameters.getSupportedVideoSizes();
Collections.sort(sizes, new SizesComparator());
Camera.Size maxSize = sizes.get(0); Camera.Size maxSize = sizes.get(0);
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
final boolean isSixteenToNine = isProperRatio(size); final boolean isSixteenToNine = isProperRatio(size);
@ -655,6 +661,15 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
mCallback.videoSaved(uri); mCallback.videoSaved(uri);
} }
private static class SizesComparator implements Comparator<Camera.Size>, Serializable {
private static final long serialVersionUID = 5431278455314658485L;
@Override
public int compare(final Camera.Size a, final Camera.Size b) {
return b.width * b.height - a.width * a.height;
}
}
public interface PreviewListener { public interface PreviewListener {
void setFlashAvailable(boolean available); void setFlashAvailable(boolean available);