From 6d5055c94d594319f3a9a2b92f0253d5b8f7d750 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Sun, 21 Jan 2024 12:07:14 +0900 Subject: [PATCH] e_client_video: make an internal header Move the internal resources and the function declaration to the internal header Change-Id: I2405b2c2c6aeab65231afde461eb52f45a809d55 --- src/bin/e_comp_object.c | 1 + src/bin/e_comp_wl.c | 1 + src/bin/e_comp_wl_subsurface.c | 1 + src/bin/e_compositor.c | 1 + src/bin/e_hwc_window.c | 1 + src/bin/e_hwc_windows.c | 1 + src/bin/e_info_server.c | 1 + src/bin/video/e_client_video.c | 1 + src/bin/video/e_client_video.h | 25 ++----------------------- src/bin/video/e_client_video_intern.h | 32 ++++++++++++++++++++++++++++++++ src/bin/video/e_comp_wl_video.c | 2 ++ src/bin/video/e_video_internal.h | 1 + src/bin/video/iface/e_video_hwc.c | 1 + src/bin/video/iface/e_video_hwc_planes.c | 3 +++ 14 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 src/bin/video/e_client_video_intern.h diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 67dd5e9..91cb9fa 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -18,6 +18,7 @@ #include "e_hwc_window_intern.h" #include "e_hwc_windows_intern.h" #include "e_policy_visibility_intern.h" +#include "e_client_video_intern.h" /* data keys: diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index d562190..7447d30 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -30,6 +30,7 @@ #include "e_dnd_intern.h" #include "e_policy_visibility_intern.h" #include "e_compositor_intern.h" +#include "e_client_video_intern.h" #include #include diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c index 607ac98..6407e98 100644 --- a/src/bin/e_comp_wl_subsurface.c +++ b/src/bin/e_comp_wl_subsurface.c @@ -3,6 +3,7 @@ #include "e_comp_wl_intern.h" #include "e_comp_wl_viewport_intern.h" #include "e_pixmap_intern.h" +#include "e_client_video_intern.h" #include diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c index f0bba7c..dd649b2 100644 --- a/src/bin/e_compositor.c +++ b/src/bin/e_compositor.c @@ -8,6 +8,7 @@ #include "e_comp_intern.h" #include "e_pixmap_intern.h" #include "e_presentation_time_intern.h" +#include "e_client_video_intern.h" #include #include diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 5a18ae8..853898b 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -12,6 +12,7 @@ #include "services/e_service_quickpanel_intern.h" #include "e_policy_private_data.h" #include "e_policy_visibility_intern.h" +#include "e_client_video_intern.h" # include # include diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c index 8e40c8f..8b663a6 100644 --- a/src/bin/e_hwc_windows.c +++ b/src/bin/e_hwc_windows.c @@ -11,6 +11,7 @@ #include "e_presentation_time_intern.h" #include "e_output_intern.h" #include "e_egl_sync_intern.h" +#include "e_client_video_intern.h" # include # include diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index df607ac..085302e 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -25,6 +25,7 @@ #include "e_hwc_windows_intern.h" #include "e_hwc_intern.h" #include "e_focus_intern.h" +#include "e_client_video_intern.h" #include #include diff --git a/src/bin/video/e_client_video.c b/src/bin/video/e_client_video.c index 37268da..d1bb0cc 100644 --- a/src/bin/video/e_client_video.c +++ b/src/bin/video/e_client_video.c @@ -1,4 +1,5 @@ #include "e_video_internal.h" +#include "e_client_video_intern.h" #include "e_comp_wl_intern.h" #include "e_comp_wl_subsurface_intern.h" diff --git a/src/bin/video/e_client_video.h b/src/bin/video/e_client_video.h index 290d990..25f0844 100644 --- a/src/bin/video/e_client_video.h +++ b/src/bin/video/e_client_video.h @@ -1,19 +1,7 @@ -#ifndef _E_CLIENT_VIDEO_H_ -#define _E_CLIENT_VIDEO_H_ +#ifndef E_CLIENT_VIDEO_H +#define E_CLIENT_VIDEO_H #include -#include -#include -#include - -typedef struct _E_Client_Video_Info E_Client_Video_Info; - -struct _E_Client_Video_Info -{ - tdm_info_config src_config; - tdm_pos dst_pos; - tdm_transform transform; -}; E_API Eina_Bool e_client_video_set(E_Client *ec); E_API void e_client_video_unset(E_Client *ec); @@ -26,12 +14,9 @@ E_API void e_client_video_unset(E_Client *ec); * video this function will return EINA_TRUE, otherwise EINA_FALSE. */ E_API Eina_Bool e_client_is_video(E_Client *ec); -EINTERN Eina_Bool e_client_video_hw_composition_check(E_Client *ec); E_API Eina_Bool e_client_video_topmost_visibility_follow(E_Client *ec); E_API Eina_Bool e_client_video_topmost_visibility_unfollow(E_Client *ec); -EINTERN Eina_Bool e_client_video_property_allow(E_Client *ec); -EINTERN Eina_Bool e_client_video_property_disallow(E_Client *ec); E_API Eina_Bool e_client_video_available_properties_get(E_Client *ec, const tdm_prop **props, int *count); E_API Eina_Bool e_client_video_property_get(E_Client *ec, unsigned int id, tdm_value *value); @@ -50,11 +35,5 @@ E_API Eina_Bool e_client_video_property_get(E_Client *ec, unsigned int id, * @return EINA_TRUE if success. Otherwise, EINA_FALSE. */ E_API Eina_Bool e_client_video_property_set(E_Client *ec, unsigned int id, tdm_value value, Eina_Bool sync); -EINTERN Eina_Bool e_client_video_property_delay_set(E_Client *ec, unsigned int id, tdm_value value); - -EINTERN Eina_Bool e_client_video_info_get(E_Client *ec, E_Client_Video_Info *info); -EINTERN Eina_Bool e_client_video_commit_data_release(E_Client *ec, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec); - -EINTERN tbm_surface_h e_client_video_tbm_surface_get(E_Client *ec); #endif diff --git a/src/bin/video/e_client_video_intern.h b/src/bin/video/e_client_video_intern.h new file mode 100644 index 0000000..b9a7a18 --- /dev/null +++ b/src/bin/video/e_client_video_intern.h @@ -0,0 +1,32 @@ +#ifndef E_CLIENT_VIDEO_INTERN_H +#define E_CLIENT_VIDEO_INTERN_H + +#if 0 +#include +#include +#include +#include +#endif + +typedef struct _E_Client_Video_Info E_Client_Video_Info; + +struct _E_Client_Video_Info +{ + tdm_info_config src_config; + tdm_pos dst_pos; + tdm_transform transform; +}; + +EINTERN Eina_Bool e_client_video_hw_composition_check(E_Client *ec); + +EINTERN Eina_Bool e_client_video_property_allow(E_Client *ec); +EINTERN Eina_Bool e_client_video_property_disallow(E_Client *ec); + +EINTERN Eina_Bool e_client_video_property_delay_set(E_Client *ec, unsigned int id, tdm_value value); + +EINTERN Eina_Bool e_client_video_info_get(E_Client *ec, E_Client_Video_Info *info); +EINTERN Eina_Bool e_client_video_commit_data_release(E_Client *ec, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec); + +EINTERN tbm_surface_h e_client_video_tbm_surface_get(E_Client *ec); + +#endif diff --git a/src/bin/video/e_comp_wl_video.c b/src/bin/video/e_comp_wl_video.c index 14d5135..b01b8d7 100644 --- a/src/bin/video/e_comp_wl_video.c +++ b/src/bin/video/e_comp_wl_video.c @@ -3,7 +3,9 @@ #endif #include "e.h" +#include "e_client_video_intern.h" #include "e_video_internal.h" + #include typedef struct _E_Video_Object E_Video_Object; diff --git a/src/bin/video/e_video_internal.h b/src/bin/video/e_video_internal.h index 82519e6..f7f9a2e 100644 --- a/src/bin/video/e_video_internal.h +++ b/src/bin/video/e_video_internal.h @@ -2,6 +2,7 @@ #define _E_VIDEO_INTERNAL_H_ #include "e.h" +#include "e_client_video_intern.h" #include #include diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c index 6c4802d..39226a8 100644 --- a/src/bin/video/iface/e_video_hwc.c +++ b/src/bin/video/iface/e_video_hwc.c @@ -3,6 +3,7 @@ #endif #include "e_video_internal.h" +#include "e_client_video_intern.h" #include "e_video_hwc_intern.h" #include "e_comp_screen_intern.h" #include "e_comp_wl_intern.h" diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c index 4406aaf..ac801a4 100644 --- a/src/bin/video/iface/e_video_hwc_planes.c +++ b/src/bin/video/iface/e_video_hwc_planes.c @@ -8,6 +8,9 @@ #include "e_comp_wl_intern.h" #include "e_comp_wl_subsurface_intern.h" +#include +#include + #define CHECKING_PRIMARY_ZPOS typedef struct _E_Video_Hwc_Planes E_Video_Hwc_Planes; -- 2.7.4