Merge remote-tracking branch 'upstream/master'

Author: xiaowei-guan

packages/video_player_avplay/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 0.5.21
+
+* Upgrade native player.
+  1.[PLAYER]Add definitions of the subtitle attributes.
+  2.[PLAYER]Receive and pass subtitle attributes of streaming to video player in subtitle callback.
+* Handle the subtitle attributes which include type, startTime, stopTime and value.
+* Pass subtitle attributes to VideoPlayerController.
+
+## 0.5.20
+
+* Add suspend and restore interface.
+
+## 0.5.19
+
+* Upgrade native player
+  1.[HLS]Fix crash issue when rotation from portrait to landscape or vice-versa.
+  2.[HSL]Multiview scenario stability improvement.
+  3.[PLAYER]Modified code for correct information update in status_monitor in case of tracksource prepare is failed.
+  4.[HLS]IAMF codec support in HLS.
+  5.[HLS]Time for curl perfrom increased so that perform should get complete and after that curl unit it resettting.
+  6.[HLS]Exposed new api to pre load ini file without player object.
+  7.[HLS]Trim Whitespaces from URL in ChangeSource.
+  8.[HLS]Removed a previous warning format ‘%s’ expects argument of type ‘char*’.
+  9.[HLS]Shrink log length to fit in vlog dump.
+  10.[HLS]Removed repetitive call for fetching segment.
+  11.[DASH]Change dash timeline case live duration calculation scheme.
+  12.[DASH]Dash low latency stability improvement.
+  13.[DASH]Fix no subtitle callback issue.
+
 ## 0.5.18
 
 * Add getActiveTrackInfo interface.

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.5.18
+  video_player_avplay: ^0.5.21
 ```
 
 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: 7,
+      length: 9,
       child: Scaffold(
         key: const ValueKey<String>('home_page'),
         appBar: AppBar(
@@ -37,6 +37,8 @@ class _App extends StatelessWidget {
               Tab(icon: Icon(Icons.cloud), text: 'DRM PlayReady'),
               Tab(icon: Icon(Icons.cloud), text: 'Track'),
               Tab(icon: Icon(Icons.cloud), text: 'Asset'),
+              Tab(icon: Icon(Icons.live_tv), text: 'Live'),
+              Tab(icon: Icon(Icons.local_florist), text: 'ChangeURLTest'),
             ],
           ),
         ),
@@ -49,6 +51,8 @@ class _App extends StatelessWidget {
             _DrmRemoteVideo2(),
             _TrackTest(),
             _AssetVideo(),
+            _LiveRemoteVideo(),
+            _TestRemoteVideo(),
           ],
         ),
       ),
@@ -748,3 +752,142 @@ class _GetTextTrackButton extends StatelessWidget {
     );
   }
 }
+
+class _LiveRemoteVideo extends StatefulWidget {
+  @override
+  State<_LiveRemoteVideo> createState() => _LiveRomoteVideoState();
+}
+
+class _LiveRomoteVideoState extends State<_LiveRemoteVideo> {
+  late VideoPlayerController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = VideoPlayerController.network(
+      'https://hlive.ktv.go.kr/live/klive_h.stream/playlist.m3u8',
+    );
+
+    _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('Playing Live TV'),
+          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.caption.text),
+                  _ControlsOverlay(controller: _controller),
+                  VideoProgressIndicator(_controller, allowScrubbing: true),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _TestRemoteVideo extends StatefulWidget {
+  @override
+  State<_TestRemoteVideo> createState() => _TestRemoteVideoState();
+}
+
+class _TestRemoteVideoState extends State<_TestRemoteVideo> {
+  late VideoPlayerController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = VideoPlayerController.network(
+      'https://bitdash-a.akamaihd.net/content/sintel/hls/playlist.m3u8',
+    );
+
+    _controller.addListener(() {
+      if (_controller.value.hasError) {
+        print(_controller.value.errorDescription);
+      }
+      setState(() {});
+    });
+    _controller.setLooping(true);
+    _controller.initialize().then((_) => setState(() {}));
+    _controller.play();
+    _controller.setRestoreData(
+      restoreDataSource: restoreDataSource,
+      resumeTime: restoreTime,
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  DataSource restoreDataSource() {
+    final DataSource dataSource = DataSource(
+      sourceType: DataSourceType.network,
+      uri: 'https://media.w3.org/2010/05/bunny/trailer.mp4',
+    );
+    return dataSource;
+  }
+
+  int restoreTime() {
+    /// if resumeTime >= 0 , it will restore from resumeTime
+    /// if resumeTime is not set or <0, it will restore from the time when suspend is called
+    const int resumeTime = 0;
+    return resumeTime;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        children: <Widget>[
+          Container(padding: const EdgeInsets.only(top: 20.0)),
+          const Text('ChangeURLTest'),
+          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.caption.text),
+                  _ControlsOverlay(controller: _controller),
+                  VideoProgressIndicator(_controller, allowScrubbing: true),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}