e_comp_wl_video: Rename macro IS_RGB to E_VBUF_IS_RGB

IS RGB can be easily redefined.
E_VBUF is added and it is moved to source file.

Change-Id: Ib22c788cb1c966ca234aea6bcfe207ec07f7818c

diff --git a/src/bin/video/e_comp_wl_video.h b/src/bin/video/e_comp_wl_video.h
index b66ac8c..2d80d6c 100644 (file)
--- a/src/bin/video/e_comp_wl_video.h
+++ b/src/bin/video/e_comp_wl_video.h
@@ -11,8 +11,6 @@ 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 IS_RGB(f)           ((f) == TBM_FORMAT_XRGB8888 || (f) == TBM_FORMAT_ARGB8888 || \
-                             (f) == TBM_FORMAT_XBGR8888 || (f) == TBM_FORMAT_ABGR8888)
 #define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))
 
 #endif

diff --git a/src/bin/video/e_comp_wl_video_buffer.c b/src/bin/video/e_comp_wl_video_buffer.c
index 3a4a68f..6a6e72a 100644 (file)
--- a/src/bin/video/e_comp_wl_video_buffer.c
+++ b/src/bin/video/e_comp_wl_video_buffer.c
@@ -10,6 +10,9 @@
 
 //#define DEBUG_LIFECYCLE
 
+#define E_VBUF_IS_RGB(f) ((f) == TBM_FORMAT_XRGB8888 || (f) == TBM_FORMAT_ARGB8888 || \
+                          (f) == TBM_FORMAT_XBGR8888 || (f) == TBM_FORMAT_ABGR8888)
+
 #define BER(fmt,arg...)   ERR("%d: "fmt, vbuf ? vbuf->stamp : 0, ##arg)
 #define BWR(fmt,arg...)   WRN("%d: "fmt, vbuf ? vbuf->stamp : 0, ##arg)
 #define BIN(fmt,arg...)   INF("%d: "fmt, vbuf ? vbuf->stamp : 0, ##arg)
@@ -690,14 +693,14 @@ e_comp_wl_video_buffer_convert(E_Comp_Wl_Video_Buf *srcbuf, E_Comp_Wl_Video_Buf
    dst_format = _e_comp_wl_video_buffer_pixman_format_get(dstbuf);
    EINA_SAFETY_ON_FALSE_GOTO(dst_format > 0, cant_convert);
 
-   buf_width = IS_RGB(srcbuf->tbmfmt)?(srcbuf->pitches[0]/4):srcbuf->pitches[0];
-   src_stride = IS_RGB(srcbuf->tbmfmt)?(srcbuf->pitches[0]):buf_width * (PIXMAN_FORMAT_BPP(src_format) / 8);
+   buf_width = E_VBUF_IS_RGB(srcbuf->tbmfmt)?(srcbuf->pitches[0]/4):srcbuf->pitches[0];
+   src_stride = E_VBUF_IS_RGB(srcbuf->tbmfmt)?(srcbuf->pitches[0]):buf_width * (PIXMAN_FORMAT_BPP(src_format) / 8);
    src_img = pixman_image_create_bits(src_format, buf_width, srcbuf->height,
                                       (uint32_t*)srcbuf->ptrs[0], src_stride);
    EINA_SAFETY_ON_NULL_GOTO(src_img, cant_convert);
 
-   buf_width = IS_RGB(dstbuf->tbmfmt)?(dstbuf->pitches[0]/4):dstbuf->pitches[0];
-   dst_stride = IS_RGB(srcbuf->tbmfmt)?(dstbuf->pitches[0]):buf_width * (PIXMAN_FORMAT_BPP(dst_format) / 8);
+   buf_width = E_VBUF_IS_RGB(dstbuf->tbmfmt)?(dstbuf->pitches[0]/4):dstbuf->pitches[0];
+   dst_stride = E_VBUF_IS_RGB(srcbuf->tbmfmt)?(dstbuf->pitches[0]):buf_width * (PIXMAN_FORMAT_BPP(dst_format) / 8);
    dst_img = pixman_image_create_bits(dst_format, buf_width, dstbuf->height,
                                       (uint32_t*)dstbuf->ptrs[0], dst_stride);
    EINA_SAFETY_ON_NULL_GOTO(dst_img, cant_convert);