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

[camera] Fix iOS rotation issue #3591

Merged
merged 11 commits into from
Mar 24, 2021
Merged

[camera] Fix iOS rotation issue #3591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0417103
Fix iOS rotation issue
mvanbeusekom Feb 22, 2021
c248949
Fix orientation issues on iOS
mvanbeusekom Feb 26, 2021
fdeee38
Merged with master and added test
mvanbeusekom Mar 16, 2021
73fe7f7
Merged with master and added test
mvanbeusekom Mar 16, 2021
42946a5
Merge with master
mvanbeusekom Mar 16, 2021
fea49f8
Test RotationBox turns according to device orientation
mvanbeusekom Mar 16, 2021
17f0491
Fix orientation issues on iOS
mvanbeusekom Mar 16, 2021
b174c60
Fix formatting
mvanbeusekom Mar 16, 2021
ed367fe
Removed merge conflict tags from CHANGELOG
mvanbeusekom Mar 19, 2021
b8d78ab
Merge remote-tracking branch 'upstream/master' into issue/76210
mvanbeusekom Mar 24, 2021
2b2f099
Fix license header in test
mvanbeusekom Mar 24, 2021
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/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.0-nullsafety.3

* Solved a rotation issue on iOS which caused the default preview to be displayed as landscape right instead of portrait.

## 0.8.0-nullsafety.2

* Solved delay when using the zoom feature on iOS.
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera/ios/Classes/CameraPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
if ([_captureDevice position] == AVCaptureDevicePositionFront) {
connection.videoMirrored = YES;
}
connection.videoOrientation = AVCaptureVideoOrientationLandscapeRight;
connection.videoOrientation = AVCaptureVideoOrientationPortrait;
[_captureSession addInputWithNoConnections:_captureVideoInput];
[_captureSession addOutputWithNoConnections:_captureVideoOutput];
[_captureSession addConnection:connection];
Expand Down
18 changes: 8 additions & 10 deletions packages/camera/camera/lib/src/camera_preview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import 'package:camera/camera.dart';
import 'package:camera_platform_interface/camera_platform_interface.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

Expand Down Expand Up @@ -41,26 +40,25 @@ class CameraPreview extends StatelessWidget {
: Container();
}

DeviceOrientation _getApplicableOrientation() {
return controller.value.isRecordingVideo
? controller.value.recordingOrientation!
: (controller.value.lockedCaptureOrientation ??
controller.value.deviceOrientation);
}

bool _isLandscape() {
return [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]
.contains(_getApplicableOrientation());
}

int _getQuarterTurns() {
int platformOffset = defaultTargetPlatform == TargetPlatform.iOS ? 1 : 0;
Map<DeviceOrientation, int> turns = {
DeviceOrientation.portraitUp: 0,
DeviceOrientation.landscapeLeft: 1,
DeviceOrientation.portraitDown: 2,
DeviceOrientation.landscapeRight: 3,
};
return turns[_getApplicableOrientation()]! + platformOffset;
return turns[_getApplicableOrientation()]!;
}

DeviceOrientation _getApplicableOrientation() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Just to confirm, there is no diff in this method right? The method was just moved down?

Copy link
Contributor Author

@mvanbeusekom mvanbeusekom Mar 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Correct, it made more sense to me to keep it closer to where it was used. I see now that it causes a bit of noice

Copy link
Contributor

Choose a reason for hiding this comment

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

keeping it close to where it was used makes sense to me!

return controller.value.isRecordingVideo
? controller.value.recordingOrientation!
: (controller.value.lockedCaptureOrientation ??
controller.value.deviceOrientation);
}
}
2 changes: 1 addition & 1 deletion packages/camera/camera/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera
description: A Flutter plugin for getting information about and controlling the
camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
and streaming image buffers to dart.
version: 0.8.0-nullsafety.2
version: 0.8.0-nullsafety.3
homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera

dependencies:
Expand Down