video: Remove dead code since hwc plane mode deprecated

Change-Id: I8ab8f07f28cbfd19a4f5f5f3f567966ca40c6fa2

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 4c6085a82992697e81925edbb9920f7a797a2c3e..a02445c8ab507d75d23623f80223edbc6e314c7b 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -264,7 +264,6 @@ src/bin/displaymgr/e_hwc_window.c \
 src/bin/displaymgr/e_hwc_window_queue.c \
 src/bin/displaymgr/video/e_video_hwc.c \
 src/bin/displaymgr/video/e_video_hwc_windows.c \
-src/bin/displaymgr/video/e_video_external.c \
 src/bin/displaymgr/video/e_video_fallback.c \
 src/bin/utils/e_env.c \
 src/bin/utils/e_path.c \

diff --git a/src/bin/core/e_client_video.c b/src/bin/core/e_client_video.c
index f2d94486e2300f1ecb759a8432b08806b424f3a5..fbfaf6591348863fc8bf2cc332a18432583db40b 100644 (file)
--- a/src/bin/core/e_client_video.c
+++ b/src/bin/core/e_client_video.c
@@ -1,11 +1,9 @@
-#include "e_zone_video_intern.h"
 #include "e_client_video_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_zone_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_video_debug_intern.h"
 #include "e_video_hwc_intern.h"
-#include "e_video_external_intern.h"
 #include "e_video_fallback_intern.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_eom_intern.h"
@@ -94,17 +92,6 @@ static Eina_Bool
 _e_client_video_comp_iface_init(E_Client_Video *ecv)
 {
    E_Video_Comp_Iface *iface = NULL;
-   E_Hwc_Policy hwc_pol;
-
-   hwc_pol = e_zone_video_hwc_policy_get(ecv->zone);
-
-   if ((e_config->eom_enable == EINA_TRUE) && (e_eom_is_ec_external(ecv->ec)) &&
-       (hwc_pol == E_HWC_POLICY_PLANES))
-     {
-        VIN("Try to intialize external interface", ecv->ec);
-        iface = e_video_external_iface_create(ecv);
-        goto end;
-     }
 
    if (e_video_debug_display_primary_plane_value_get())
      {
@@ -112,13 +99,10 @@ _e_client_video_comp_iface_init(E_Client_Video *ecv)
         goto end;
      }
 
-   if (hwc_pol != E_HWC_POLICY_NONE)
-     {
-        VIN("Initialize the interface of the client_video for HWC mode", ecv->ec);
-        iface = e_video_hwc_iface_create(ecv);
-        if (iface)
-          e_video_hwc_render_fail_callback_set(iface, _e_client_video_cb_hwc_render_fail);
-     }
+   VIN("Initialize the interface of the client_video for HWC mode", ecv->ec);
+   iface = e_video_hwc_iface_create(ecv);
+   if (iface)
+     e_video_hwc_render_fail_callback_set(iface, _e_client_video_cb_hwc_render_fail);
 
 end:
    if (!iface)

diff --git a/src/bin/core/e_zone_video.c b/src/bin/core/e_zone_video.c
index 48cc0d77fcfda355b104313a736865bbb57f3cea..a883a4a7ea92fc9e11f14d9e64f7adc8e08a55d6 100644 (file)
--- a/src/bin/core/e_zone_video.c
+++ b/src/bin/core/e_zone_video.c
@@ -1,4 +1,3 @@
-#include "e_zone_video_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_display_intern.h"
 
@@ -17,17 +16,3 @@ e_zone_video_available_size_get(E_Zone *zone, int *minw, int *minh, int *maxw, i
    return EINA_TRUE;
 }
 
-EINTERN E_Hwc_Policy
-e_zone_video_hwc_policy_get(E_Zone *zone)
-{
-   E_Output *eout;
-
-   eout = e_output_find(zone->output_id);
-   if (!eout)
-     {
-        ERR("Something wrong, couldn't find 'E_Output' from 'E_Zone'");
-        return E_HWC_POLICY_NONE;
-     }
-
-   return e_hwc_policy_get(eout->hwc);
-}

diff --git a/src/bin/core/e_zone_video_intern.h b/src/bin/core/e_zone_video_intern.h
deleted file mode 100644 (file)
index 90ca8d8..0000000
--- a/src/bin/core/e_zone_video_intern.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef E_ZONE_VIDEO_INTERN_H
-#define E_ZONE_VIDEO_INTERN_H
-
-#include "e_intern.h"
-#include "e_zone_video.h"
-
-EINTERN E_Hwc_Policy e_zone_video_hwc_policy_get(E_Zone *zone);
-
-#endif

diff --git a/src/bin/displaymgr/video/e_video_external.c b/src/bin/displaymgr/video/e_video_external.c
deleted file mode 100644 (file)
index aa80da0..0000000
--- a/src/bin/displaymgr/video/e_video_external.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "e_video_external_intern.h"
-
-typedef struct _E_Video_External E_Video_External;
-
-struct _E_Video_External
-{
-   E_Video_Comp_Iface base;
-   E_Client_Video *ecv;
-};
-
-static void
-_e_video_external_iface_destroy(E_Video_Comp_Iface *iface)
-{
-   E_Video_External *eve;
-
-   eve = container_of(iface, E_Video_External, base);
-   e_client_video_hw_composition_unset(eve->ecv);
-
-   free(eve);
-}
-
-static void
-_e_video_external_init(E_Client_Video *ecv)
-{
-   e_client_video_hw_composition_set(ecv);
-}
-
-EINTERN E_Video_Comp_Iface *
-e_video_external_iface_create(E_Client_Video *ecv)
-{
-   E_Video_External *eve;
-
-   INF("Intializing External Compositing mode");
-
-   eve = E_NEW(E_Video_External, 1);
-   if (!eve)
-     {
-        ERR("Failed to create E_Video_External");
-        return NULL;
-     }
-
-   _e_video_external_init(ecv);
-
-   eve->ecv = ecv;
-   eve->base.destroy = _e_video_external_iface_destroy;
-
-   return &eve->base;
-}

diff --git a/src/bin/displaymgr/video/e_video_external_intern.h b/src/bin/displaymgr/video/e_video_external_intern.h
deleted file mode 100644 (file)
index 2e95a66..0000000
--- a/src/bin/displaymgr/video/e_video_external_intern.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef E_VIDEO_EXTERNAL_INTERN_H
-#define E_VIDEO_EXTERNAL_INTERN_H
-
-#include "e_intern.h"
-#include "e_video_comp_iface.h"
-
-/* For external interface */
-EINTERN E_Video_Comp_Iface  *e_video_external_iface_create(E_Client_Video *ecv);
-
-#endif

diff --git a/src/bin/displaymgr/video/e_video_hwc.c b/src/bin/displaymgr/video/e_video_hwc.c
index 116fcf28222157c4d2332b769a918b9cdcdd7491..d985795acd6637d36e21c0c367f3730eba955ec6 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc.c
+++ b/src/bin/displaymgr/video/e_video_hwc.c
@@ -1,4 +1,3 @@
-#include "e_zone_video_intern.h"
 #include "e_client_video_intern.h"
 #include "e_video_hwc_intern.h"
 #include "e_comp_screen_intern.h"
@@ -174,12 +173,6 @@ _e_video_hwc_input_buffer_cb_free(E_Comp_Wl_Video_Buf *vbuf, void *data)
         need_hide = EINA_TRUE;
      }
 
