Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2d3366e
fix issue where texture is not updated on a seek if the video is paused
KevinTheGray May 13, 2020
2f876ff
update changelog and pubspec
KevinTheGray May 13, 2020
b27c473
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray May 14, 2020
bd35755
Merge commit '25a585dfeef6d2dc224fd0dddee327372de63782' into kg/video…
KevinTheGray May 19, 2020
b057143
early idea for managing location permissions in connectivity plugin
KevinTheGray May 19, 2020
ffe59ed
updated example to handle missing plugin exceptions
KevinTheGray May 19, 2020
521f4ea
added update for README
KevinTheGray May 19, 2020
599cc9f
added back ability to access wifi ip, and updated README
KevinTheGray May 19, 2020
93cd68c
using `ifndef` to disable the code
KevinTheGray May 20, 2020
9ece248
update readme
KevinTheGray May 20, 2020
1c4b0a5
updated changelog and pubspec info
KevinTheGray May 20, 2020
4f44e67
Merge remote-tracking branch 'upstream/master' into kg/video-player-p…
KevinTheGray May 20, 2020
70c4864
Merge branch 'master' into kg-connectivity-ios-permissions
KevinTheGray May 20, 2020
4085426
fix formatting for iOS file
KevinTheGray May 20, 2020
8eac416
formatting again
KevinTheGray May 20, 2020
dfa1de7
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray May 27, 2020
57c7ff2
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Jul 2, 2020
502f860
Merge branch 'master' into kg-connectivity-ios-permissions
KevinTheGray Jul 2, 2020
5c0dd5f
Merge branch 'master' into kg-connectivity-ios-permissions
KevinTheGray Jul 27, 2020
3e7406d
trigger ci
KevinTheGray Jul 28, 2020
47d6080
Merge branch 'master' into kg-connectivity-ios-permissions
KevinTheGray Aug 20, 2020
2a57588
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Aug 28, 2020
52867c1
trigger ci
KevinTheGray Aug 28, 2020
9f633d8
Merge branch 'kg-connectivity-ios-permissions' of https://github.com/…
KevinTheGray Aug 28, 2020
1078109
trigger ci
KevinTheGray Aug 28, 2020
c2732ba
Merge branch 'master' into kg-connectivity-ios-permissions
KevinTheGray Aug 31, 2020
0454e6a
Merge branch 'master' of https://github.com/flutter/plugins
KevinTheGray Sep 20, 2020
0990566
Merge branch 'master' of https://github.com/flutter/plugins into kg/v…
KevinTheGray Sep 20, 2020
0d84d04
Merge branch 'master' of https://github.com/flutter/plugins into kg/v…
KevinTheGray Sep 29, 2020
d7581dc
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Oct 19, 2020
3fc5d8d
Merge remote-tracking branch 'upstream/master'
KevinTheGray Dec 1, 2020
b1afe61
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Dec 1, 2020
bd14a52
revert changes made to wifi location handler
KevinTheGray Dec 1, 2020
a656cb7
Merge remote-tracking branch 'upstream/master' into kg/video-player-p…
KevinTheGray Dec 3, 2020
857eee4
trigger ci
KevinTheGray Dec 3, 2020
8067f0d
merge and fix
KevinTheGray Jan 22, 2021
22cf443
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Feb 16, 2021
6ce6962
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Feb 23, 2021
8ea281b
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Feb 24, 2021
dd1c005
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Mar 10, 2021
32e9a18
Merge branch 'master' of https://github.com/flutter/plugins into kg/v…
KevinTheGray Mar 17, 2021
b35350e
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray May 13, 2021
c5e5de0
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray May 24, 2021
a059d25
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray May 27, 2021
26ab0b6
Update pubspec.yaml
KevinTheGray May 27, 2021
f9db7ed
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Jun 1, 2021
db78101
Update pubspec.yaml
KevinTheGray Jun 1, 2021
efb3b9d
Merge branch 'master' of https://github.com/flutter/plugins
KevinTheGray Aug 5, 2021
5d6270f
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Aug 5, 2021
22f84a3
add test
KevinTheGray Aug 7, 2021
4b596eb
formatting
KevinTheGray Aug 7, 2021
ce4ac04
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Aug 16, 2021
c82f4d3
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Aug 22, 2021
7441a22
Update CHANGELOG.md
KevinTheGray Aug 22, 2021
efcef02
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Sep 13, 2021
6bb2c30
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Sep 15, 2021
d60955f
Update pubspec.yaml
KevinTheGray Sep 15, 2021
7c956c1
Merge branch 'master' into kg/video-player-plugin-fix
ened Sep 16, 2021
b693201
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Sep 20, 2021
d090e03
Update pubspec.yaml
KevinTheGray Sep 20, 2021
f523cf6
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Sep 23, 2021
dd18f6d
Update pubspec.yaml
KevinTheGray Sep 23, 2021
4051e03
merge with master
KevinTheGray Nov 8, 2021
977ec09
make initWithRegistrar public and use it in test
KevinTheGray Nov 8, 2021
a290c9f
Merge branch 'master' of https://github.com/flutter/plugins
KevinTheGray Nov 10, 2021
1aa8c04
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Nov 10, 2021
8bff5b4
Merge branch 'master' into kg/video-player-plugin-fix
KevinTheGray Nov 20, 2021
905599d
Merge branch 'master' into kg/video-player-plugin-fix
ened Dec 21, 2021
09b04cf
Address PR feedback
ened Dec 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/video_player/video_player/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.2.10

