* Add check for supported display size in the RecordActivity sampl…

…e (pull #153)
bytedeco · May 24, 2015 · 2d43b87 · 2d43b87
1 parent 07b961c
commit 2d43b87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Add check for supported display size in the `RecordActivity` sample ([pull #153](https://github.com/bytedeco/javacv/pull/153))
  * Clarify the semantics of `FrameConverter` ([issue #150](https://github.com/bytedeco/javacv/issues/150))
  * Fix `FFmpegFrameRecorder` not saving the last few frames, especially when encoding with x264 ([issue #50](https://github.com/bytedeco/javacv/issues/50))
  * Add `FrameConverterTest` and fix a couple of bugs uncovered by it

diff --git a/samples/RecordActivity.java b/samples/RecordActivity.java
@@ -485,8 +485,8 @@ public int compare(final Camera.Size a, final Camera.Size b) {
                 }
             });
 
-			// Pick the first preview size that is equal or bigger, or pick the last (biggest) option if we cannot
-			// reach the initial settings of imageWidth/imageHeight.
+            // Pick the first preview size that is equal or bigger, or pick the last (biggest) option if we cannot
+            // reach the initial settings of imageWidth/imageHeight.
             for (int i = 0; i < sizes.size(); i++) {
                 if ((sizes.get(i).width >= imageWidth && sizes.get(i).height >= imageHeight) || i == sizes.size() - 1) {
                     imageWidth = sizes.get(i).width;
@@ -496,12 +496,12 @@ public int compare(final Camera.Size a, final Camera.Size b) {
                 }
             }
             camParams.setPreviewSize(imageWidth, imageHeight);
-			
+
             Log.v(LOG_TAG,"Setting imageWidth: " + imageWidth + " imageHeight: " + imageHeight + " frameRate: " + frameRate);
 
             camParams.setPreviewFrameRate(frameRate);
-			Log.v(LOG_TAG,"Preview Framerate: " + camParams.getPreviewFrameRate());
-			
+            Log.v(LOG_TAG,"Preview Framerate: " + camParams.getPreviewFrameRate());
+
             mCamera.setParameters(camParams);
             startPreview();
         }