-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[camera_android, camera_android_camerax, camera_avfoundation] Add setJpegImageQuality #11616
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Bolling88
wants to merge
2
commits into
flutter:main
Choose a base branch
from
Bolling88:set-jpeg-quality
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...roid/src/main/java/io/flutter/plugins/camera/features/jpegquality/JpegQualityFeature.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright 2013 The Flutter Authors | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package io.flutter.plugins.camera.features.jpegquality; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.hardware.camera2.CaptureRequest; | ||
| import androidx.annotation.NonNull; | ||
| import io.flutter.plugins.camera.CameraProperties; | ||
| import io.flutter.plugins.camera.features.CameraFeature; | ||
|
|
||
| /** Controls the JPEG compression quality on the {@link android.hardware.camera2} API. */ | ||
| public class JpegQualityFeature extends CameraFeature<Integer> { | ||
| private int currentSetting = 100; | ||
|
|
||
| /** | ||
| * Creates a new instance of the {@link JpegQualityFeature}. | ||
| * | ||
| * @param cameraProperties Collection of characteristics for the current camera device. | ||
| */ | ||
| public JpegQualityFeature(@NonNull CameraProperties cameraProperties) { | ||
| super(cameraProperties); | ||
| } | ||
|
|
||
| @NonNull | ||
| @Override | ||
| public String getDebugName() { | ||
| return "JpegQualityFeature"; | ||
| } | ||
|
|
||
| @SuppressLint("KotlinPropertyAccess") | ||
| @NonNull | ||
| @Override | ||
| public Integer getValue() { | ||
| return currentSetting; | ||
| } | ||
|
|
||
| @Override | ||
| public void setValue(@NonNull Integer value) { | ||
| this.currentSetting = value; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean checkIsSupported() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void updateBuilder(@NonNull CaptureRequest.Builder requestBuilder) { | ||
| requestBuilder.set(CaptureRequest.JPEG_QUALITY, (byte) currentSetting); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
.../src/test/java/io/flutter/plugins/camera/features/jpegquality/JpegQualityFeatureTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright 2013 The Flutter Authors | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| package io.flutter.plugins.camera.features.jpegquality; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| import android.hardware.camera2.CaptureRequest; | ||
| import io.flutter.plugins.camera.CameraProperties; | ||
| import org.junit.Test; | ||
|
|
||
| public class JpegQualityFeatureTest { | ||
| @Test | ||
| public void getDebugName_shouldReturnTheNameOfTheFeature() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| assertEquals("JpegQualityFeature", jpegQualityFeature.getDebugName()); | ||
| } | ||
|
|
||
| @Test | ||
| public void getValue_shouldReturn100IfNotSet() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| assertEquals(Integer.valueOf(100), jpegQualityFeature.getValue()); | ||
| } | ||
|
|
||
| @Test | ||
| public void getValue_shouldEchoTheSetValue() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| jpegQualityFeature.setValue(50); | ||
| assertEquals(Integer.valueOf(50), jpegQualityFeature.getValue()); | ||
| } | ||
|
|
||
| @Test | ||
| public void checkIsSupported_shouldReturnTrue() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| assertTrue(jpegQualityFeature.checkIsSupported()); | ||
| } | ||
|
|
||
| @Test | ||
| public void updateBuilder_shouldSetJpegQualityOnBuilder() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| CaptureRequest.Builder mockBuilder = mock(CaptureRequest.Builder.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| jpegQualityFeature.setValue(75); | ||
| jpegQualityFeature.updateBuilder(mockBuilder); | ||
|
|
||
| verify(mockBuilder, times(1)).set(CaptureRequest.JPEG_QUALITY, (byte) 75); | ||
| } | ||
|
|
||
| @Test | ||
| public void updateBuilder_shouldSetDefaultQualityWhenNotExplicitlySet() { | ||
| CameraProperties mockCameraProperties = mock(CameraProperties.class); | ||
| CaptureRequest.Builder mockBuilder = mock(CaptureRequest.Builder.class); | ||
| JpegQualityFeature jpegQualityFeature = new JpegQualityFeature(mockCameraProperties); | ||
|
|
||
| jpegQualityFeature.updateBuilder(mockBuilder); | ||
|
|
||
| verify(mockBuilder, times(1)).set(CaptureRequest.JPEG_QUALITY, (byte) 100); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
CaptureRequest.JPEG_QUALITYkey expects anIntegervalue (typeKey<Integer>). CastingcurrentSettingtobytewill result in aByteobject being passed to therequestBuilder.setmethod due to autoboxing. This will cause aClassCastExceptionat runtime because aBytecannot be cast to anInteger.