FS-7500: refactor to support Alpha channel on core image, only ARGB & I420 are supported

src/include/switch_core_video.h

@@ -223,7 +223,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_txt_handle_render(switch_img_txt_hand
 SWITCH_DECLARE(void) switch_img_patch_hole(switch_image_t *IMG, switch_image_t *img, int x, int y, switch_image_rect_t *rect);
 
 SWITCH_DECLARE(switch_status_t) switch_png_patch_img(switch_png_t *use_png, switch_image_t *img, int x, int y);
-SWITCH_DECLARE(switch_image_t *) switch_img_read_png(const char *file_name);
+SWITCH_DECLARE(switch_image_t *) switch_img_read_png(const char *file_name, switch_img_fmt_t img_fmt);
 SWITCH_DECLARE(switch_status_t) switch_img_write_png(switch_image_t *img, char *file_name);
 SWITCH_DECLARE(switch_status_t) switch_png_open(switch_png_t **pngP, const char *file_name);
 SWITCH_DECLARE(void) switch_png_free(switch_png_t **pngP);

src/include/switch_vpx.h

@@ -63,6 +63,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
 
 typedef vpx_img_fmt_t switch_img_fmt_t;
 

src/mod/applications/mod_conference/mod_conference.c

@@ -1227,7 +1227,7 @@ static void layer_set_logo(conference_member_t *member, mcu_layer_t *layer, cons
 	}
 
 	if (path && strcasecmp(path, "clear")) {
-		layer->logo_img = switch_img_read_png(path);
+		layer->logo_img = switch_img_read_png(path, SWITCH_IMG_FMT_ARGB);
 	}
 
 	layer->logo_pos = pos;
@@ -1967,7 +1967,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
 								clear_layer(conference->canvas, layer);
 
 								if (!layer->mute_img && imember->video_mute_png) {
-									layer->mute_img = switch_img_read_png(imember->video_mute_png);
+									layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
 								}
 
 								if (layer->mute_img) {
@@ -3944,7 +3944,7 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
 		}
 		
 		if (avatar) {
-			member->avatar_png_img = switch_img_read_png(avatar);
+			member->avatar_png_img = switch_img_read_png(avatar, SWITCH_IMG_FMT_I420);
 		}
 
 		if ((var = switch_channel_get_variable_dup(member->channel, "video_mute_png", SWITCH_FALSE, -1))) {

src/mod/formats/mod_png/mod_png.c

@@ -74,7 +74,7 @@ static switch_status_t png_file_open(switch_file_handle_t *handle, const char *p
 
 	memset(context, 0, sizeof(png_file_context_t));
 
-	if (!(context->img = switch_img_read_png(path))) {
+	if (!(context->img = switch_img_read_png(path, SWITCH_IMG_FMT_I420))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening %s\n", path);
 		return SWITCH_STATUS_GENERR;
 	}

src/switch_core_media.c

@@ -4782,7 +4782,7 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
 	}
 
 	if ((var = switch_channel_get_variable(session->channel, "core_video_blank_image"))) {
-		blank_img = switch_img_read_png(var);
+		blank_img = switch_img_read_png(var, SWITCH_IMG_FMT_I420);
 	}
 
 	if (!blank_img) {