Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[camera_android] Default to legacy recording profile when EncoderProfiles unavailable #7073

Merged
auto-submit merged 7 commits into from
Feb 3, 2023
Merged

[camera_android] Default to legacy recording profile when EncoderProfiles unavailable #7073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e0e052
Make changes, start test
camsim99 Feb 1, 2023
7decb0f
Bump versions
camsim99 Feb 1, 2023
228d381
Add test
camsim99 Feb 1, 2023
ee2ea4e
Formatting
camsim99 Feb 1, 2023
a78fba9
Add issue
camsim99 Feb 1, 2023
8602598
Fix test
camsim99 Feb 1, 2023
be47056
Address review
camsim99 Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Address review
  • Loading branch information
@camsim99
camsim99 committed Feb 2, 2023
commit be47056ddb024cbbba273ef943ba1b100e513282
2 changes: 1 addition & 1 deletion packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/Camera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
// TODO(camsim99): Revert changes that allow legacy code to be used when recordingProfile is null
// once this has largely been fixed on the Android side. https://github.com/flutter/flutter/issues/119668
EncoderProfiles recordingProfile = getRecordingProfile();
if (Build.VERSION.SDK_INT >= 31 && recordingProfile != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && recordingProfile != null) {
mediaRecorderBuilder = new MediaRecorderBuilder(recordingProfile, outputFilePath);
} else {
mediaRecorderBuilder = new MediaRecorderBuilder(getRecordingProfileLegacy(), outputFilePath);
Expand Down
6 changes: 4 additions & 2 deletions ...ndroid/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset)
if (preset.ordinal() > ResolutionPreset.high.ordinal()) {
preset = ResolutionPreset.high;
}
if (Build.VERSION.SDK_INT >= 31) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
EncoderProfiles profile =
getBestAvailableCamcorderProfileForResolutionPreset(cameraId, preset);
List<EncoderProfiles.VideoProfile> videoProfiles = profile.getVideoProfiles();
Expand All @@ -126,6 +126,8 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset)
}

@SuppressWarnings("deprecation")
// TODO(camsim99): Suppression is currently safe because legacy code is used as a fallback for SDK >= S.
// This should be removed when reverting that fallback behavior: https://github.com/flutter/flutter/issues/119668.
CamcorderProfile profile =
getBestAvailableCamcorderProfileForResolutionPresetLegacy(cameraId, preset);
return new Size(profile.videoFrameWidth, profile.videoFrameHeight);
Expand Down Expand Up @@ -238,7 +240,7 @@ private void configureResolution(ResolutionPreset resolutionPreset, int cameraId
}
boolean captureSizeCalculated = false;

if (Build.VERSION.SDK_INT >= 31) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
recordingProfileLegacy = null;
recordingProfile =
getBestAvailableCamcorderProfileForResolutionPreset(cameraId, resolutionPreset);
Expand Down
2 changes: 1 addition & 1 deletion ...a_android/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public MediaRecorder build() throws IOException, NullPointerException, IndexOutO
if (enableAudio) mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
mediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);

if (Build.VERSION.SDK_INT >= 31 && encoderProfiles != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && encoderProfiles != null) {
EncoderProfiles.VideoProfile videoProfile = encoderProfiles.getVideoProfiles().get(0);
EncoderProfiles.AudioProfile audioProfile = encoderProfiles.getAudioProfiles().get(0);

Expand Down