Fix no return value issue

flutter-tizen · Jan 19, 2024 · d6dcd0d · d6dcd0d
1 parent 17687f0
commit d6dcd0d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/packages/video_player_avplay/tizen/src/drm_manager.cc b/packages/video_player_avplay/tizen/src/drm_manager.cc
@@ -21,7 +21,6 @@ static std::string GetDrmSubType(int drm_type) {
   }
 }
 
-std::unique_ptr<DrmManagerProxy> drm_manager_proxy_;
 DrmManager::DrmManager()
     : drm_manager_proxy_(std::make_unique<DrmManagerProxy>()),
       drm_type_(DM_TYPE_NONE) {
@@ -42,11 +41,6 @@ DrmManager::~DrmManager() {
 }
 
 bool DrmManager::CreateDrmSession(int drm_type, bool local_mode) {
-  if (!drm_manager_proxy_) {
-    LOG_ERROR("[DrmManager] Invalid handle of libdrmmanager.");
-    return false;
-  }
-
   if (local_mode) {
     drm_manager_proxy_->DMGRSetDRMLocalMode();
   }
@@ -212,7 +206,6 @@ int DrmManager::SetChallenge(const std::string &media_url) {
               get_error_message(ret));
     return ret;
   }
-  initialized_ = true;
   return ret;
 }
 

diff --git a/packages/video_player_avplay/tizen/src/drm_manager.h b/packages/video_player_avplay/tizen/src/drm_manager.h
@@ -64,7 +64,6 @@ class DrmManager {
 
   int drm_type_;
   std::string license_server_url_;
-  bool initialized_ = false;
   std::mutex queue_mutex_;
   Ecore_Pipe *license_request_pipe_ = nullptr;
   std::queue<DataForLicenseProcess> license_request_queue_;

diff --git a/packages/video_player_avplay/tizen/src/drm_manager_proxy.cc b/packages/video_player_avplay/tizen/src/drm_manager_proxy.cc
@@ -90,7 +90,7 @@ bool DrmManagerProxy::DMGRSecurityInitCompleteCB(int* drm_handle,
   if (dmgr_security_init_complete_cb_ == nullptr) {
     return false;
   }
-  dmgr_security_init_complete_cb_(drm_handle, len, pssh_data, user_data);
+  return dmgr_security_init_complete_cb_(drm_handle, len, pssh_data, user_data);
 }
 
 int DrmManagerProxy::DMGRReleaseDRMSession(DRMSessionHandle_t drm_session) {

diff --git a/packages/video_player_avplay/tizen/src/drm_manager_proxy.h b/packages/video_player_avplay/tizen/src/drm_manager_proxy.h
@@ -109,7 +109,7 @@ typedef int (*FuncDMGRReleaseDRMSession)(DRMSessionHandle_t drm_session);
 
 class DrmManagerProxy {
  public:
-  DrmManagerProxy();
+  explicit DrmManagerProxy();
   ~DrmManagerProxy();
   int DMGRSetData(DRMSessionHandle_t drm_session, const char* data_type,
                   void* input_data);