diff --git a/packages/video_player_avplay/CHANGELOG.md b/packages/video_player_avplay/CHANGELOG.md index 3f21f1cab..9bdc9b9bd 100644 --- a/packages/video_player_avplay/CHANGELOG.md +++ b/packages/video_player_avplay/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.8.8 + +* Update the conditional statement for the `_currentCaptions`. +* Update plusplayer + 1. [DASH] Fix the issue where subtitles for content with pre-roll/inserted ads in DASH could not be rendered. + ## 0.8.7 * Update plusplayer diff --git a/packages/video_player_avplay/README.md b/packages/video_player_avplay/README.md index 242a14544..f0bd41aa7 100644 --- a/packages/video_player_avplay/README.md +++ b/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.8.7 + video_player_avplay: ^0.8.8 ``` Then you can import `video_player_avplay` in your Dart code: diff --git a/packages/video_player_avplay/lib/video_player.dart b/packages/video_player_avplay/lib/video_player.dart index 580369e5d..1a9d2e38b 100644 --- a/packages/video_player_avplay/lib/video_player.dart +++ b/packages/video_player_avplay/lib/video_player.dart @@ -200,16 +200,19 @@ class VideoPlayerValue { /// If the end postion of the captions has greater than the current [position], this will be a [Caption.none] object. /// Only used for [copyWith]. Captions get _currentCaptions { - final List textCaptions = - (captions.textCaptions == [TextCaption.none] || - position > captions.textCaptions![0].end) - ? [TextCaption.none] - : captions.textCaptions!; - final PictureCaption pictureCaption = - (captions.pictureCaption == PictureCaption.none || - position > captions.pictureCaption!.end) - ? PictureCaption.none - : captions.pictureCaption!; + final List textCaptions = (captions.textCaptions == null || + captions.textCaptions!.isEmpty || + captions.textCaptions![0] == TextCaption.none || + position > captions.textCaptions![0].end || + position < captions.textCaptions![0].start) + ? [TextCaption.none] + : captions.textCaptions!; + final PictureCaption pictureCaption = (captions.pictureCaption == null || + captions.pictureCaption == PictureCaption.none || + position > captions.pictureCaption!.end || + position < captions.pictureCaption!.start) + ? PictureCaption.none + : captions.pictureCaption!; return Captions(textCaptions: textCaptions, pictureCaption: pictureCaption); } @@ -1156,8 +1159,11 @@ class VideoPlayerController extends ValueNotifier { /// [Caption]. List _getCaptionAt(Duration position) { if (_closedCaptionFile == null) { - return (value.captions.textCaptions == [TextCaption.none] || - position > value.captions.textCaptions![0].end) + return (value.captions.textCaptions == null || + value.captions.textCaptions!.isEmpty || + value.captions.textCaptions![0] == TextCaption.none || + position > value.captions.textCaptions![0].end || + position < value.captions.textCaptions![0].start) ? [TextCaption.none] : value.captions.textCaptions!; } @@ -1175,8 +1181,10 @@ class VideoPlayerController extends ValueNotifier { } PictureCaption _getPictureCaptionAt(Duration position) { - return (value.captions.pictureCaption == PictureCaption.none || - position > value.captions.pictureCaption!.end) + return (value.captions.pictureCaption == null || + value.captions.pictureCaption == PictureCaption.none || + position > value.captions.pictureCaption!.end || + position < value.captions.pictureCaption!.start) ? PictureCaption.none : value.captions.pictureCaption!; } diff --git a/packages/video_player_avplay/pubspec.yaml b/packages/video_player_avplay/pubspec.yaml index 4fdb39a62..49e9a626f 100644 --- a/packages/video_player_avplay/pubspec.yaml +++ b/packages/video_player_avplay/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_avplay description: Flutter plugin for displaying inline video on Tizen TV devices. homepage: https://github.com/flutter-tizen/plugins repository: https://github.com/flutter-tizen/plugins/tree/master/packages/video_player_avplay -version: 0.8.7 +version: 0.8.8 environment: sdk: ">=3.1.0 <4.0.0" diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libavcodec_common.so index 5fcb959d8..4d0d1de26 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libdash.so index fb6aae78e..5dc3b01bc 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libdashplusplayer_tvplus.so index 111c1e2a1..d116941ae 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libgstdash.so index 44fc0815a..eeea86edc 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libplusplayer_tvplus.so index ee4107a35..29d2e86b3 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/10.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/10.0/libtracksource_tvplus.so index 6f64eeab5..f85727329 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/10.0/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/10.0/libtracksource_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so index 13cd52660..6342d343f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so index be0c60c5b..76ee0bd9f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so index 1d8f19413..7dacfc338 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so index 804842ee6..78ee0325c 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so index 72894f664..203226f89 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so index bcde68f81..a12546d2d 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.0/libtracksource_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so index 13cd52660..6342d343f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so index b97f63e18..a7bde4dd9 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so index 8bbb02370..3a1ef0dfb 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so index fd5d2fb8f..b1fdcf9db 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so index 27b2f813b..6f8017a57 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so index 2ded4f3e6..e98eeee12 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/6.5/libtracksource_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so index 13cd52660..6342d343f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so index b97f63e18..a7bde4dd9 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so index 8bbb02370..3a1ef0dfb 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so index fd5d2fb8f..b1fdcf9db 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so index 27b2f813b..6f8017a57 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so index 2ded4f3e6..e98eeee12 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/7.0/libtracksource_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libavcodec_common.so index 13cd52660..6342d343f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libdash.so index b97f63e18..a7bde4dd9 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libdashplusplayer_tvplus.so index 8bbb02370..3a1ef0dfb 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libgstdash.so index fd5d2fb8f..b1fdcf9db 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libplusplayer_tvplus.so index 27b2f813b..6f8017a57 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/8.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/8.0/libtracksource_tvplus.so index 2ded4f3e6..e98eeee12 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/8.0/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/8.0/libtracksource_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libavcodec_common.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libavcodec_common.so index 13cd52660..6342d343f 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libavcodec_common.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libavcodec_common.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libdash.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libdash.so index b97f63e18..a7bde4dd9 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libdash.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libdashplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libdashplusplayer_tvplus.so index 8bbb02370..3a1ef0dfb 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libdashplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libdashplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libgstdash.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libgstdash.so index fd5d2fb8f..b1fdcf9db 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libgstdash.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libgstdash.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libplusplayer_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libplusplayer_tvplus.so index 27b2f813b..6f8017a57 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libplusplayer_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libplusplayer_tvplus.so differ diff --git a/packages/video_player_avplay/tizen/lib/armel/9.0/libtracksource_tvplus.so b/packages/video_player_avplay/tizen/lib/armel/9.0/libtracksource_tvplus.so index 2ded4f3e6..e98eeee12 100755 Binary files a/packages/video_player_avplay/tizen/lib/armel/9.0/libtracksource_tvplus.so and b/packages/video_player_avplay/tizen/lib/armel/9.0/libtracksource_tvplus.so differ