Feature/november changes 2 (#145)

* iOS black frame issue fix * Fixed full screen placeholder issue * Fixed event not firing in enterFullScreen and exitFullScreen * Fixed subtitles parsing * Better Player 0.0.35 Co-authored-by: jhomlala <[email protected]>
jhomlala · Nov 21, 2020 · b07dcaf · b07dcaf
1 parent 943798b
commit b07dcaf
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.0.35
+* Fixed iOS black screen issue
+* Fixed full screen placeholder issue
+* Fixed event not firing in enterFullScreen and exitFullScreen
+* Fixed subtitles parsing issues
+
+
 ## 0.0.34
 * Added memory data source
 * Added factories: network, file, memory for BetterPlayerDataSource

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ This plugin is based on [Chewie](https://github.com/brianegan/chewie). Chewie is
 
 ```yaml
 dependencies:
-  better_player: ^0.0.34
+  better_player: ^0.0.35
 ```
 
 2. Install it

diff --git a/example/lib/pages/subtitles_page.dart b/example/lib/pages/subtitles_page.dart
@@ -48,7 +48,7 @@ class _SubtitlesPageState extends State<SubtitlesPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("Normal player"),
+        title: Text("Subtitles"),
       ),
       body: Column(children: [
         const SizedBox(height: 8),

diff --git a/ios/Classes/FLTBetterPlayerPlugin.m b/ios/Classes/FLTBetterPlayerPlugin.m
@@ -506,10 +506,11 @@ - (CVPixelBufferRef)prevTransparentBuffer {
 }
 
 - (CVPixelBufferRef)copyPixelBuffer {
-  if (!_videoOutput || !_isInitialized || !_isPlaying || !_key || ![_player currentItem] ||
+  //Disabled because of black frame issue
+  /*if (!_videoOutput || !_isInitialized || !_isPlaying || !_key || ![_player currentItem] ||
       ![[_player currentItem] isPlaybackLikelyToKeepUp]) {
     return [self prevTransparentBuffer];
-  }
+  }*/
 
   CMTime outputItemTime = [_videoOutput itemTimeForHostTime:CACurrentMediaTime()];
   if ([_videoOutput hasNewPixelBufferForItemTime:outputItemTime]) {

diff --git a/lib/src/core/better_player_controller.dart b/lib/src/core/better_player_controller.dart
@@ -289,11 +289,13 @@ class BetterPlayerController extends ChangeNotifier {
 
   void enterFullScreen() {
     _isFullScreen = true;
+    _postEvent(BetterPlayerEvent(BetterPlayerEventType.OPEN_FULLSCREEN));
     notifyListeners();
   }
 
   void exitFullScreen() {
     _isFullScreen = false;
+    _postEvent(BetterPlayerEvent(BetterPlayerEventType.HIDE_FULLSCREEN));
     notifyListeners();
   }
 
@@ -308,7 +310,6 @@ class BetterPlayerController extends ChangeNotifier {
   Future<void> play() async {
     await videoPlayerController.play();
     _hasCurrentDataSourceStarted = true;
-    notifyListeners();
     _postEvent(BetterPlayerEvent(BetterPlayerEventType.PLAY));
   }
 

diff --git a/lib/src/core/better_player_with_controls.dart b/lib/src/core/better_player_with_controls.dart
@@ -209,27 +209,33 @@ class _BetterPlayerVideoFitWidgetState
   }
 
   void _initialize() {
-    _initializedListener = () {
-      if (!mounted) {
-        return;
-      }
-      if (_initialized != controller.value.initialized) {
-        _initialized = controller.value.initialized;
-        setState(() {});
-      }
-      widget.betterPlayerController.addListener(() {
+    if (controller?.value?.initialized == false) {
+      _initializedListener = () {
+        if (!mounted) {
+          return;
+        }
+
+        if (_initialized != controller.value.initialized) {
+          _initialized = controller.value.initialized;
+          setState(() {});
+        }
+      };
+      controller.addListener(_initializedListener);
+    } else {
+      _initialized = true;
+    }
+    widget.betterPlayerController.addEventsListener((event) {
+      if (event.betterPlayerEventType == BetterPlayerEventType.PLAY) {
         if (widget.betterPlayerController.betterPlayerConfiguration
                 .showPlaceholderUntilPlay &&
             !_started) {
           setState(() {
             _started =
                 widget.betterPlayerController.hasCurrentDataSourceStarted;
-            print("STARTED:" + _started.toString());
           });
         }
-      });
-    };
-    controller.addListener(_initializedListener);
+      }
+    });
   }
 
   @override

diff --git a/lib/src/subtitles/better_player_subtitle.dart b/lib/src/subtitles/better_player_subtitle.dart
@@ -53,7 +53,8 @@ class BetterPlayerSubtitle {
       if (scanner[0].isEmpty) {
         scanner.removeAt(0);
       }
-      final index = int.parse(scanner[0]);
+
+      final index = int.tryParse(scanner[0]);
 
       var timeSplit = scanner[1].split(timerSeparator);
       final start = _stringToDuration(timeSplit[0]);
@@ -71,7 +72,16 @@ class BetterPlayerSubtitle {
   static Duration _stringToDuration(String value) {
     assert(value != null);
     try {
-      final component = value.split(':');
+      final valueSplit = value.split(" ");
+      String componentValue;
+
+      if (valueSplit.length > 1) {
+        componentValue = valueSplit[0];
+      } else {
+        componentValue = value;
+      }
+
+      final component = componentValue.split(':');
       if (component.length != 3) {
         return Duration();
       }
@@ -81,11 +91,13 @@ class BetterPlayerSubtitle {
       if (secsAndMillsSplit.length != 2) {
         return Duration();
       }
-      return Duration(
-          hours: int.parse(component[0]),
-          minutes: int.parse(component[1]),
-          seconds: int.parse(secsAndMillsSplit[0]),
-          milliseconds: int.parse(secsAndMillsSplit[1]));
+
+      var result = Duration(
+          hours: int.tryParse(component[0]),
+          minutes: int.tryParse(component[1]),
+          seconds: int.tryParse(secsAndMillsSplit[0]),
+          milliseconds: int.tryParse(secsAndMillsSplit[1]));
+      return result;
     } catch (exception) {
       print("Failed to process value: $value");
       return Duration();

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: better_player
 description: Advanced video player based on video_player and Chewie. It's solves many typical use cases and it's easy to run.
-version: 0.0.34
+version: 0.0.35
 authors:
   - Jakub Homlala <[email protected]>
 homepage: https://github.com/jhomlala/betterplayer