Apply transform accordingly for videos

Author: AlexV525

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.2
+
+* Apply transform accordingly for videos.
+
 ## 2.3.1
 
 * Renames internal method channels to avoid potential confusion with the

packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m

@@ -187,27 +187,26 @@ - (instancetype)initWithURL:(NSURL *)url
   return [self initWithPlayerItem:item frameUpdater:frameUpdater];
 }
 
+// Fix the transform for the given track accordingly.
+// See also: https://stackoverflow.com/a/64161545/13235500
 - (CGAffineTransform)fixTransform:(AVAssetTrack *)videoTrack {
-  CGAffineTransform transform = videoTrack.preferredTransform;
-  // TODO(@recastrodiaz): why do we need to do this? Why is the preferredTransform incorrect?
-  // At least 2 user videos show a black screen when in portrait mode if we directly use the
-  // videoTrack.preferredTransform Setting tx to the height of the video instead of 0, properly
-  // displays the video https://github.com/flutter/flutter/issues/17606#issuecomment-413473181
-  if (transform.tx == 0 && transform.ty == 0) {
-    NSInteger rotationDegrees = (NSInteger)round(radiansToDegrees(atan2(transform.b, transform.a)));
-    NSLog(@"TX and TY are 0. Rotation: %ld. Natural width,height: %f, %f", (long)rotationDegrees,
-          videoTrack.naturalSize.width, videoTrack.naturalSize.height);
-    if (rotationDegrees == 90) {
-      NSLog(@"Setting transform tx");
-      transform.tx = videoTrack.naturalSize.height;
-      transform.ty = 0;
-    } else if (rotationDegrees == 270) {
-      NSLog(@"Setting transform ty");
-      transform.tx = 0;
-      transform.ty = videoTrack.naturalSize.width;
-    }
+  CGAffineTransform t = videoTrack.preferredTransform;
+  CGSize size = videoTrack.naturalSize;
+  t.tx = 0;
+  t.ty = 0;
+  if (t.a == -1) {
+    t.tx = size.width;
+  }
+  if (t.b == -1) {
+    t.ty = size.width;
+  }
+  if (t.c == -1) {
+    t.tx = size.height;
+  }
+  if (t.d == -1) {
+    t.ty = size.height;
   }
-  return transform;
+  return t;
 }
 
 - (instancetype)initWithPlayerItem:(AVPlayerItem *)item

packages/video_player/video_player_avfoundation/pubspec.yaml

@@ -2,7 +2,7 @@ name: video_player_avfoundation
 description: iOS implementation of the video_player plugin.
 repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player_avfoundation
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.3.1
+version: 2.3.2
 
 environment:
   sdk: ">=2.14.0 <3.0.0"