-   if (eina_list_data_find(evh->bqueue, vbuf))
-     {
-        VIN("waiting fb destroyed", evh->ec);
-        evh->bqueue = eina_list_remove(evh->bqueue, vbuf);
-     }
-
    if (need_hide)
      evh->backend.buffer_commit(evh, NULL);
 }
@@ -399,8 +392,6 @@ _e_video_hwc_pp_buffer_cb_free(E_Comp_Wl_Video_Buf *vbuf, void *data)
    if (evh->committed_vbuf == vbuf)
      evh->committed_vbuf = NULL;
 
-   evh->bqueue = eina_list_remove(evh->bqueue, vbuf);
-
    evh->pp_buffer_list = eina_list_remove(evh->pp_buffer_list, vbuf);
 }
 
@@ -500,9 +491,6 @@ _e_video_hwc_pp_buffer_get(E_Video_Hwc *evh, int width, int height)
                }
              if (evh->pp_buffer_list)
                NEVER_GET_HERE();
-
-             if (evh->bqueue)
-               NEVER_GET_HERE();
           }
      }
 
@@ -687,44 +675,6 @@ _e_video_hwc_current_fb_update(E_Video_Hwc *evh)
    return EINA_TRUE;
 }
 
-static void
-_e_video_hwc_buffer_enqueue(E_Video_Hwc *evh, E_Comp_Wl_Video_Buf *vbuf)
-{
-   /* Remove enqueued video buffer first. */
-   evh->bqueue = eina_list_remove(evh->bqueue, vbuf);
-   evh->bqueue = eina_list_append(evh->bqueue, vbuf);
-   VDB("There are waiting fbs more than 1", evh->ec);
-}
-
-static E_Comp_Wl_Video_Buf *
-_e_video_hwc_buffer_dequeue(E_Video_Hwc *evh)
-{
-   E_Comp_Wl_Video_Buf *vbuf;
-
-   if (!evh->bqueue)
-     return NULL;
-
-   vbuf = eina_list_nth(evh->bqueue, 0);
-   evh->bqueue = eina_list_remove(evh->bqueue, vbuf);
-
-   return vbuf;
-}
-
-static void
-_e_video_hwc_wait_buffer_commit(E_Video_Hwc *evh)
-{
-   E_Comp_Wl_Video_Buf *vbuf;
-
-   /* committed_vbuf has to be null */
-   EINA_SAFETY_ON_FALSE_RETURN(evh->committed_vbuf == NULL);
-
-   vbuf = _e_video_hwc_buffer_dequeue(evh);
-   if (!vbuf)
-     return;
-
-   _e_video_hwc_buffer_commit(evh, vbuf);
-}
-
 static void
 _e_video_hwc_buffer_commit(E_Video_Hwc *evh, E_Comp_Wl_Video_Buf *vbuf)
 {
@@ -750,7 +700,6 @@ _e_video_hwc_buffer_commit(E_Video_Hwc *evh, E_Comp_Wl_Video_Buf *vbuf)
 
 no_commit:
    _e_video_hwc_current_fb_update(evh);
-   _e_video_hwc_wait_buffer_commit(evh);
 }
 
 static void
