[video_player] Fix seekTo so that it returns when seeking is completed (#256)

* [video_player] Fix seekTo is returned when seeking.

* [video_player] Fix format issue.

* [video_player] Fix the source as review result.

* [video_player] Fix the format issue.

Author: wanchao-xu

packages/video_player/CHANGELOG.md

@@ -18,3 +18,7 @@
 ## 2.2.1
 
 * Update README
+
+## 2.2.2
+
+* Fix `seekTo` so that it returns when seeking is completed.

packages/video_player/README.md

@@ -27,7 +27,7 @@ This package is not an _endorsed_ implementation of `video_player`. Therefore, y
 ```yaml
 dependencies:
   video_player: ^2.2.3
-  video_player_tizen: ^2.2.1
+  video_player_tizen: ^2.2.2
 ```
 
 Then you can import `video_player` in your Dart code:

packages/video_player/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
   widgets on Tizen.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/video_player
-version: 2.2.1
+version: 2.2.2
 
 flutter:
   plugin:

packages/video_player/tizen/src/message.cc

@@ -517,16 +517,18 @@ void VideoPlayerApi::setup(flutter::BinaryMessenger *binaryMessenger,
         [api](const flutter::EncodableValue &message,
               flutter::MessageReply<flutter::EncodableValue> reply) {
           PositionMessage input = PositionMessage::fromMap(message);
-          flutter::EncodableMap wrapped;
           try {
-            api->seekTo(input);
-            wrapped.emplace(flutter::EncodableValue("result"),
-                            flutter::EncodableValue());
+            api->seekTo(input, [reply]() {
+              flutter::EncodableMap wrapped = {
+                  {flutter::EncodableValue("result"),
+                   flutter::EncodableValue()}};
+              reply(flutter::EncodableValue(wrapped));
+            });
           } catch (const VideoPlayerError &e) {
-            wrapped.emplace(flutter::EncodableValue("error"),
-                            VideoPlayerApi::wrapError(e));
+            flutter::EncodableMap error = {{flutter::EncodableValue("error"),
+                                            VideoPlayerApi::wrapError(e)}};
+            reply(flutter::EncodableValue(error));
           }
-          reply(flutter::EncodableValue(wrapped));
         });
   }
 

packages/video_player/tizen/src/message.h

@@ -139,6 +139,8 @@ class MixWithOthersMessage {
   bool mixWithOthers_;
 };
 
