Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'main' into switch-camera-while-recording-federated2/3
  • Loading branch information
BradenBagby committed Feb 28, 2023
commit 4783ed0b17951e73ea3fce861c0d1cf94705af0d
6 changes: 5 additions & 1 deletion packages/camera/camera_avfoundation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## 0.9.12
## 0.9.13

* Allows camera to be switched while video recording.

## 0.9.12

* Updates minimum Flutter version to 3.3 and iOS 11.

## 0.9.11+1

* Updates links for the merge of flutter/plugins into flutter/packages.
Expand Down
1 change: 0 additions & 1 deletion packages/camera/camera_avfoundation/example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ target 'Runner' do
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))

target 'RunnerTests' do
platform :ios, '11.0'
inherit! :search_paths
# Pods for testing
pod 'OCMock', '~> 3.8.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down
10 changes: 5 additions & 5 deletions packages/camera/camera_avfoundation/ios/Classes/FLTCam.m
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
[_videoCaptureSession addOutputWithNoConnections:_captureVideoOutput];
[_videoCaptureSession addConnection:connection];

if (@available(iOS 10.0, *)) {
_capturePhotoOutput = [AVCapturePhotoOutput new];
[_capturePhotoOutput setHighResolutionCaptureEnabled:YES];
[_videoCaptureSession addOutput:_capturePhotoOutput];
}
_capturePhotoOutput = [AVCapturePhotoOutput new];
[_capturePhotoOutput setHighResolutionCaptureEnabled:YES];
[_videoCaptureSession addOutput:_capturePhotoOutput];


_motionManager = [[CMMotionManager alloc] init];
[_motionManager startAccelerometerUpdates];

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.