[v0.3.31] block evas feature on tv branch

Change-Id: I242f1f84be230be56905c31f15050b23e8970f95

diff --git a/include/player_private.h b/include/player_private.h
index b6c72117e420a7d73db66d525e4c8ac15893f141..914b79abdc97655fa6d38dc4ab46610debe59b50 100644 (file)
--- a/include/player_private.h
+++ b/include/player_private.h
@@ -87,7 +87,7 @@ typedef struct {
        int key[4];
        tbm_surface_h tsurf;
 } player_tsurf_info_t;
-
+#ifdef TIZEN_FEATURE_EVAS_RENDERER
 typedef struct {
        void *handle;
        gboolean visible;
@@ -99,7 +99,7 @@ typedef struct {
        int roi_w;
        int roi_h;
 } player_evas_info_s;
-
+#endif
 typedef struct _callback_cb_info {
        GThread *thread;
        gint running;
@@ -116,7 +116,9 @@ typedef struct _callback_cb_info {
        msg_buff_s buff;
        player_event_queue event_queue;
        media_format_h pkt_fmt;
+#ifdef TIZEN_FEATURE_EVAS_RENDERER
        player_evas_info_s *evas_info;
+#endif
        tbm_bufmgr bufmgr;
        tbm_fd tfd; /* for player_get_album_art*/
        GList *tsurf_list; /* player_tsurf_info_t */
@@ -147,10 +149,11 @@ typedef struct _player_cli_s {
 #define DATA_FD(h)                     (CALLBACK_INFO(h)->data_fd)
 /* TBM buffer manager */
 #define TBM_BUFMGR(h)          (CALLBACK_INFO(h)->bufmgr)
+#ifdef TIZEN_FEATURE_EVAS_RENDERER
 /* evas display handle */
 #define EVAS_INFO(h)           ((h)->cb_info->evas_info)
 #define EVAS_HANDLE(h)         (EVAS_INFO(h)->handle)
-
+#endif
 /* server tbm bo */
 #define SERVER_TBM_BO(h)       ((h)->server.bo)
 /* server state change timeout (sec) */

diff --git a/src/player.c b/src/player.c
index b97d69089094688405c656f3bb0d104833cb1706..8b0a974cda937ff9c37dcd8527ddbf08aca612d0 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -1697,14 +1697,14 @@ int player_create(player_h * player)
                        SERVER_TIMEOUT(pc) = MAX_SERVER_TIME_OUT; /* will be update after prepare phase. */
                } else
                        goto ERROR;
-
+#ifdef TIZEN_FEATURE_EVAS_RENDERER
                pc->cb_info->evas_info = g_new0(player_evas_info_s, 1);
                if (pc->cb_info->evas_info == NULL) {
                        ret = PLAYER_ERROR_OUT_OF_MEMORY;
                        goto ERROR;
                }
                EVAS_INFO(pc)->visible = -1;
-
+#endif
                pc->cb_info->bufmgr = tbm_bufmgr_init(-1);
                pc->push_media_stream = FALSE;
 
@@ -1746,13 +1746,11 @@ int player_destroy(player_h player)
                player_unset_media_packet_video_frame_decoded_cb(player);
                if (mm_evas_renderer_destroy(&EVAS_HANDLE(pc)) != MM_ERROR_NONE)
                        LOGW("fail to unset evas client");
+               g_free(pc->cb_info->evas_info);
        }
 #endif
 
        if (CALLBACK_INFO(pc)) {
-               if (EVAS_INFO(pc))
-                       g_free(pc->cb_info->evas_info);
-
                __player_remove_tsurf_list(pc);
                _player_remove_idle_event_all(CALLBACK_INFO(pc));
                _player_event_queue_destroy(CALLBACK_INFO(pc));