feat: handle more facing directions #1328
Conversation
|
|
||
| // On MacOS, even though the facing mode is supported, it is not reported. | ||
| // Use the label for FaceTime cameras to detect the user facing webcam. | ||
| if (videoTrack.label.contains('FaceTime')) { |
There was a problem hiding this comment.
This is an additional workaround for the mirroring on MacOS. For example Google Meet does this for you.
This is also an issue for the native (non-web) MacOS preview. But I might fix that later.
| extension NullableMediaStreamTrackCapabilities on MediaStreamTrack { | ||
| /// The `getCapabilities` function is not supported on Firefox. | ||
| @JS('getCapabilities') | ||
| external JSFunction? get getCapabilitiesNullable; |
There was a problem hiding this comment.
Now unused, replaced by the nullable getter below
| @@ -434,10 +434,18 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, | |||
| let answer: [String : Any?] | |||
|
|
|||
| if let device = self.device { | |||
| let cameraDirection: Int? = switch(device.position) { | |||
There was a problem hiding this comment.
Fun fact: MacOS reports .unspecified for the front facing FaceTime webcam. Probably because there is only 1 camera?
| @@ -1,7 +1,12 @@ | |||
| ## NEXT | |||
|
|
|||
| **BREAKING CHANGES:** | |||
|
|
|||
| * The initial state of the `MobileScannerState` camera facing direction is changed to `CameraFacing.unknown`. | |||
There was a problem hiding this comment.
This was done to keep the actual camera state in sync with the value
| @@ -126,31 +131,23 @@ class MobileScannerWeb extends MobileScannerPlatform { | |||
| HTMLVideoElement videoElement, | |||
| MediaStream videoStream, | |||
| ) { | |||
| final List<MediaStreamTrack> tracks = videoStream.getVideoTracks().toDart; | |||
There was a problem hiding this comment.
This was actually duplicated, so I cleaned it up.
| _textureId = textureId; | ||
|
|
||
| if (defaultTargetPlatform == TargetPlatform.android) { | ||
| _surfaceProducerDelegate = | ||
| AndroidSurfaceProducerDelegate.fromConfiguration( | ||
| startResult, | ||
| startOptions.cameraDirection, |
There was a problem hiding this comment.
To stay consistent with the camera state, we should take the camera direction from the start result
| /// Whether the video feed is paused | ||
| bool? get paused => | ||
| throw UnimplementedError('paused has not been implemented.'); | ||
| /// Whether the video feed is paused. |
There was a problem hiding this comment.
Formatting, missing period & adding the videoStream getter
|
|
||
| if (facingModes == null || facingModes.toDart.isEmpty) { | ||
| if (settings.facingModeNullable == null) { |
There was a problem hiding this comment.
We can just check the nullable facingMode directly in the settings. The capabilities check here is redundant.
| @@ -8,6 +9,31 @@ final class MediaTrackConstraintsDelegate { | |||
| /// Constructs a [MediaTrackConstraintsDelegate] instance. | |||
| const MediaTrackConstraintsDelegate(); | |||
|
|
|||
| /// Get the camera direction from the given [videoStream]. | |||
| CameraFacing getCameraDirection(MediaStream? videoStream) { | |||
There was a problem hiding this comment.
I moved this conversion code into the delegate, so that we can reuse it and that it stays in one place.
This PR adds the remaining facing modes to the
CameraFacingenum.It also passes the actual
CameraFacingvalue from the camera to theMobileScannerState/ surface producer delegate, instead of the requested facing direction. That should help prevent a wrong sign for the orientation correction.Part of #867
Work towards fixing #1319