extract a new class for subtitle info

Author: gin7773

packages/video_player_avplay/lib/src/closed_caption_file.dart

@@ -658,31 +658,31 @@ class SubtitleAttribute {
 
 /// Parses a subtitle from a [VideoEvent] into a [PictureCaption] or a list of [TextCaption]s.
 (PictureCaption?, List<TextCaption>?) parseSubtitle(
-    Duration position, VideoEvent event) {
-  final Duration textDuration = event.textDuration == 0
+    Duration position, SubtitlesInfo subtitlesInfo) {
+  final Duration textDuration = subtitlesInfo.textDuration == 0
       ? Duration.zero
-      : Duration(milliseconds: event.textDuration!);
-  if (event.pictureInfo?.isNotEmpty ?? false) {
+      : Duration(milliseconds: subtitlesInfo.textDuration!);
+  if (subtitlesInfo.pictureInfo?.isNotEmpty ?? false) {
     final PictureCaption pictureCaption = PictureCaption(
       number: 0,
       start: position,
       end: position + textDuration,
-      picture: event.pictureInfo!['picture'] as Uint8List?,
-      pictureWidth: event.pictureInfo!['pictureWidth'] as double?,
-      pictureHeight: event.pictureInfo!['pictureHeight'] as double?,
+      picture: subtitlesInfo.pictureInfo!['picture'] as Uint8List?,
+      pictureWidth: subtitlesInfo.pictureInfo!['pictureWidth'] as double?,
+      pictureHeight: subtitlesInfo.pictureInfo!['pictureHeight'] as double?,
     );
     return (pictureCaption, null);
   } else {
     final int textLines =
-        (event.textsInfo == null || event.textsInfo![0] == null)
+        (subtitlesInfo.textsInfo == null || subtitlesInfo.textsInfo![0] == null)
             ? 0
-            : event.textsInfo!.length;
+            : subtitlesInfo.textsInfo!.length;
 
     if (textLines > 0) {
       final List<TextCaption> textCaptions = <TextCaption>[];
       for (int i = 0; i < textLines; i++) {
         final Map<Object?, Object?> textInfo =
-            event.textsInfo![i] as Map<Object?, Object?>;
+            subtitlesInfo.textsInfo![i] as Map<Object?, Object?>;
         final String? text = textInfo['text'] as String?;
         final List<dynamic>? subtitleAttrList =
             textInfo['attributes'] as List<dynamic>?;

packages/video_player_avplay/lib/src/video_player_tizen.dart

@@ -436,9 +436,10 @@ class VideoPlayerTizen extends VideoPlayerPlatform {
         case 'subtitleUpdate':
           return VideoEvent(
             eventType: VideoEventType.subtitleUpdate,
-            textsInfo: map['textsInfo'] as List<dynamic>?,
-            textDuration: map['duration'] as int?,
-            pictureInfo: map['pictureInfo'] as Map<Object?, Object?>?,
+            subtitlesInfo: SubtitlesInfo(
+                map['duration'] as int?,
+                map['textsInfo'] as List<dynamic>?,
+                map['pictureInfo'] as Map<Object?, Object?>?),
           );
         case 'isPlayingStateUpdate':
           return VideoEvent(

packages/video_player_avplay/lib/video_player.dart

@@ -654,7 +654,7 @@ class VideoPlayerController extends ValueNotifier<VideoPlayerValue> {
           value = value.copyWith(isBuffering: false);
         case VideoEventType.subtitleUpdate:
           final (PictureCaption?, List<TextCaption>?) subtitles =
-              parseSubtitle(value.position, event);
+              parseSubtitle(value.position, event.subtitlesInfo!);
           value = value.copyWith(
               pictureCaption: subtitles.$1, textCaptions: subtitles.$2);
         case VideoEventType.isPlayingStateUpdate:

packages/video_player_avplay/lib/video_player_platform_interface.dart

@@ -528,12 +528,10 @@ class VideoEvent {
     this.duration,
     this.size,
     this.buffered,
-    this.textsInfo,
-    this.textDuration,
     this.isPlaying,
     this.adInfo,
-    this.pictureInfo,
     this.manifestInfo,
+    this.subtitlesInfo,
   });
 
   /// The type of the event.
@@ -554,16 +552,6 @@ class VideoEvent {
   /// Only used if [eventType] is [VideoEventType.bufferingUpdate].
   final int? buffered;
 
-  /// Text and attributes of the video subtitle.
-  ///
-  /// Only used if [eventType] is [VideoEventType.subtitleUpdate].
-  final List<dynamic>? textsInfo;
-
-  /// The duration of text
-  ///
-  /// Only used if [eventType] is [VideoEventType.subtitleUpdate].
-  final int? textDuration;
-
   /// Whether the video is currently playing.
   ///
   /// Only used if [eventType] is [VideoEventType.isPlayingStateUpdate].
@@ -574,16 +562,16 @@ class VideoEvent {
   /// Only used if [eventType] is [VideoEventType.adFromDash].
   final Map<Object?, Object?>? adInfo;
 
-  /// Subtitle picture info of the video. Includes the picture and its width and height.
-  ///
-  /// Only used if [eventType] is [VideoEventType.subtitleUpdate].
-  final Map<Object?, Object?>? pictureInfo;
-
   /// The manifest information in dash.
   ///
   /// Only used if [eventType] is [VideoEventType.manifestInfoUpdated].
   final String? manifestInfo;
 
+  /// The subtitle information of the video.
+  ///
+  /// Only used if [eventType] is [VideoEventType.subtitleUpdate].
+  final SubtitlesInfo? subtitlesInfo;
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
@@ -593,12 +581,10 @@ class VideoEvent {
             duration == other.duration &&
             size == other.size &&
             buffered == other.buffered &&
-            listEquals(textsInfo, other.textsInfo) &&
-            textDuration == other.textDuration &&
             isPlaying == other.isPlaying &&
             mapEquals(adInfo, other.adInfo) &&
-            mapEquals(pictureInfo, other.pictureInfo) &&
-            manifestInfo == other.manifestInfo;
+            manifestInfo == other.manifestInfo &&
+            subtitlesInfo == other.subtitlesInfo;
   }
 
   @override
@@ -607,12 +593,10 @@ class VideoEvent {
       duration.hashCode ^
       size.hashCode ^
       buffered.hashCode ^
-      textsInfo.hashCode ^
-      textDuration.hashCode ^
       isPlaying.hashCode ^
       adInfo.hashCode ^
-      pictureInfo.hashCode ^
-      manifestInfo.hashCode;
+      manifestInfo.hashCode ^
+      subtitlesInfo.hashCode;
 }
 
 /// Type of the event.
@@ -722,6 +706,35 @@ class DurationRange {
   int get hashCode => start.hashCode ^ end.hashCode;
 }
 
+/// The subtitle information of the video. Contains the text duration, text and attributes, and picture info.
+@immutable
+class SubtitlesInfo {
+  /// Creates an instance of [SubtitlesInfo].
+  const SubtitlesInfo(this.textDuration, this.textsInfo, this.pictureInfo);
+
+  /// The duration of text.
+  final int? textDuration;
+
+  /// Text and attributes of the video subtitle.
+  final List<dynamic>? textsInfo;
+
+  /// Subtitle picture info of the video. Includes the picture and its width and height.
+  final Map<Object?, Object?>? pictureInfo;
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        other is SubtitlesInfo &&
+            listEquals(textsInfo, other.textsInfo) &&
+            textDuration == other.textDuration &&
+            mapEquals(pictureInfo, other.pictureInfo);
+  }
+
+  @override
+  int get hashCode =>
+      textDuration.hashCode ^ textsInfo.hashCode ^ pictureInfo.hashCode;
+}
+
 /// [VideoPlayerOptions] can be optionally used to set additional player settings
 @immutable
 class VideoPlayerOptions {