Skip to content
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
4 changes: 4 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.7.3

* Supports video encoding bitrate.

## 0.7.2+1

* Migrates to Built-in Kotlin to support AGP 9.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,10 @@ class AndroidCameraCameraX extends CameraPlatform {
);

// Configure VideoCapture and Recorder instances.
recorder = Recorder(qualitySelector: presetQualitySelector);
recorder = Recorder(
qualitySelector: presetQualitySelector,
targetVideoEncodingBitRate: mediaSettings?.videoBitrate,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The MediaSettings class also includes an audioBitrate property. For completeness and parity with other platform implementations (such as camera_android), consider supporting audio encoding bitrate as well if the underlying Recorder wrapper provides a corresponding parameter.

);
videoCapture = VideoCapture.withOutput(videoOutput: recorder!, targetFpsRange: _targetFpsRange);

// Retrieve info required for correcting the rotation of the camera preview
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_android_camerax
description: Android implementation of the camera plugin using the CameraX library.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.7.2+1
version: 0.7.3

environment:
sdk: ^3.12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5531,6 +5531,108 @@ void main() {
verifyNoMoreInteractions(camera.camera);
},
);

test(
'createCameraWithSettings passes video bitrate to Recorder',
() async {
final camera = AndroidCameraCameraX();
const CameraLensDirection testLensDirection = CameraLensDirection.back;
const testSensorOrientation = 90;
const testCameraDescription = CameraDescription(
name: 'cameraName',
lensDirection: testLensDirection,
sensorOrientation: testSensorOrientation,
);
const testVideoBitrate = 5000000;

int? capturedVideoBitrate;

final mockProcessCameraProvider = MockProcessCameraProvider();
final mockCamera = MockCamera();
final mockCameraInfo = MockCameraInfo();

when(mockProcessCameraProvider.bindToLifecycle(any, any))
.thenAnswer((_) async => mockCamera);
when(mockCamera.getCameraInfo()).thenAnswer((_) async => mockCameraInfo);
when(mockCameraInfo.getCameraState())
.thenAnswer((_) async => MockLiveCameraState());

setUpOverridesForTestingUseCaseConfiguration(mockProcessCameraProvider);

PigeonOverrides.recorder_new = ({
int? aspectRatio,
int? targetVideoEncodingBitRate,
QualitySelector? qualitySelector,
}) {
capturedVideoBitrate = targetVideoEncodingBitRate;
final mockRecorder = MockRecorder();
when(mockRecorder.getQualitySelector())
.thenAnswer((_) async => qualitySelector ?? MockQualitySelector());
return mockRecorder;
};

camera.processCameraProvider = mockProcessCameraProvider;

await camera.createCameraWithSettings(
testCameraDescription,
const MediaSettings(
videoBitrate: testVideoBitrate,
enableAudio: true,
),
);

expect(capturedVideoBitrate, equals(testVideoBitrate));
},
);

test(
'createCameraWithSettings passes null video bitrate when not specified',
() async {
final camera = AndroidCameraCameraX();
const CameraLensDirection testLensDirection = CameraLensDirection.back;
const testSensorOrientation = 90;
const testCameraDescription = CameraDescription(
name: 'cameraName',
lensDirection: testLensDirection,
sensorOrientation: testSensorOrientation,
);

int? capturedVideoBitrate;

final mockProcessCameraProvider = MockProcessCameraProvider();
final mockCamera = MockCamera();
final mockCameraInfo = MockCameraInfo();

when(mockProcessCameraProvider.bindToLifecycle(any, any))
.thenAnswer((_) async => mockCamera);
when(mockCamera.getCameraInfo()).thenAnswer((_) async => mockCameraInfo);
when(mockCameraInfo.getCameraState())
.thenAnswer((_) async => MockLiveCameraState());

setUpOverridesForTestingUseCaseConfiguration(mockProcessCameraProvider);

PigeonOverrides.recorder_new = ({
int? aspectRatio,
int? targetVideoEncodingBitRate,
QualitySelector? qualitySelector,
}) {
capturedVideoBitrate = targetVideoEncodingBitRate;
final mockRecorder = MockRecorder();
when(mockRecorder.getQualitySelector())
.thenAnswer((_) async => qualitySelector ?? MockQualitySelector());
return mockRecorder;
};

camera.processCameraProvider = mockProcessCameraProvider;

await camera.createCameraWithSettings(
testCameraDescription,
const MediaSettings(enableAudio: true),
);

expect(capturedVideoBitrate, isNull);
},
);
}

class TestMeteringPoint extends MeteringPoint {
Expand Down