[video_player_avplay] Add supported subtitle formats

packages/video_player_avplay/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.3
+* Support parsing SMPE-TT(sidecar) subtitle attributes.
+* Support image format subtitles.
+
 ## 0.7.2
 * Fix type missmatch.
 

packages/video_player_avplay/README.md

@@ -12,7 +12,7 @@ To use this package, add `video_player_avplay` as a dependency in your `pubspec.
 
 ```yaml
 dependencies:
-  video_player_avplay: ^0.7.2
+  video_player_avplay: ^0.7.3
 ```
 
 Then you can import `video_player_avplay` in your Dart code:

packages/video_player_avplay/example/lib/main.dart

@@ -22,7 +22,7 @@ class _App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultTabController(
-      length: 9,
+      length: 10,
       child: Scaffold(
         key: const ValueKey<String>('home_page'),
         appBar: AppBar(
@@ -39,6 +39,7 @@ class _App extends StatelessWidget {
               Tab(icon: Icon(Icons.cloud), text: 'Asset'),
               Tab(icon: Icon(Icons.live_tv), text: 'Live'),
               Tab(icon: Icon(Icons.local_florist), text: 'ChangeURLTest'),
+              Tab(icon: Icon(Icons.abc), text: 'PictureCaptionTest'),
             ],
           ),
         ),
@@ -53,6 +54,7 @@ class _App extends StatelessWidget {
             _AssetVideo(),
             _LiveRemoteVideo(),
             _TestRemoteVideo(),
+            _PictureCaptionVideo(),
           ],
         ),
       ),
@@ -107,7 +109,7 @@ class _HlsRomoteVideoState extends State<_HlsRomoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -155,6 +157,9 @@ class _DashRomoteVideoState extends State<_DashRomoteVideo> {
       if (_controller.value.hasAdInfo) {
         print(_controller.value.adInfo);
       }
+      if (_controller.value.hasTextStyle) {
+        print(_controller.value.textCaption.textStyle);
+      }
       setState(() {});
     });
     _controller.setLooping(true);
@@ -193,7 +198,9 @@ class _DashRomoteVideoState extends State<_DashRomoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(
+                      text: _controller.value.textCaption.text,
+                      textStyle: _controller.value.textCaption.textStyle),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -253,7 +260,7 @@ class _Mp4RemoteVideoState extends State<_Mp4RemoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -325,7 +332,7 @@ class _DrmRemoteVideoState extends State<_DrmRemoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -391,7 +398,7 @@ class _DrmRemoteVideoState2 extends State<_DrmRemoteVideo2> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -452,7 +459,7 @@ class _TrackTestState extends State<_TrackTest> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -514,7 +521,7 @@ class _AssetVideoState extends State<_AssetVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -824,7 +831,7 @@ class _LiveRomoteVideoState extends State<_LiveRemoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],
@@ -903,7 +910,76 @@ class _TestRemoteVideoState extends State<_TestRemoteVideo> {
                 alignment: Alignment.bottomCenter,
                 children: <Widget>[
                   VideoPlayer(_controller),
-                  ClosedCaption(text: _controller.value.caption.text),
+                  ClosedCaption(text: _controller.value.textCaption.text),
+                  _ControlsOverlay(controller: _controller),
+                  VideoProgressIndicator(_controller, allowScrubbing: true),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _PictureCaptionVideo extends StatefulWidget {
+  @override
+  State<_PictureCaptionVideo> createState() => _PictureCaptionVideoState();
+}
+
+class _PictureCaptionVideoState extends State<_PictureCaptionVideo> {
+  late VideoPlayerController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = VideoPlayerController.network(
+      'https://livesim2.dashif.org/vod/testpic_2s/imsc1_img.mpd',
+      formatHint: VideoFormat.dash,
+    );
+
+    _controller.addListener(() {
+      if (_controller.value.hasError) {
+        print(_controller.value.errorDescription);
+      }
+      setState(() {});
+    });
+    _controller.setLooping(true);
+    _controller.initialize().then((_) => setState(() {}));
+    _controller.play();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        children: <Widget>[
+          Container(padding: const EdgeInsets.only(top: 20.0)),
+          const Text('Picture Caption Test'),
+          Container(
+            padding: const EdgeInsets.all(20),
+            child: AspectRatio(
+              aspectRatio: _controller.value.aspectRatio,
+              child: Stack(
+                alignment: Alignment.bottomCenter,
+                children: <Widget>[
+                  VideoPlayer(_controller),
+                  ClosedCaption(
+                    text: _controller.value.textCaption.text,
+                    textStyle: _controller.value.textCaption.textStyle,
+                    subtitleImage: _controller.value.pictureCaption.picture,
+                    subtitleImageWidth:
+                        _controller.value.pictureCaption.pictureWidth,
+                    subtitleImageHeight:
+                        _controller.value.pictureCaption.pictureHeight,
+                  ),
                   _ControlsOverlay(controller: _controller),
                   VideoProgressIndicator(_controller, allowScrubbing: true),
                 ],