FS-7550 starting to and libgd to core video

diff --git a/src/include/switch_core_video.h b/src/include/switch_core_video.h
index 89d5f199b20618430263b56550c3b1667669b9f0..c2a1fffd4717ec6d34a00ae9ab3f78eebaad5f52 100644 (file)
--- a/src/include/switch_core_video.h
+++ b/src/include/switch_core_video.h
@@ -362,6 +362,8 @@ SWITCH_DECLARE(void) switch_img_find_position(switch_img_position_t pos, int sw,
 SWITCH_DECLARE(switch_status_t) switch_img_convert(switch_image_t *src, switch_convert_fmt_t fmt, void *dest, switch_size_t *size);
 SWITCH_DECLARE(switch_image_t *) switch_img_write_text_img(int w, int h, switch_bool_t full, const char *text);
 
+SWITCH_DECLARE(switch_image_t *) switch_img_read_file(const char* file_name);
+
 /** @} */
 
 SWITCH_END_EXTERN_C

diff --git a/src/include/switch_vpx.h b/src/include/switch_vpx.h
index ee57f387549d41d0082edcc75473a1c98865e209..4dd1dd488aadf4cbd67049db5a35439d14f4b208 100644 (file)
--- a/src/include/switch_vpx.h
+++ b/src/include/switch_vpx.h
@@ -64,6 +64,7 @@ SWITCH_BEGIN_EXTERN_C
 #define SWITCH_IMG_FMT_HIGH      VPX_IMG_FMT_HIGH
 #define SWITCH_IMG_FMT_I420         VPX_IMG_FMT_I420
 #define SWITCH_IMG_FMT_ARGB         VPX_IMG_FMT_ARGB
+#define SWITCH_IMG_FMT_GD           VPX_IMG_FMT_NONE
 
 typedef vpx_img_fmt_t switch_img_fmt_t;
 

diff --git a/src/switch_core_video.c b/src/switch_core_video.c
index aeb80fec92a7ad57d929409e4af65e226425e10c..4512abae8fb145abc14a6287f86de519714360d7 100644 (file)
--- a/src/switch_core_video.c
+++ b/src/switch_core_video.c
@@ -33,6 +33,12 @@
 #include <switch_utf8.h>
 #include <libyuv.h>
 
+// #define HAVE_LIBGD
+#ifdef HAVE_LIBGD
+#include <gd.h>
+#endif
+
+
 struct pos_el {
        switch_img_position_t pos;
        const char *name;
@@ -77,6 +83,28 @@ SWITCH_DECLARE(switch_image_t *)switch_img_alloc(switch_image_t  *img,
                                                 unsigned int d_h,
                                                 unsigned int align)
 {
+#ifdef HAVE_LIBGD
+       if (fmt == SWITCH_IMG_FMT_GD) {
+               gdImagePtr gd = gdImageCreateTrueColor(d_w, d_h);
+
+               if (!gd) return NULL;
+
+               switch_img_free(&img);
+               img = (switch_image_t *)vpx_img_alloc(NULL, SWITCH_IMG_FMT_ARGB, 1, 1, 1);
+
+               if (!img) {
+                       gdImageDestroy(gd);
+                       return NULL;
+               }
+
+               img->user_priv = gd;
+               img->d_w = d_w;
+               img->d_h = d_h;
+               img->fmt = SWITCH_IMG_FMT_GD;
+               return img;
+       }
+#endif
+
        return (switch_image_t *)vpx_img_alloc((vpx_image_t *)img, (vpx_img_fmt_t)fmt, d_w, d_h, align);
 }
 
@@ -107,7 +135,13 @@ SWITCH_DECLARE(void) switch_img_flip(switch_image_t *img)
 SWITCH_DECLARE(void) switch_img_free(switch_image_t **img)
 {
        if (img && *img) {
-               switch_safe_free((*img)->user_priv);
+               if ((*img)->fmt == SWITCH_IMG_FMT_GD) {
+#ifdef HAVE_LIBGD
+                       gdImageDestroy((gdImagePtr)(*img)->user_priv);
+#endif
+               } else {
+                       switch_safe_free((*img)->user_priv);
+               }
                vpx_img_free((vpx_image_t *)*img);
                *img = NULL;
        }
@@ -148,6 +182,36 @@ SWITCH_DECLARE(void) switch_img_patch(switch_image_t *IMG, switch_image_t *img,
                }
 
                return;
+
+#ifdef HAVE_LIBGD
+       } else if (img->fmt == SWITCH_IMG_FMT_GD) {
+               gdImagePtr gd = (gdImagePtr)img->user_priv;
+               switch_rgb_color_t rgb_color;
+               int pixel;
+               int i, j;
+
+               switch_assert(gd);
+
+               if (!gd->trueColor) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "GD is experimental, only true color image is supported\n");
+                       return;
+               }
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "truecolor: %d alpha: %d, transparent? %d\n", gd->trueColor, gd->saveAlphaFlag, gd->transparent);
+
+               for(i = 0; i < img->d_h; i++) {
+                       for(j = 0; j < img->d_w; j++) {
+                               pixel = gd->tpixels[i][j];
+                               rgb_color.a = 255; // TODO: handle transparent
+                               rgb_color.r = gdTrueColorGetRed(pixel);
+                               rgb_color.g = gdTrueColorGetGreen(pixel);
+                               rgb_color.b = gdTrueColorGetBlue(pixel);
+                               switch_img_draw_pixel(IMG, x + j, y + i, &rgb_color);
+                       }
+               }
+
+               return;
+#endif
+
        }
 
        if (x < 0) {
@@ -1760,6 +1824,53 @@ SWITCH_DECLARE(void) switch_img_find_position(switch_img_position_t pos, int sw,
 
 }
 
+#ifdef HAVE_LIBGD
+SWITCH_DECLARE(switch_image_t *) switch_img_read_file(const char* file_name)
+{
+       switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_ARGB, 1, 1, 1);
+       gdImagePtr gd = NULL;
+       char *ext;
+       FILE *fp;
+
+       if (!img) return NULL;
+
+       // gd = gdImageCreateFromFile(file_name); // only available in 2.1.1
+
+       ext = strrchr(file_name, '.');
+       if (!ext) goto err;
+
+       fp = fopen(file_name, "rb");
+       if (!fp) goto err;
+
+       if (!strcmp(ext, ".png")) {
+               gd = gdImageCreateFromPng(fp);
+       } else if (!strcmp(ext, ".gif")) {
+               gd = gdImageCreateFromGif(fp);
+       } else if (!strcmp(ext, ".jpg") || !strcmp(ext, ".jpeg")) {
+               gd = gdImageCreateFromJpeg(fp);
+       } else {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not supported file type: %s\n", ext);
+       }
+
+       fclose(fp);
+       if (!gd) goto err;
+
+       img->fmt = SWITCH_IMG_FMT_GD;
+       img->d_w = gd->sx;
+       img->d_h = gd->sy;
+       img->user_priv = gd;
+       return img;
+
+err:
+       switch_img_free(&img);
+       return NULL;
+}
+#else
+SWITCH_DECLARE(switch_image_t *) switch_img_read_file(const char* file_name)
+{
+       return NULL;
+}
+#endif
 
 /* For Emacs:
  * Local Variables: