File tree Expand file tree Collapse file tree 1 file changed +10
-4
lines changed
library/src/main/api14/com/google/android/cameraview Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change 2222import android .os .Build ;
2323import android .support .v4 .util .SparseArrayCompat ;
2424import android .view .SurfaceHolder ;
25-
2625import java .io .IOException ;
2726import java .util .List ;
2827import java .util .Set ;
@@ -331,12 +330,19 @@ void adjustCameraParameters() {
331330 }
332331 Size size = chooseOptimalSize (sizes );
333332
334- // Always re-apply camera parameters
335- // Largest picture size in this ratio
336- final Size pictureSize = mPictureSizes .sizes (mAspectRatio ).last ();
333+ final Size pictureSize ;
334+ if (mPictureSizes .sizes (mAspectRatio ) == null ) {
335+ pictureSize = size ;
336+ } else {
337+ // Largest picture size in this ratio
338+ pictureSize = mPictureSizes .sizes (mAspectRatio ).last ();
339+ }
340+
337341 if (mShowingPreview ) {
338342 mCamera .stopPreview ();
339343 }
344+
345+ // Always re-apply camera parameters
340346 mCameraParameters .setPreviewSize (size .getWidth (), size .getHeight ());
341347 mCameraParameters .setPictureSize (pictureSize .getWidth (), pictureSize .getHeight ());
342348 mCameraParameters .setRotation (calcCameraRotation (mDisplayOrientation ));
You can’t perform that action at this time.
0 commit comments