Merge "apply mm-evas-renderer" into tizen

diff --git a/src/player.c b/src/player.c
index 03f741e..de0db61 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -1113,7 +1113,7 @@ int player_create(player_h * player)
                *player = (player_h) pc;
                if (player_msg_get_type(module_addr, ret_buf, POINTER)) {
                        pc->cb_info->data_fd = muse_core_client_new_data_ch();
-                       muse_core_send_client_addr(module_addr, pc->cb_info->data_fd);
+                       muse_core_send_module_addr(module_addr, pc->cb_info->data_fd);
                        LOGD("Data channel fd %d, muse module addr %p", pc->cb_info->data_fd, module_addr);
                }
                SERVER_TIMEOUT(pc) = MAX_SERVER_TIME_OUT;       /* will be update after prepare phase. */
@@ -2836,10 +2836,10 @@ int player_push_media_stream(player_h player, media_packet_h packet)
        player_push_media_msg_type push_media;
        char *push_media_msg = (char *)&push_media;
        int msg_size = sizeof(player_push_media_msg_type);
+       int buf_size = 0;
 #ifdef __UN_USED
        tbm_bo bo = NULL;
        tbm_bo_handle thandle;
-       int buf_size;
 #endif
        char *buf;
        media_format_h format;
@@ -2893,7 +2893,8 @@ int player_push_media_stream(player_h player, media_packet_h packet)
        } else
 #endif
        if (push_media.buf_type == PUSH_MEDIA_BUF_TYPE_RAW) {
-               muse_core_ipc_push_data(pc->cb_info->data_fd, buf, push_media.size, push_media.pts);
+               buf_size = (int)push_media.size;
+               muse_core_ipc_push_data(pc->cb_info->data_fd, buf, buf_size, push_media.pts);
                player_msg_send_array(api, pc, ret_buf, ret, push_media_msg, msg_size, sizeof(char));
        }