fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

limit max resolution as set in Settings

Browse Source
This commit is contained in:
tibbi
2016-06-30 13:26:14 +02:00
parent 040a4965fa
commit 8bbd93183b
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,12 +256,13 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
};
private Camera.Size getOptimalPictureSize() {
final int maxResolution = getMaxResolution();
final List<Camera.Size> sizes = mParameters.getSupportedPictureSizes();
Camera.Size maxSize = sizes.get(0);
for (Camera.Size size : sizes) {
final boolean isEightMegapixelsMax = isEightMegapixelsMax(size);
final boolean isProperRatio = isProperRatio(size);
if (isEightMegapixelsMax && isProperRatio) {
final boolean isProperResolution = isProperResolution(size, maxResolution);
if (isProperResolution && isProperRatio) {
maxSize = size;
break;
}
@ -269,8 +270,20 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
return maxSize;
}
private boolean isEightMegapixelsMax(Camera.Size size) {
return size.width * size.height < 9000000;
private int getMaxResolution() {
final int maxRes = Config.newInstance(getContext()).getMaxResolution();
switch (maxRes) {
case 0:
return 6000000;
case 1:
return 9000000;
default:
return 0;
}
}
private boolean isProperResolution(Camera.Size size, int maxRes) {
return maxRes == 0 || size.width * size.height < maxRes;
}
private boolean isProperRatio(Camera.Size size) {