Apply flutter#3820

Author: vishnukvmd

packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java

@@ -96,6 +96,17 @@ final class VideoPlayer {
     setupVideoPlayer(eventChannel, textureEntry);
   }
 
+  VideoPlayer(
+      EventChannel eventChannel,
+      TextureRegistry.SurfaceTextureEntry textureEntry,
+      VideoPlayerOptions options,
+      SimpleExoPlayer exoPlayer) {
+    this.eventChannel = eventChannel;
+    this.textureEntry = textureEntry;
+    this.options = options;
+    this.exoPlayer = exoPlayer;
+  }
+
   private static boolean isHTTP(Uri uri) {
     if (uri == null || uri.getScheme() == null) {
       return false;
@@ -282,6 +293,12 @@ private void sendInitialized() {
         }
         event.put("width", width);
         event.put("height", height);
+        // Rotating the video with ExoPlayer does not seem to be possible with a Surface,
+        // so inform the Flutter code that the widget needs to be rotated to prevent
+        // upside-down playback.
+        if (rotationDegrees == 180) {
+          event.put("rotationCorrection", Math.PI);
+        }
       }
       eventSink.success(event);
     }

packages/video_player/video_player/lib/video_player.dart

@@ -39,6 +39,7 @@ class VideoPlayerValue {
     this.isBuffering = false,
     this.volume = 1.0,
     this.playbackSpeed = 1.0,
+    this.rotationCorrection = 0.0,
     this.errorDescription,
   });
 
@@ -93,6 +94,9 @@ class VideoPlayerValue {
   /// The [size] of the currently loaded video.
   final Size size;
 
+  /// Radians to rotate the video so it is displayed correctly.
+  final double rotationCorrection;
+
   /// Indicates whether or not the video has been loaded and is ready to play.
   final bool isInitialized;
 
@@ -131,6 +135,7 @@ class VideoPlayerValue {
     bool? isBuffering,
     double? volume,
     double? playbackSpeed,
+    double? rotationCorrection,
     String? errorDescription,
   }) {
     return VideoPlayerValue(
@@ -145,6 +150,7 @@ class VideoPlayerValue {
       isBuffering: isBuffering ?? this.isBuffering,
       volume: volume ?? this.volume,
       playbackSpeed: playbackSpeed ?? this.playbackSpeed,
+      rotationCorrection: rotationCorrection ?? this.rotationCorrection,
       errorDescription: errorDescription ?? this.errorDescription,
     );
   }
@@ -341,6 +347,7 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
           value = value.copyWith(
             duration: event.duration,
             size: event.size,
+            rotationCorrection: event.rotationCorrection,
             isInitialized: event.duration != null,
           );
           initializingCompleter.complete(null);
@@ -693,7 +700,10 @@ class _VideoPlayerState extends State<VideoPlayer> {
   Widget build(BuildContext context) {
     return _textureId == VideoPlayerController.kUninitializedTextureId
         ? Container()
-        : _videoPlayerPlatform.buildView(_textureId);
+        : Transform.rotate(
+            angle: widget.controller.value.rotationCorrection,
+            child: _videoPlayerPlatform.buildView(_textureId),
+          );
   }
 }
 

packages/video_player/video_player/pubspec.yaml

@@ -24,14 +24,16 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.3.0
-  video_player_platform_interface: ^4.2.0
+  video_player_platform_interface:
+    path: ../video_player_platform_interface
   # The design on https://flutter.dev/go/federated-plugins was to leave
   # this constraint as "any". We cannot do it right now as it fails pub publish
   # validation, so we set a ^ constraint. The exact value doesn't matter since
   # the constraints on the interface pins it.
   # TODO(amirh): Revisit this (either update this part in the design or the pub tool).
   # https://github.com/flutter/flutter/issues/46264
-  video_player_web: ^2.0.0
+  video_player_web:
+    path: ../video_player_web
   html: ^0.15.0
 
 dev_dependencies:

packages/video_player/video_player_platform_interface/lib/method_channel_video_player.dart

@@ -111,6 +111,7 @@ class MethodChannelVideoPlayer extends VideoPlayerPlatform {
             duration: Duration(milliseconds: map['duration']),
             size: Size(map['width']?.toDouble() ?? 0.0,
                 map['height']?.toDouble() ?? 0.0),
+            rotationCorrection: map['rotationCorrection']?.toDouble() ?? 0.0,
           );
         case 'completed':
           return VideoEvent(

packages/video_player/video_player_platform_interface/lib/video_player_platform_interface.dart

@@ -228,6 +228,7 @@ class VideoEvent {
     required this.eventType,
     this.duration,
     this.size,
+    this.rotationCorrection,
     this.buffered,
   });
 
@@ -243,6 +244,11 @@ class VideoEvent {
   ///
   /// Only used if [eventType] is [VideoEventType.initialized].
   final Size? size;
+  
+  /// Radians to rotate the video so it is displayed correctly.
+  ///
+  /// Only used if [eventType] is [VideoEventType.initialized].
+  final double? rotationCorrection;
 
   /// Buffered parts of the video.
   ///

packages/video_player/video_player_web/pubspec.yaml

@@ -22,7 +22,8 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   meta: ^1.3.0
-  video_player_platform_interface: ^4.2.0
+  video_player_platform_interface:
+    path: ../video_player_platform_interface
 
 dev_dependencies:
   flutter_test: