optimized seeking, cleanup

mobile/lib/providers/asset_viewer/video_player_controls_provider.dart

@@ -1,7 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 class VideoPlaybackControls {
-  VideoPlaybackControls({
+  const VideoPlaybackControls({
     required this.position,
     required this.mute,
     required this.pause,
@@ -17,15 +17,14 @@ final videoPlayerControlsProvider =
   return VideoPlayerControls(ref);
 });
 
+const videoPlayerControlsDefault = VideoPlaybackControls(
+  position: 0,
+  pause: false,
+  mute: false,
+);
+
 class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
-  VideoPlayerControls(this.ref)
-      : super(
-          VideoPlaybackControls(
-            position: 0,
-            pause: false,
-            mute: false,
-          ),
-        );
+  VideoPlayerControls(this.ref) : super(videoPlayerControlsDefault);
 
   final Ref ref;
 
@@ -36,15 +35,7 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   }
 
   void reset() {
-    if (state.position == 0 && !state.mute && !state.pause) {
-      return;
-    }
-
-    state = VideoPlaybackControls(
-      position: 0,
-      pause: false,
-      mute: false,
-    );
+    state = videoPlayerControlsDefault;
   }
 
   double get position => state.position;
@@ -115,14 +106,6 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   }
 
   void restart() {
-    if (state.position > 0 || !state.pause) {
-      state = VideoPlaybackControls(
-        position: 0,
-        mute: state.mute,
-        pause: false,
-      );
-    }
-
     state = VideoPlaybackControls(
       position: 0,
       mute: state.mute,

mobile/lib/providers/asset_viewer/video_player_value_provider.dart

@@ -23,7 +23,7 @@ class VideoPlaybackValue {
   /// The volume of the video
   final double volume;
 
-  VideoPlaybackValue({
+  const VideoPlaybackValue({
     required this.position,
     required this.duration,
     required this.state,
@@ -33,32 +33,31 @@ class VideoPlaybackValue {
   factory VideoPlaybackValue.fromNativeController(
     NativeVideoPlayerController controller,
   ) {
-    PlaybackInfo? playbackInfo;
-    VideoInfo? videoInfo;
-    try {
-      playbackInfo = controller.playbackInfo;
-      videoInfo = controller.videoInfo;
-    } catch (_) {
-      // Consume error from the controller
+    final playbackInfo = controller.playbackInfo;
+    final videoInfo = controller.videoInfo;
+
+    if (playbackInfo == null || videoInfo == null) {
+      return videoPlaybackValueDefault;
     }
-    late VideoPlaybackState s;
-    if (playbackInfo?.status == null) {
-      s = VideoPlaybackState.initializing;
-    } else if (playbackInfo?.status == PlaybackStatus.stopped &&
-        (playbackInfo?.positionFraction == 1 ||
-            playbackInfo?.positionFraction == 0)) {
-      s = VideoPlaybackState.completed;
-    } else if (playbackInfo?.status == PlaybackStatus.playing) {
-      s = VideoPlaybackState.playing;
-    } else {
-      s = VideoPlaybackState.paused;
+
+    late final VideoPlaybackState status;
+    switch (playbackInfo.status) {
+      case PlaybackStatus.playing:
+        status = VideoPlaybackState.playing;
+        break;
+      case PlaybackStatus.paused:
+        status = VideoPlaybackState.paused;
+        break;
+      case PlaybackStatus.stopped:
+        status = VideoPlaybackState.completed;
+        break;
     }
 
     return VideoPlaybackValue(
-      position: Duration(seconds: playbackInfo?.position ?? 0),
-      duration: Duration(seconds: videoInfo?.duration ?? 0),
-      state: s,
-      volume: playbackInfo?.volume ?? 0.0,
+      position: Duration(seconds: playbackInfo.position),
+      duration: Duration(seconds: videoInfo.duration),
+      state: status,
+      volume: playbackInfo.volume,
     );
   }
 
@@ -85,15 +84,6 @@ class VideoPlaybackValue {
     );
   }
 
-  factory VideoPlaybackValue.uninitialized() {
-    return VideoPlaybackValue(
-      position: Duration.zero,
-      duration: Duration.zero,
-      state: VideoPlaybackState.initializing,
-      volume: 0.0,
-    );
-  }
-
   VideoPlaybackValue copyWith({
     Duration? position,
     Duration? duration,
@@ -109,16 +99,20 @@ class VideoPlaybackValue {
   }
 }
 
+const VideoPlaybackValue videoPlaybackValueDefault = VideoPlaybackValue(
+  position: Duration.zero,
+  duration: Duration.zero,
+  state: VideoPlaybackState.initializing,
+  volume: 0.0,
+);
+
 final videoPlaybackValueProvider =
     StateNotifierProvider<VideoPlaybackValueState, VideoPlaybackValue>((ref) {
   return VideoPlaybackValueState(ref);
 });
 
 class VideoPlaybackValueState extends StateNotifier<VideoPlaybackValue> {
-  VideoPlaybackValueState(this.ref)
-      : super(
-          VideoPlaybackValue.uninitialized(),
-        );
+  VideoPlaybackValueState(this.ref) : super(videoPlaybackValueDefault);
 
   final Ref ref;
 
@@ -129,6 +123,7 @@ class VideoPlaybackValueState extends StateNotifier<VideoPlaybackValue> {
   }
 
   set position(Duration value) {
+    if (state.position == value) return;
     state = VideoPlaybackValue(
       position: value,
       duration: state.duration,
@@ -136,4 +131,8 @@ class VideoPlaybackValueState extends StateNotifier<VideoPlaybackValue> {
       volume: state.volume,
     );
   }
+
+  void reset() {
+    state = videoPlaybackValueDefault;
+  }
 }