e_comp_wl_video: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I43b995059d48f464443e451d1af015faef3be78a

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index ff50fcc..1c030e4 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -75,7 +75,6 @@ src/bin/e_info_server_input.h \
 src/bin/e_comp_wl_tbm.h \
 src/bin/e_presentation_time.h \
 src/bin/e_comp_wl_rsm.h \
-src/bin/video/e_comp_wl_video.h \
 src/bin/video/e_comp_wl_video_buffer.h \
 src/bin/video/e_client_video.h \
 src/bin/video/e_zone_video.h \

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 7447d30..a66bfe1 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -31,6 +31,7 @@
 #include "e_policy_visibility_intern.h"
 #include "e_compositor_intern.h"
 #include "e_client_video_intern.h"
+#include "e_comp_wl_video_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_capture.c b/src/bin/e_comp_wl_capture.c
index ae46304..a0cc7b0 100644 (file)
--- a/src/bin/e_comp_wl_capture.c
+++ b/src/bin/e_comp_wl_capture.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_tbm_intern.h"
+#include "e_util_video.h"
 
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>

diff --git a/src/bin/e_comp_wl_screenshooter.c b/src/bin/e_comp_wl_screenshooter.c
index 01ee214..4e5359c 100644 (file)
--- a/src/bin/e_comp_wl_screenshooter.c
+++ b/src/bin/e_comp_wl_screenshooter.c
@@ -7,6 +7,7 @@
 #include "e_privilege_intern.h"
 #include "e_output_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
+#include "e_util_video.h"
 
 #include <wayland-server.h>
 #include <screenshooter-server-protocol.h>

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index 8653abf..9429a58 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -5,6 +5,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
 #include "e_error_intern.h"
+#include "e_util_video.h"
 
 #include <wayland-tbm-server.h>
 #include <tbm_bufmgr.h>

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index ce239ab..0343bd0 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -259,7 +259,7 @@ _e_hwc_gbm_surface_alloc(void *data, int w, int h)
    hwc->gsurface_height = h;
    hwc->gsurface_format = hwc->gbm_format;
 
-   EHINF("The gbm_surface(%p, %dx%d) fmt(%c%c%c%c)is created.", hwc, gsurface, w, h, FOURCC_STR(hwc->gsurface_format));
+   EHINF("The gbm_surface(%p, %dx%d) fmt(%c%c%c%c)is created.", hwc, gsurface, w, h, EHW_FOURCC_STR(hwc->gsurface_format));
 
    return (void *)gsurface;
 }

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 8b663a6..abddb57 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -4230,7 +4230,7 @@ _e_hwc_windows_window_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug
                }
 
              if (hwc_window->current.info.src_config.format)
-               snprintf(fmt_str, sizeof(fmt_str), "%c%c%c%c", FOURCC_STR(hwc_window->current.info.src_config.format));
+               snprintf(fmt_str, sizeof(fmt_str), "%c%c%c%c", EHW_FOURCC_STR(hwc_window->current.info.src_config.format));
              else
                snprintf(fmt_str, sizeof(fmt_str), "    ");
 
@@ -4276,7 +4276,7 @@ _e_hwc_windows_window_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug
              EINA_LIST_FOREACH(hwc_window->pending_update_list, l3, update)
                {
                   if (update->info.src_config.format)
-                    snprintf(fmt_str, sizeof(fmt_str), "%c%c%c%c", FOURCC_STR(update->info.src_config.format));
+                    snprintf(fmt_str, sizeof(fmt_str), "%c%c%c%c", EHW_FOURCC_STR(update->info.src_config.format));
                   else
                     snprintf(fmt_str, sizeof(fmt_str), "    ");
 

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 99b51d2..c08aead 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -60,7 +60,6 @@
 #include "e_video_debug.h"
 #include "e_client_video.h"
 #include "e_zone_video.h"
-#include "e_comp_wl_video.h"
 #include "e_comp_wl_video_buffer.h"
 #include "e_desk_area.h"
 #include "e_comp_wl_capture.h"

diff --git a/src/bin/video/e_comp_wl_video.h b/src/bin/video/e_comp_wl_video.h
deleted file mode 100644 (file)
index 2d80d6c..0000000
--- a/src/bin/video/e_comp_wl_video.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_COMP_WL_VIDEO_H
-#define E_COMP_WL_VIDEO_H
-
-#define E_COMP_WL
-
-EINTERN Eina_Bool  e_comp_wl_video_init(void);
-EINTERN void       e_comp_wl_video_shutdown(void);
-
-#define C(b,m)              (((b) >> (m)) & 0xFF)
-#define FOURCC_STR(id)      C(id,0), C(id,8), C(id,16), C(id,24)
-#define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))
-
-#endif
-#endif

diff --git a/src/bin/video/e_comp_wl_video_buffer.c b/src/bin/video/e_comp_wl_video_buffer.c
index ba505a0..64dde4a 100644 (file)
--- a/src/bin/video/e_comp_wl_video_buffer.c
+++ b/src/bin/video/e_comp_wl_video_buffer.c
@@ -4,6 +4,7 @@
 
 #include "e.h"
 #include "e_comp_wl_video_buffer_intern.h"
+#include "e_util_video.h"
 
 #include <wayland-tbm-server.h>
 #include <sys/mman.h>

diff --git a/src/bin/video/e_comp_wl_video_intern.h b/src/bin/video/e_comp_wl_video_intern.h
new file mode 100644 (file)
index 0000000..f2fb493
--- /dev/null
+++ b/src/bin/video/e_comp_wl_video_intern.h
@@ -0,0 +1,7 @@
+#ifndef E_COMP_WL_VIDEO_INTERN_H
+#define E_COMP_WL_VIDEO_INTERN_H
+
+EINTERN Eina_Bool  e_comp_wl_video_init(void);
+EINTERN void       e_comp_wl_video_shutdown(void);
+
+#endif

diff --git a/src/bin/video/e_util_video.c b/src/bin/video/e_util_video.c
index 3371ef0..e7856c7 100644 (file)
--- a/src/bin/video/e_util_video.c
+++ b/src/bin/video/e_util_video.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_util_video.h"
+
 #include <tbm_surface.h>
 
 /* This algorithm for converting pixels from nv12 to rgb is copied from evas_object_image */

diff --git a/src/bin/video/e_util_video.h b/src/bin/video/e_util_video.h
index b304ed3..f2ff3c1 100644 (file)
--- a/src/bin/video/e_util_video.h
+++ b/src/bin/video/e_util_video.h
@@ -3,6 +3,10 @@
 
 #include <tbm_surface.h>
 
+#define C(b,m)              (((b) >> (m)) & 0xFF)
+#define FOURCC_STR(id)      C(id,0), C(id,8), C(id,16), C(id,24)
+#define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))
+
 /* Convert colorspace for given tbm_surface_h to RGB.
  * Note that returned tbm_surface_h has to be freed after use. */
 EINTERN tbm_surface_h e_util_video_tbm_surface_convert_to_rgb(tbm_surface_h surface);

diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c
index 2018066..940ddb5 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.c
+++ b/src/bin/video/iface/e_video_hwc.c
@@ -11,6 +11,7 @@
 #include "e_comp_wl_viewport_intern.h"
 #include "e_output_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
+#include "e_util_video.h"
 
 #include <wayland-tbm-server.h>