Fix duplicated buffer issue for output buffer

- Previously, the mutex for output buffer was locked
  after return rpc_port_proxy_codec_invoke_release_output_buffer().
  The problem is that output_buffer[] array could be accessed in message_cb()
  before remove released buffer in output_buffer[] array
  and it caused duplicated output buffer error although it's released actually.

[Version] 1.5.1
[Issue Type] Bug fix

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

diff --git a/packaging/hal-api-codec.spec b/packaging/hal-api-codec.spec
index b00957666199fef6109251bdfe75e5d11c1a2986..a24358396c26fea5c9a09729110791b6c6153fe7 100644 (file)
--- a/packaging/hal-api-codec.spec
+++ b/packaging/hal-api-codec.spec
@@ -6,7 +6,7 @@
 ### main package #########
 Name:       %{name}
 Summary:    %{name} interface
-Version:    1.5.0
+Version:    1.5.1
 Release:    0
 Group:      Development/Libraries
 License:    Apache-2.0

diff --git a/src/hal-api-codec-ipc.c b/src/hal-api-codec-ipc.c
index eac6626e149ce0dca2ed0341c57db6e108b42616..33b11d0457dd2beb5f3e9091c4a04132c5a00919 100644 (file)
--- a/src/hal-api-codec-ipc.c
+++ b/src/hal-api-codec-ipc.c
@@ -1307,26 +1307,19 @@ int hal_codec_ipc_release_output_buffer(void *codec_handle, int buffer_index)
        hal_codec_buffer_s *hal_buffer = NULL;
        hal_codec_ipc_buffer_s *ipc_buffer = NULL;
 
-       g_autoptr(GMutexLocker) locker = NULL;
-
        HAL_CODEC_RETURN_VAL_IF_FAILED(handle, HAL_CODEC_ERROR_INVALID_PARAMETER);
        HAL_CODEC_RETURN_VAL_IF_FAILED(handle->rpc_handle, HAL_CODEC_ERROR_INVALID_PARAMETER);
 
        ipc_buffer = &handle->ipc_buffer;
 
-       ret = rpc_port_proxy_codec_invoke_release_output_buffer(handle->rpc_handle, buffer_index);
-       if (ret != HAL_CODEC_ERROR_NONE) {
-               SLOGE("invoke release output buffer failed[0x%x]", ret);
-               return ret;
-       }
-
-       locker = g_mutex_locker_new(&ipc_buffer->lock);
+       g_mutex_lock(&ipc_buffer->lock);
 
        hal_buffer = ipc_buffer->output_buffers[buffer_index];
        ipc_buffer->output_buffers[buffer_index] = NULL;
 
        if (!hal_buffer) {
                SLOGW("NULL buffer for index[%d]", buffer_index);
+               g_mutex_unlock(&ipc_buffer->lock);
                return HAL_CODEC_ERROR_NONE;
        }
 
@@ -1336,12 +1329,18 @@ int hal_codec_ipc_release_output_buffer(void *codec_handle, int buffer_index)
 
        ipc_buffer->output_buffer_count--;
 
+       g_mutex_unlock(&ipc_buffer->lock);
+
        if (handle->type == HAL_CODEC_TYPE_DECODER)
                __hal_codec_ipc_hal_buffer_release_decoder_output(hal_buffer);
        else
                __hal_codec_ipc_hal_buffer_release_encoder_output(hal_buffer);
 
-       return HAL_CODEC_ERROR_NONE;
+       ret = rpc_port_proxy_codec_invoke_release_output_buffer(handle->rpc_handle, buffer_index);
+       if (ret != HAL_CODEC_ERROR_NONE)
+               SLOGE("invoke release output buffer failed[0x%x]", ret);
+
+       return ret;
 }