@@ -764,17 +713,12 @@ _e_video_hwc_buffer_show(E_Video_Hwc *evh, E_Comp_Wl_Video_Buf *vbuf, unsigned i
    if (vbuf->comp_buffer)
      e_comp_wl_buffer_reference(&vbuf->buffer_ref, vbuf->comp_buffer);
 
-   if ((evh->hwc_policy == E_HWC_POLICY_PLANES) && (evh->committed_vbuf))
-     _e_video_hwc_buffer_enqueue(evh, vbuf);
-   else
-     _e_video_hwc_buffer_commit(evh, vbuf);
+   _e_video_hwc_buffer_commit(evh, vbuf);
 }
 
 static void
 _e_video_hwc_hide(E_Video_Hwc *evh)
 {
-   E_Comp_Wl_Video_Buf *vbuf;
-
    if ((evh->current_fb) || (evh->committed_vbuf))
      {
         if (evh->current_fb)
@@ -793,9 +737,6 @@ _e_video_hwc_hide(E_Video_Hwc *evh)
 
    if (evh->old_comp_buffer)
      evh->old_comp_buffer = NULL;
-
-   EINA_LIST_FREE(evh->bqueue, vbuf)
-      e_comp_wl_video_buffer_set_use(vbuf, EINA_FALSE);
 }
 
 static Eina_Rectangle
@@ -1935,8 +1876,6 @@ _e_video_hwc_iface_info_get(E_Video_Comp_Iface *iface, E_Client_Video_Info *info
 {
    IFACE_ENTRY;
 
-   if (evh->hwc_policy != E_HWC_POLICY_WINDOWS)
-     return EINA_FALSE;
    return e_video_hwc_windows_info_get(evh, info);
 }
 
@@ -1945,8 +1884,6 @@ _e_video_hwc_iface_commit_data_release(E_Video_Comp_Iface *iface, unsigned int s
 {
    IFACE_ENTRY;
 
-   if (evh->hwc_policy != E_HWC_POLICY_WINDOWS)
-     return EINA_FALSE;
    return e_video_hwc_windows_commit_data_release(evh, sequence, tv_sec, tv_usec);
 }
 
@@ -1955,8 +1892,6 @@ _e_video_hwc_iface_tbm_surface_get(E_Video_Comp_Iface *iface)
 {
    IFACE_ENTRY;
 
-   if (evh->hwc_policy != E_HWC_POLICY_WINDOWS)
-     return NULL;
    return e_video_hwc_windows_tbm_surface_get(evh);
 }
 
@@ -1964,7 +1899,6 @@ static E_Video_Hwc *
 _e_video_hwc_create(E_Client *ec)
 {
    E_Video_Hwc *evh;
-   E_Hwc_Policy hwc_policy;
    E_Output *output;
    E_Zone *zone;
    E_View_Client* view_client;
@@ -1979,15 +1913,7 @@ _e_video_hwc_create(E_Client *ec)
         return NULL;
      }
 
-   hwc_policy = e_zone_video_hwc_policy_get(zone);
-   if (hwc_policy == E_HWC_POLICY_WINDOWS)
-     evh = e_video_hwc_windows_create(output, ec);
-   else
-     {
-        VER("Unknown HWC mode %d", ec, hwc_policy);
-        return NULL;
-     }
-
+   evh = e_video_hwc_windows_create(output, ec);
    if (!evh)
      {
         VER("Failed to create 'E_Video_Hwc'", ec);
@@ -2001,7 +1927,6 @@ _e_video_hwc_create(E_Client *ec)
    if (view_client)
      e_view_client_size_set(view_client, 1, 1);
 
-   evh->hwc_policy = hwc_policy;
    evh->e_output = output;
    evh->ec = ec;
 
@@ -2051,12 +1976,6 @@ e_video_hwc_current_fb_update(E_Video_Hwc *evh)
    return _e_video_hwc_current_fb_update(evh);
 }
 
-EINTERN void
-e_video_hwc_wait_buffer_commit(E_Video_Hwc *evh)
-{
-   _e_video_hwc_wait_buffer_commit(evh);
-}
-
 EINTERN void
 e_video_hwc_client_mask_update(E_Video_Hwc *evh)
 {

diff --git a/src/bin/displaymgr/video/e_video_hwc_intern.h b/src/bin/displaymgr/video/e_video_hwc_intern.h
index dc2b27d7bcc818ff2997d4f7749d22e1564816da..439dcc2b4a9ec4102bbed3329fb49adfb8e07f59 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc_intern.h
+++ b/src/bin/displaymgr/video/e_video_hwc_intern.h
@@ -60,8 +60,6 @@ struct _E_Video_Hwc
    E_Video_Comp_Iface iface;
    E_Video_Hwc_Iface backend;
 
-   E_Hwc_Policy hwc_policy;
-
    E_Client_Video *ecv;
    E_Client *ec;
    E_Output *e_output;
@@ -90,7 +88,6 @@ struct _E_Video_Hwc
     * And when it's committed, it will be moved to committed_list.
     * Finally when the commit handler is called, it will become current_fb.
     */
-   Eina_List    *bqueue;   /* A queue for buffer which will have to be committed next time. */
    E_Comp_Wl_Video_Buf *committed_vbuf;  /* A committed video buffer to backend */
    E_Comp_Wl_Video_Buf *current_fb;     /* buffer which is showing on screen currently */
 
@@ -123,7 +120,6 @@ EINTERN E_Video_Comp_Iface  *e_video_hwc_iface_create(E_Client_Video *ecv);
 EINTERN void                 e_video_hwc_render_fail_callback_set(E_Video_Comp_Iface *iface, E_Video_Hwc_Render_Fail_Cb func);
 
 /* Functions for HWC */
-EINTERN void         e_video_hwc_wait_buffer_commit(E_Video_Hwc *evh);
 EINTERN void         e_video_hwc_client_mask_update(E_Video_Hwc *evh);
 EINTERN Eina_Bool    e_video_hwc_current_fb_update(E_Video_Hwc *evh);
 

diff --git a/src/bin/displaymgr/video/e_video_hwc_windows.c b/src/bin/displaymgr/video/e_video_hwc_windows.c
index 26e7c20cc2aa8f8e99ebf6d38f8960a89e0879ae..91a9ccf50ff975b842eeeed0172ed6094101e11c 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc_windows.c
+++ b/src/bin/displaymgr/video/e_video_hwc_windows.c
@@ -362,8 +362,7 @@ e_video_hwc_windows_commit_data_release(E_Video_Hwc *evh, unsigned int sequence,
    evhw = (E_Video_Hwc_Windows *)evh;
    evhw->commit_data.wait_release = EINA_FALSE;
 
-   if (e_video_hwc_current_fb_update(evh))
-     e_video_hwc_wait_buffer_commit(evh);
+   e_video_hwc_current_fb_update(evh);
 
    return EINA_TRUE;
 }

diff --git a/src/bin/server/e_comp_wl_video.c b/src/bin/server/e_comp_wl_video.c
index bcb6d3f42937daeccedbd31abc816bfd70ade949..78812f66263fe769024e91d957bdae15c82a4a60 100644 (file)
--- a/src/bin/server/e_comp_wl_video.c
+++ b/src/bin/server/e_comp_wl_video.c
@@ -3,13 +3,13 @@
 #include "e_info_server_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
-#include "e_zone_video_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_viewport_intern.h"
 #include "e_utils_intern.h"
 #include "e_client_intern.h"
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
+#include "e_zone_video.h"
 
 #include <tizen-extension-server-protocol.h>