+using SeekCompletedCb = std::function<void()>;
+
 class VideoPlayerApi {
  public:
   virtual void initialize() = 0;
@@ -150,7 +152,8 @@ class VideoPlayerApi {
   virtual void play(const TextureMessage &textureMsg) = 0;
   virtual void pause(const TextureMessage &textureMsg) = 0;
   virtual PositionMessage position(const TextureMessage &textureMsg) = 0;
-  virtual void seekTo(const PositionMessage &positionMsg) = 0;
+  virtual void seekTo(const PositionMessage &positionMsg,
+                      const SeekCompletedCb &onSeekCompleted) = 0;
   virtual void setMixWithOthers(
       const MixWithOthersMessage &mixWithOthersMsg) = 0;
 

packages/video_player/tizen/src/video_player.cc

@@ -261,14 +261,18 @@ void VideoPlayer::setPlaybackSpeed(double speed) {
   }
 }
 
-void VideoPlayer::seekTo(int position) {
+void VideoPlayer::seekTo(int position,
+                         const SeekCompletedCb &seek_completed_cb) {
   LOG_DEBUG("[VideoPlayer.seekTo] position: %d", position);
-  int ret = player_set_play_position(player_, position, true, nullptr, nullptr);
+  int ret =
+      player_set_play_position(player_, position, true, onSeekCompleted, this);
   if (ret != PLAYER_ERROR_NONE) {
     LOG_ERROR("[VideoPlayer.seekTo] player_set_play_position failed: %s",
               get_error_message(ret));
     throw VideoPlayerError("player_set_play_position failed",
                            get_error_message(ret));
+  } else {
+    on_seek_completed_ = seek_completed_cb;
   }
 }
 
@@ -467,6 +471,16 @@ void VideoPlayer::onBuffering(int percent, void *data) {
   LOG_DEBUG("[VideoPlayer.onBuffering] percent: %d", percent);
 }
 
+void VideoPlayer::onSeekCompleted(void *data) {
+  VideoPlayer *player = (VideoPlayer *)data;
+  LOG_DEBUG("[VideoPlayer.onSeekCompleted] completed to seek");
+
+  if (player->on_seek_completed_) {
+    player->on_seek_completed_();
+    player->on_seek_completed_ = nullptr;
+  }
+}
+
 void VideoPlayer::onPlayCompleted(void *data) {
   VideoPlayer *player = (VideoPlayer *)data;
   LOG_DEBUG("[VideoPlayer.onPlayCompleted] completed to playe video");

packages/video_player/tizen/src/video_player.h

@@ -11,6 +11,8 @@
 
 #include "video_player_options.h"
 
+using SeekCompletedCb = std::function<void()>;
+
 class VideoPlayer {
  public:
   VideoPlayer(flutter::PluginRegistrar *plugin_registrar,
@@ -24,8 +26,9 @@ class VideoPlayer {
   void setLooping(bool is_looping);
   void setVolume(double volume);
   void setPlaybackSpeed(double speed);
-  void seekTo(int position);  // milliseconds
-  int getPosition();          // milliseconds
+  void seekTo(int position,
+              const SeekCompletedCb &seek_completed_cb);  // milliseconds
+  int getPosition();                                      // milliseconds
   void dispose();
 
  private:
@@ -40,6 +43,7 @@ class VideoPlayer {
 
   static void onPrepared(void *data);
   static void onBuffering(int percent, void *data);
+  static void onSeekCompleted(void *data);
   static void onPlayCompleted(void *data);
   static void onInterrupted(player_interrupted_code_e code, void *data);
   static void onErrorOccurred(int code, void *data);
@@ -56,6 +60,7 @@ class VideoPlayer {
   std::unique_ptr<FlutterDesktopGpuBuffer> flutter_desktop_gpu_buffer_;
   std::mutex mutex_;
   media_packet_h media_packet_ = nullptr;
+  SeekCompletedCb on_seek_completed_;
 };
 
 #endif  // VIDEO_PLAYER_H_

packages/video_player/tizen/src/video_player_tizen_plugin.cc

@@ -32,7 +32,8 @@ class VideoPlayerTizenPlugin : public flutter::Plugin, public VideoPlayerApi {
   virtual void play(const TextureMessage &textureMsg) override;
   virtual void pause(const TextureMessage &textureMsg) override;
   virtual PositionMessage position(const TextureMessage &textureMsg) override;
-  virtual void seekTo(const PositionMessage &positionMsg) override;
+  virtual void seekTo(const PositionMessage &positionMsg,
+                      const SeekCompletedCb &onSeekCompleted) override;
   virtual void setMixWithOthers(
       const MixWithOthersMessage &mixWithOthersMsg) override;
 
@@ -199,15 +200,16 @@ PositionMessage VideoPlayerTizenPlugin::position(
   return result;
 }
 
-void VideoPlayerTizenPlugin::seekTo(const PositionMessage &positionMsg) {
+void VideoPlayerTizenPlugin::seekTo(const PositionMessage &positionMsg,
+                                    const SeekCompletedCb &onSeekCompleted) {
   LOG_DEBUG("[VideoPlayerTizenPlugin.seekTo] textureId: %ld",
             positionMsg.getTextureId());
   LOG_DEBUG("[VideoPlayerTizenPlugin.seekTo] position: %ld",
             positionMsg.getPosition());
 
   auto iter = videoPlayers_.find(positionMsg.getTextureId());
   if (iter != videoPlayers_.end()) {
-    iter->second->seekTo(positionMsg.getPosition());
+    iter->second->seekTo(positionMsg.getPosition(), onSeekCompleted);
   }
 }