old mode 100755new mode 100644| .. | .. |
|---|
| 144 | 144 | pictureSize.width() > 0 && pictureSize.height() > 0; |
|---|
| 145 | 145 | |
|---|
| 146 | 146 | if (!isPictureSizeSettingSet || isPictureSizeBlacklisted || !isPictureSizeFromSettingsValid) { |
|---|
| 147 | | - final Rational aspectRatio = ResolutionUtil.ASPECT_RATIO_4x3; |
|---|
| 148 | 147 | |
|---|
| 149 | 148 | OneCameraCharacteristics cameraCharacteristics = |
|---|
| 150 | 149 | mOneCameraManager.getOneCameraCharacteristics(cameraId); |
|---|
| .. | .. |
|---|
| 153 | 152 | ResolutionUtil.filterBlackListedSizes( |
|---|
| 154 | 153 | cameraCharacteristics.getSupportedPictureSizes(ImageFormat.JPEG), |
|---|
| 155 | 154 | blacklist); |
|---|
| 156 | | - final Size fallbackPictureSize = |
|---|
| 157 | | - ResolutionUtil.getLargestPictureSize(aspectRatio, supportedPictureSizes); |
|---|
| 155 | + for (Size size: supportedPictureSizes) { |
|---|
| 156 | + Log.v(TAG, "supportedPictureSizes size w = " + size.getWidth() +" h = " + size.getHeight()); |
|---|
| 157 | + } |
|---|
| 158 | + |
|---|
| 159 | + //provide 4x3 and 16x9 selections, compare them and choose larger one. |
|---|
| 160 | + //The chosen size must achieve 16bit aligned requirement. |
|---|
| 161 | + Size fallbackPictureSize; |
|---|
| 162 | + Size LargestPictureSize_4x3 = |
|---|
| 163 | + ResolutionUtil.getLargestPictureSize(ResolutionUtil.ASPECT_RATIO_4x3, |
|---|
| 164 | + supportedPictureSizes); |
|---|
| 165 | + Size LargestPictureSize_16x9 = |
|---|
| 166 | + ResolutionUtil.getLargestPictureSize(ResolutionUtil.ASPECT_RATIO_16x9, |
|---|
| 167 | + supportedPictureSizes); |
|---|
| 168 | + if (LargestPictureSize_4x3.getWidth() > LargestPictureSize_16x9.getWidth()) { |
|---|
| 169 | + fallbackPictureSize = LargestPictureSize_4x3; |
|---|
| 170 | + } else { |
|---|
| 171 | + fallbackPictureSize = LargestPictureSize_16x9; |
|---|
| 172 | + } |
|---|
| 173 | + |
|---|
| 158 | 174 | mSettingsManager.set( |
|---|
| 159 | 175 | SettingsManager.SCOPE_GLOBAL, |
|---|
| 160 | 176 | pictureSizeSettingKey, |
|---|