* iOS: Updates texture on `seekTo`.

## 2.2.9

* Adds compatibility with `video_player_platform_interface` 5.0, which does not
Expand Down
1 change: 1 addition & 0 deletions packages/video_player/video_player/example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target 'Runner' do
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
pod 'OCMock', '3.5'
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,37 @@
@import video_player;
@import XCTest;

#import <OCMock/OCMock.h>

@interface VideoPlayerTests : XCTestCase
@end

@implementation VideoPlayerTests

- (void)testPlugin {
FLTVideoPlayerPlugin* plugin = [[FLTVideoPlayerPlugin alloc] init];
FLTVideoPlayerPlugin *plugin = [[FLTVideoPlayerPlugin alloc] init];
XCTAssertNotNil(plugin);
}

- (void)testSeekToInvokesTextureFrameAvailableOnTextureRegistry {
NSObject<FlutterTextureRegistry> *mockTextureRegistry =
OCMProtocolMock(@protocol(FlutterTextureRegistry));
NSObject<FlutterPluginRegistry> *registry =
(NSObject<FlutterPluginRegistry> *)[[UIApplication sharedApplication] delegate];
NSObject<FlutterPluginRegistrar> *registrar =
[registry registrarForPlugin:@"TEST_FLTVideoPlayerPlugin"];
NSObject<FlutterPluginRegistrar> *partialRegistrar = OCMPartialMock(registrar);
OCMStub([partialRegistrar textures]).andReturn(mockTextureRegistry);
[FLTVideoPlayerPlugin registerWithRegistrar:partialRegistrar];
FLTVideoPlayerPlugin<FLTVideoPlayerApi> *videoPlayerPlugin =
(FLTVideoPlayerPlugin<FLTVideoPlayerApi> *)[[FLTVideoPlayerPlugin alloc]
initWithRegistrar:partialRegistrar];
FLTPositionMessage *message = [[FLTPositionMessage alloc] init];
message.textureId = @101;
message.position = @0;
FlutterError *error;
[videoPlayerPlugin seekTo:message error:&error];
OCMVerify([mockTextureRegistry textureFrameAvailable:message.textureId.intValue]);
}

@end
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
#import <Flutter/Flutter.h>

@interface FLTVideoPlayerPlugin : NSObject <FlutterPlugin>
- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@ - (FLTPositionMessage*)position:(FLTTextureMessage*)input error:(FlutterError**)
- (void)seekTo:(FLTPositionMessage*)input error:(FlutterError**)error {
FLTVideoPlayer* player = _players[input.textureId];
[player seekTo:[input.position intValue]];
[_registry textureFrameAvailable:input.textureId.intValue];
}

- (void)pause:(FLTTextureMessage*)input error:(FlutterError**)error {
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
widgets on Android, iOS, and web.
repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
version: 2.2.9
version: 2.2.10

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down