improve process of finding the smallest possible preview size

Signed-off-by: Stefan Nussbaumer <st9fan@gmail.com>
nuss · Mar 9, 2017 · 523860e · 523860e
1 parent 3e1d54a
commit 523860e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     output.outputFile = new File(output.outputFile.parent,
-                            output.outputFile.name.replace("app-release", "VideOSC-1.1")
+                            output.outputFile.name.replace("app-release", "VideOSC-1.1.1")
 //                            output.outputFile.name.replace("app-", "VideOSC-")
                     )
                 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.videosc"
-    android:versionCode="4"
-    android:versionName="1.1" >
+    android:versionCode="5"
+    android:versionName="1.1.1" >
 
     <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"
                 android:maxSdkVersion="25"/>

diff --git a/app/src/main/java/net/videosc/VideOSC.java b/app/src/main/java/net/videosc/VideOSC.java
@@ -117,14 +117,14 @@ public void setup() {
 		// detect smallest possible preview size as that's totally sufficient for our purposes
 		Camera camera = Camera.open();
 		List<Camera.Size> camResList = camera.getParameters().getSupportedPreviewSizes();
+		ArrayList<Integer> productList = new ArrayList<Integer>();
 
-		Camera.Size res  = camResList.get(0);
-		for (int i = 1; i < camResList.size(); i++) {
-			if (camResList.get(i).width * camResList.get(i).width < camResList.get(i-1)
-					.width * camResList.get(i-1).height) {
-				res = camResList.get(i);
-			}
+		for (Camera.Size size : camResList) {
+			productList.add(size.width * size.height);
 		}
+
+		int minIndex = productList.indexOf(Collections.min(productList));
+		Camera.Size res = camResList.get(minIndex);
 		camera.release();
 
 		VideOSCSensors.initSensors(this);