Ensure drm manager session are released even if player is null

flutter-tizen · Jan 9, 2024 · b07235a · b07235a
1 parent 9649d94
commit b07235a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/packages/video_player_avplay/tizen/src/drm_manager.cc b/packages/video_player_avplay/tizen/src/drm_manager.cc
@@ -46,6 +46,7 @@ DrmManager::~DrmManager() {
   ReleaseDrmSession();
   if (license_request_pipe_) {
     ecore_pipe_del(license_request_pipe_);
+    license_request_pipe_ = nullptr;
   }
   if (drm_manager_proxy_) {
     CloseDrmManagerProxy(drm_manager_proxy_);

diff --git a/packages/video_player_avplay/tizen/src/plus_player.cc b/packages/video_player_avplay/tizen/src/plus_player.cc
@@ -39,20 +39,14 @@ PlusPlayer::PlusPlayer(flutter::BinaryMessenger *messenger,
     : VideoPlayer(messenger, flutter_view), video_format_(video_format) {}
 
 PlusPlayer::~PlusPlayer() {
-  if (!player_) {
-    LOG_ERROR("[PlusPlayer] Player not created.");
-    return;
-  }
-  if (!Stop(player_)) {
-    LOG_INFO("[PlusPlayer] Player fail to stop.");
-    return;
+  if (player_) {
+    Stop(player_);
+    Close(player_);
+    UnregisterListener(player_);
+    DestroyPlayer(player_);
+    player_ = nullptr;
   }
 
-  Close(player_);
-  UnregisterListener(player_);
-  DestroyPlayer(player_);
-  player_ = nullptr;
-
   if (drm_manager_) {
     drm_manager_->ReleaseDrmSession();
   }