Skip to content

[camera_android] Don't override default fps range when not recording #8891

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.

Sign up for GitHub

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

Merged
auto-submit merged 10 commits into from
Mar 31, 2025
Merged

[camera_android] Don't override default fps range when not recording #8891

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
67f25b5
Set camera feature range when recording
davidmartos96 Mar 19, 2025
a159e2e
Merge branch 'fix_fps' into fix_fps_latest
davidmartos96 Mar 19, 2025
9086381
update tests
davidmartos96 Mar 19, 2025
0452839
format
davidmartos96 Mar 20, 2025
da5281b
rename method
davidmartos96 Mar 20, 2025
983cda3
bump version
davidmartos96 Mar 20, 2025
79cb4e7
format
davidmartos96 Mar 20, 2025
3fea37a
update changelog
davidmartos96 Mar 24, 2025
e68f97b
Merge branch 'main' into fix_fps_latest
davidmartos96 Mar 27, 2025
d1c8a65
Merge branch 'main' into fix_fps_latest
davidmartos96 Mar 29, 2025
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
56 changes: 32 additions & 24 deletions 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 @@ -225,30 +225,6 @@ public Camera(
dartMessenger,
videoCaptureSettings.resolutionPreset);

Integer recordingFps = null;

if (videoCaptureSettings.fps != null && videoCaptureSettings.fps.intValue() > 0) {
recordingFps = videoCaptureSettings.fps;
} else {

if (SdkCapabilityChecker.supportsEncoderProfiles()) {
EncoderProfiles encoderProfiles = getRecordingProfile();
if (encoderProfiles != null && encoderProfiles.getVideoProfiles().size() > 0) {
recordingFps = encoderProfiles.getVideoProfiles().get(0).getFrameRate();
}
} else {
CamcorderProfile camcorderProfile = getRecordingProfileLegacy();
recordingFps = null != camcorderProfile ? camcorderProfile.videoFrameRate : null;
}
}

if (recordingFps != null && recordingFps.intValue() > 0) {

final FpsRangeFeature fpsRange = new FpsRangeFeature(cameraProperties);
fpsRange.setValue(new Range<Integer>(recordingFps, recordingFps));
this.cameraFeatures.setFpsRange(fpsRange);
}

// Create capture callback.
captureTimeouts = new CaptureTimeoutsWrapper(3000, 3000);
captureProps = new CameraCaptureProperties();
Expand Down Expand Up @@ -326,6 +302,32 @@ private void prepareMediaRecorder(String outputFilePath) throws IOException {
.build();
}

private void setFpsCameraFeature(CameraProperties cameraProperties) {
Integer recordingFps = null;

if (videoCaptureSettings.fps != null && videoCaptureSettings.fps.intValue() > 0) {
recordingFps = videoCaptureSettings.fps;
} else {

if (SdkCapabilityChecker.supportsEncoderProfiles()) {
EncoderProfiles encoderProfiles = getRecordingProfile();
if (encoderProfiles != null && encoderProfiles.getVideoProfiles().size() > 0) {
recordingFps = encoderProfiles.getVideoProfiles().get(0).getFrameRate();
}
} else {
CamcorderProfile camcorderProfile = getRecordingProfileLegacy();
recordingFps = null != camcorderProfile ? camcorderProfile.videoFrameRate : null;
}
}

if (recordingFps != null && recordingFps.intValue() > 0) {

final FpsRangeFeature fpsRange = new FpsRangeFeature(cameraProperties);
fpsRange.setValue(new Range<Integer>(recordingFps, recordingFps));
this.cameraFeatures.setFpsRange(fpsRange);
}
}

@SuppressLint("MissingPermission")
public void open(Integer imageFormatGroup) throws CameraAccessException {
this.imageFormatGroup = imageFormatGroup;
Expand Down Expand Up @@ -851,6 +853,9 @@ public String stopVideoRecording() {
// Re-create autofocus feature so it's using continuous capture focus mode now.
cameraFeatures.setAutoFocus(
cameraFeatureFactory.createAutoFocusFeature(cameraProperties, false));
// Reset to non recording fps range (the default)
cameraFeatures.setFpsRange(cameraFeatureFactory.createFpsRangeFeature(cameraProperties));

recordingVideo = false;
try {
closeRenderer();
Expand Down Expand Up @@ -1252,6 +1257,8 @@ void prepareRecording() {
// Re-create autofocus feature so it's using video focus mode now.
cameraFeatures.setAutoFocus(
cameraFeatureFactory.createAutoFocusFeature(cameraProperties, true));
// Update camera features with the desired fps range
setFpsCameraFeature(cameraProperties);
}

private void setStreamHandler(EventChannel imageStreamChannel) {
Expand Down Expand Up @@ -1375,6 +1382,7 @@ public void setDescriptionWhileRecording(CameraProperties properties) {
videoCaptureSettings.resolutionPreset);
cameraFeatures.setAutoFocus(
cameraFeatureFactory.createAutoFocusFeature(cameraProperties, true));
setFpsCameraFeature(cameraProperties);
try {
open(imageFormatGroup);
} catch (CameraAccessException e) {
Expand Down