remove unnecessary local variable and improve code quality

Change-Id: Ic1bc750a435b052065ac02aae702410adb58500b

diff --git a/packaging/libtrackrenderer.spec b/packaging/libtrackrenderer.spec
index 67f18c0..6d874ea 100644 (file)
--- a/packaging/libtrackrenderer.spec
+++ b/packaging/libtrackrenderer.spec
@@ -1,6 +1,6 @@
 Name:       libtrackrenderer
 Summary:    new multimedia streaming player trackrenderer
-Version:    0.0.6
+Version:    0.0.7
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/resourcemanager.cpp b/src/resourcemanager.cpp
index c0b4b76..a058dbb 100644 (file)
--- a/src/resourcemanager.cpp
+++ b/src/resourcemanager.cpp
@@ -99,20 +99,17 @@ bool ResourceManager::Acquire(const std::list<ResourceProperty>& properties) {
 
 bool ResourceManager::Release() {
   int rm_ret = MM_RESOURCE_MANAGER_ERROR_NONE;
-  bool ret = true;
 
   TRACKRENDERER_ENTER;
-  if (resourcelist_.empty() || resourcelist_.size() == 0) return ret;
+  if (resourcelist_.empty()) return true;
 
   rm_ret = mm_resource_manager_mark_all_for_release(resourcemanager_handle_);
   if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
     TRACKRENDERER_ERROR("failed to mark resource for release, ret(0x%x)", rm_ret);
-    ret = false;
   } else {
     rm_ret = mm_resource_manager_commit(resourcemanager_handle_);
     if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
       TRACKRENDERER_ERROR("failed to commit of resource, ret(0x%x)", rm_ret);
-      ret = false;
     }
   }
 
@@ -120,16 +117,15 @@ bool ResourceManager::Release() {
   resourcelist_.clear();
 
   TRACKRENDERER_LEAVE;
-  return ret;
+  return (rm_ret == MM_RESOURCE_MANAGER_ERROR_NONE);
 }
 
 bool ResourceManager::Release(const ResourceCategory type) {
   int rm_ret = MM_RESOURCE_MANAGER_ERROR_NONE;
-  bool ret = true;
 
   TRACKRENDERER_ENTER;
 
-  if (resourcelist_.empty()) return ret;
+  if (resourcelist_.empty()) return true;
 
   auto compare = [type](Resource & item) noexcept->bool {
     return item.GetResourceCategory() == type;
@@ -140,19 +136,17 @@ bool ResourceManager::Release(const ResourceCategory type) {
   // There is no resource.
   if (target == resourcelist_.end()) {
     TRACKRENDERER_ERROR("there is no acquired [%d type] resource", (int)type);
-    return ret;
+    return true;
   }
 
   TRACKRENDERER_INFO("resource Type[%d]", (int)type);
   rm_ret = mm_resource_manager_mark_for_release(resourcemanager_handle_, target->GetResourceHandle());
   if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
     TRACKRENDERER_ERROR("failed to mark resource for release, ret(0x%x)", rm_ret);
-    ret = false;
   } else {
     rm_ret = mm_resource_manager_commit(resourcemanager_handle_);
     if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
       TRACKRENDERER_ERROR("failed to commit of resource, ret(0x%x)", rm_ret);
-      ret = false;
     }
   }
 
@@ -161,7 +155,7 @@ bool ResourceManager::Release(const ResourceCategory type) {
   TRACKRENDERER_DEBUG("resourcelist_.size() = %zu", resourcelist_.size());
 
   TRACKRENDERER_LEAVE;
-  return ret;
+  return (rm_ret == MM_RESOURCE_MANAGER_ERROR_NONE);
 }
 
 }  // namespace trackrenderer

diff --git a/src/trackrenderer.cpp b/src/trackrenderer.cpp
index 0a341b7..1ba3562 100644 (file)
--- a/src/trackrenderer.cpp
+++ b/src/trackrenderer.cpp
@@ -1433,11 +1433,11 @@ bool TrackRenderer::ReleaseResource_() {
   TRACKRENDERER_ENTER;
   pipeline_.reset();
 
-  for (int res_idx = (int)ResourceCategory::kVideoDecoder; res_idx <= (int)ResourceCategory::kVideoRenderer; res_idx++) {
-    if (!resource_manager_->Release((ResourceCategory)res_idx)) {
-      TRACKRENDERER_ERROR("failed to release [%d] resources", res_idx);
-    }
-  }
+  if (!resource_manager_->Release(ResourceCategory::kVideoDecoder))
+    TRACKRENDERER_ERROR("failed to release Decoder resources");
+
+  if (!resource_manager_->Release(ResourceCategory::kVideoRenderer))
+    TRACKRENDERER_ERROR("failed to release Renderer resources");
 
   for (int i = 0; i < kTrackTypeMax; ++i) {
     trackctx_[i].index = kInvalidTrackIndex;
@@ -2041,8 +2041,12 @@ bool TrackRenderer::Deactivate(TrackType type) {
     if (target != trackinfo_.end()) {
       trackinfo_.erase(target);
     }
-    resource_manager_->Release(ResourceCategory::kVideoDecoder);
-    resource_manager_->Release(ResourceCategory::kVideoRenderer);
+
+    if (!resource_manager_->Release(ResourceCategory::kVideoDecoder))
+      TRACKRENDERER_ERROR("failed to release Decoder resources");
+
+    if (!resource_manager_->Release(ResourceCategory::kVideoRenderer))
+      TRACKRENDERER_ERROR("failed to release Renderer resources");
   } else if (type == kTrackTypeAudio) {
     pipeline_->PadAddProbe(Elements::kAppSrcAudio, kPadProbeAudioBlock, "src",
                            GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,