From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Fri, 1 Jun 2018 07:29:41 +0000 (+0900)
Subject: Fix return value for resource conflict error
X-Git-Tag: submit/tizen/20180607.021137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen%2F20180607.021137;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git

Fix return value for resource conflict error

[Version] 0.10.159
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A

Change-Id: I2eb97dcbffd3490dac0df2f833df1f5fa0037357
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 7367fb3..97b8c22 100644
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.158
+Version:    0.10.159
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index 0255c0b..27aded1 100644
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -951,7 +951,7 @@ int _mmcamcorder_realize(MMHandleType handle)
 					&hcamcorder->camera_resource);
 			if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
 				_mmcam_dbg_err("could not prepare for camera resource");
-				ret = MM_ERROR_CAMCORDER_INTERNAL;
+				ret = MM_ERROR_RESOURCE_INTERNAL;
 				_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 				goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 			}
@@ -968,7 +968,7 @@ int _mmcamcorder_realize(MMHandleType handle)
 						&hcamcorder->video_overlay_resource);
 				if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
 					_mmcam_dbg_err("could not prepare for overlay resource");
-					ret = MM_ERROR_CAMCORDER_INTERNAL;
+					ret = MM_ERROR_RESOURCE_INTERNAL;
 					_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 					goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 				}
@@ -980,10 +980,9 @@ int _mmcamcorder_realize(MMHandleType handle)
 		/* acquire resources */
 		ret = mm_resource_manager_commit(hcamcorder->resource_manager);
 		if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
-			_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
-
 			_mmcam_dbg_err("could not acquire resources");
-
+			ret = MM_ERROR_RESOURCE_INTERNAL;
+			_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 			goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 		}
 		_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
@@ -1001,7 +1000,7 @@ int _mmcamcorder_realize(MMHandleType handle)
 			iret = rm_register((rm_resource_cb)_mmcamcorder_rm_callback, (void*)hcamcorder, &(hcamcorder->rm_handle), &rci);
 			if (iret != RM_OK) {
 				_mmcam_dbg_err("rm_register fail");
-				ret = MM_ERROR_POLICY_BLOCKED;
+				ret = MM_ERROR_RESOURCE_INTERNAL;
 				goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 			}
 		}
@@ -1064,7 +1063,7 @@ int _mmcamcorder_realize(MMHandleType handle)
 		iret = rm_allocate_resources(hcamcorder->rm_handle, &(hcamcorder->request_resources), &hcamcorder->returned_devices);
 		if (iret != RM_OK) {
 			_mmcam_dbg_err("Resource allocation request failed");
-			ret = MM_ERROR_POLICY_BLOCKED;
+			ret = MM_ERROR_RESOURCE_INTERNAL;
 			goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
 		}
 #endif /* _MMCAMCORDER_RM_SUPPORT */
diff --git a/src/mm_camcorder_videorec.c b/src/mm_camcorder_videorec.c
index cbc5a0e..cb4c3f1 100644
--- a/src/mm_camcorder_videorec.c
+++ b/src/mm_camcorder_videorec.c
@@ -559,7 +559,7 @@ int _mmcamcorder_video_command(MMHandleType handle, int command)
 						&hcamcorder->video_encoder_resource);
 				if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
 					_mmcam_dbg_err("could not prepare for encoder resource");
-					ret = MM_ERROR_CAMCORDER_INTERNAL;
+					ret = MM_ERROR_RESOURCE_INTERNAL;
 					_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 					goto _ERR_CAMCORDER_VIDEO_COMMAND;
 				}
@@ -570,10 +570,9 @@ int _mmcamcorder_video_command(MMHandleType handle, int command)
 			/* acquire resources */
 			ret = mm_resource_manager_commit(hcamcorder->resource_manager);
 			if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
-				_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
-
 				_mmcam_dbg_err("could not acquire resources");
-
+				ret = MM_ERROR_RESOURCE_INTERNAL;
+				_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 				goto _ERR_CAMCORDER_VIDEO_COMMAND;
 			}