diff options
| -rw-r--r-- | packaging/libmm-evas-renderer.spec | 2 | ||||
| -rw-r--r-- | src/mm_evas_renderer.c | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/packaging/libmm-evas-renderer.spec b/packaging/libmm-evas-renderer.spec index f92d5f3..97eba37 100644 --- a/packaging/libmm-evas-renderer.spec +++ b/packaging/libmm-evas-renderer.spec @@ -1,6 +1,6 @@ Name: libmm-evas-renderer Summary: Multimedia Framework Evas Renderer Library -Version: 0.0.25 +Version: 0.0.26 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_evas_renderer.c b/src/mm_evas_renderer.c index f94907a..8f3bd0c 100644 --- a/src/mm_evas_renderer.c +++ b/src/mm_evas_renderer.c @@ -1282,21 +1282,18 @@ void mm_evas_renderer_write(media_packet_h packet, void *data) { MMER_FENTER(); - if (!packet) { - LOGE("packet %p is NULL", packet); - return; - } mm_evas_info *handle = (mm_evas_info *)data; int ret = MEDIA_PACKET_ERROR_NONE; bool has; tbm_surface_h tbm_surf; gint new_idx; + MMEVAS_RETURN_IF_FAIL(packet); LOGD("packet [%p]", packet); - if (!data || !handle) { - LOGE("handle %p or evas_info %p is NULL", data, handle); - goto INVALID_PARAM; + if (!handle) { + LOGE("handle %p is NULL", handle); + goto INVALID_HANDLE; } g_mutex_lock(&handle->idx_lock); @@ -1363,20 +1360,23 @@ void mm_evas_renderer_write(media_packet_h packet, void *data) return; ERROR: g_mutex_unlock(&handle->idx_lock); -INVALID_PARAM: /* destroy media_packet immediately */ - if (packet) { - g_mutex_lock(&handle->mp_lock); - LOGD("cant write. destroy packet [%p]", packet); - if (handle && handle->packet_rendered_cb) { - handle->packet_rendered_cb(packet, handle->packet_rendered_cb_user); - } else { - if (media_packet_destroy(packet) != MEDIA_PACKET_ERROR_NONE) - LOGE("media_packet_destroy failed %p", packet); - packet = NULL; - } - g_mutex_unlock(&handle->mp_lock); + g_mutex_lock(&handle->mp_lock); + LOGD("can't write. destroy packet [%p]", packet); + if (handle && handle->packet_rendered_cb) { + handle->packet_rendered_cb(packet, handle->packet_rendered_cb_user); + } else { + if (media_packet_destroy(packet) != MEDIA_PACKET_ERROR_NONE) + LOGE("media_packet_destroy failed %p", packet); + packet = NULL; } + g_mutex_unlock(&handle->mp_lock); + return; +INVALID_HANDLE: + LOGD("can't write. destroy packet [%p]", packet); + if (media_packet_destroy(packet) != MEDIA_PACKET_ERROR_NONE) + LOGE("media_packet_destroy failed %p", packet); + packet = NULL; return; } |