kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7506 refactor to use rgb color for pixel

This commit is contained in:
Seven Du 2015-05-12 10:37:53 +08:00 committed by Michael Jerris
parent f0b42410a3
commit 8787ccd5a5
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/switch_core_video.h
View File

@ -256,9 +256,9 @@ SWITCH_DECLARE(void) switch_img_fill(switch_image_t *img, int x, int y, int w, i
* \param[in] img Image descriptor * \param[in] img Image descriptor
* \param[in] x leftmost pos * \param[in] x leftmost pos
* \param[in] y topmost pos * \param[in] y topmost pos
* \param[in] color YUV color * \param[in] color RGB color
*/ */
SWITCH_DECLARE(void) switch_img_draw_pixel(switch_image_t *img, int x, int y, switch_yuv_color_t *color); SWITCH_DECLARE(void) switch_img_draw_pixel(switch_image_t *img, int x, int y, switch_rgb_color_t *color);
/*!\brief Set RGB color with a string /*!\brief Set RGB color with a string
* *

45
src/switch_core_video.c
View File

@ -134,7 +134,6 @@ SWITCH_DECLARE(void) switch_img_patch(switch_image_t *IMG, switch_image_t *img,
int j; int j;
uint8_t alpha; uint8_t alpha;
switch_rgb_color_t *rgb_color; switch_rgb_color_t *rgb_color;
switch_yuv_color_t yuv_color;
for (i = 0; i < max_h; i++) { for (i = 0; i < max_h; i++) {
for (j = 0; j < max_w; j++) { for (j = 0; j < max_w; j++) {
@ -143,8 +142,7 @@ SWITCH_DECLARE(void) switch_img_patch(switch_image_t *IMG, switch_image_t *img,
if (alpha > 127) { // todo: mux alpha with the underlying pixel ? if (alpha > 127) { // todo: mux alpha with the underlying pixel ?
rgb_color = (switch_rgb_color_t *)(img->planes[SWITCH_PLANE_PACKED] + i * img->stride[SWITCH_PLANE_PACKED] + j * 4 + 1); rgb_color = (switch_rgb_color_t *)(img->planes[SWITCH_PLANE_PACKED] + i * img->stride[SWITCH_PLANE_PACKED] + j * 4 + 1);
switch_color_rgb2yuv(rgb_color, &yuv_color); switch_img_draw_pixel(IMG, x + j, y + i, rgb_color);
switch_img_draw_pixel(IMG, x + j, y + i, &yuv_color);
} }
} }
} }
@ -291,15 +289,19 @@ SWITCH_DECLARE(switch_image_t *) switch_img_copy_rect(switch_image_t *img, uint3
return new_img; return new_img;
} }
SWITCH_DECLARE(void) switch_img_draw_pixel(switch_image_t *img, int x, int y, switch_yuv_color_t *color) SWITCH_DECLARE(void) switch_img_draw_pixel(switch_image_t *img, int x, int y, switch_rgb_color_t *color)
{ {
switch_yuv_color_t yuv;
if (img->fmt != SWITCH_IMG_FMT_I420 || x < 0 || y < 0 || x >= img->d_w || y >= img->d_h) return; if (img->fmt != SWITCH_IMG_FMT_I420 || x < 0 || y < 0 || x >= img->d_w || y >= img->d_h) return;
img->planes[SWITCH_PLANE_Y][y * img->stride[SWITCH_PLANE_Y] + x] = color->y; switch_color_rgb2yuv(color, &yuv);
img->planes[SWITCH_PLANE_Y][y * img->stride[SWITCH_PLANE_Y] + x] = yuv.y;
if (((x & 0x1) == 0) && ((y & 0x1) == 0)) {// only draw on even position if (((x & 0x1) == 0) && ((y & 0x1) == 0)) {// only draw on even position
img->planes[SWITCH_PLANE_U][y / 2 * img->stride[SWITCH_PLANE_U] + x / 2] = color->u; img->planes[SWITCH_PLANE_U][y / 2 * img->stride[SWITCH_PLANE_U] + x / 2] = yuv.u;
img->planes[SWITCH_PLANE_V][y / 2 * img->stride[SWITCH_PLANE_V] + x / 2] = color->v; img->planes[SWITCH_PLANE_V][y / 2 * img->stride[SWITCH_PLANE_V] + x / 2] = yuv.v;
} }
} }
@ -365,7 +367,6 @@ SWITCH_DECLARE(void) switch_img_overlay(switch_image_t *IMG, switch_image_t *img
{ {
int i, j, len, max_h; int i, j, len, max_h;
switch_rgb_color_t RGB, rgb, c; switch_rgb_color_t RGB, rgb, c;
switch_yuv_color_t yuv;
int xoff = 0, yoff = 0; int xoff = 0, yoff = 0;
switch_assert(IMG->fmt == SWITCH_IMG_FMT_I420); switch_assert(IMG->fmt == SWITCH_IMG_FMT_I420);
@ -396,8 +397,7 @@ SWITCH_DECLARE(void) switch_img_overlay(switch_image_t *IMG, switch_image_t *img
c.g = ((RGB.g * (255 - alpha)) >> 8) + ((rgb.g * alpha) >> 8); c.g = ((RGB.g * (255 - alpha)) >> 8) + ((rgb.g * alpha) >> 8);
c.b = ((RGB.b * (255 - alpha)) >> 8) + ((rgb.b * alpha) >> 8); c.b = ((RGB.b * (255 - alpha)) >> 8) + ((rgb.b * alpha) >> 8);
switch_color_rgb2yuv(&c, &yuv); switch_img_draw_pixel(IMG, x + j, i, &c);
switch_img_draw_pixel(IMG, x + j, i, &yuv);
} }
} }
} }
@ -537,24 +537,23 @@ struct switch_img_txt_handle_s {
switch_image_t *img; switch_image_t *img;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
int free_pool; int free_pool;
switch_yuv_color_t gradient_table[MAX_GRADIENT]; switch_rgb_color_t gradient_table[MAX_GRADIENT];
switch_bool_t use_bgcolor; switch_bool_t use_bgcolor;
}; };
static void init_gradient_table(switch_img_txt_handle_t *handle) static void init_gradient_table(switch_img_txt_handle_t *handle)
{ {
int i; int i;
switch_rgb_color_t color; switch_rgb_color_t *color;
switch_rgb_color_t *c1 = &handle->bgcolor; switch_rgb_color_t *c1 = &handle->bgcolor;
switch_rgb_color_t *c2 = &handle->color; switch_rgb_color_t *c2 = &handle->color;
for (i = 0; i < MAX_GRADIENT; i++) { for (i = 0; i < MAX_GRADIENT; i++) {
color.r = c1->r + (c2->r - c1->r) * i / MAX_GRADIENT; color = &handle->gradient_table[i];
color.g = c1->g + (c2->g - c1->g) * i / MAX_GRADIENT; color->r = c1->r + (c2->r - c1->r) * i / MAX_GRADIENT;
color.b = c1->b + (c2->b - c1->b) * i / MAX_GRADIENT; color->g = c1->g + (c2->g - c1->g) * i / MAX_GRADIENT;
color->b = c1->b + (c2->b - c1->b) * i / MAX_GRADIENT;
switch_color_rgb2yuv(&color, &handle->gradient_table[i]);
} }
} }
@ -649,7 +648,6 @@ static void draw_bitmap(switch_img_txt_handle_t *handle, switch_image_t *img, FT
FT_Int i, j, p, q; FT_Int i, j, p, q;
FT_Int x_max = x + bitmap->width; FT_Int x_max = x + bitmap->width;
FT_Int y_max = y + bitmap->rows; FT_Int y_max = y + bitmap->rows;
switch_yuv_color_t yuv_color;
if (bitmap->width == 0) return; if (bitmap->width == 0) return;
@ -659,8 +657,6 @@ static void draw_bitmap(switch_img_txt_handle_t *handle, switch_image_t *img, FT
case FT_PIXEL_MODE_NONE: case FT_PIXEL_MODE_NONE:
case FT_PIXEL_MODE_MONO: case FT_PIXEL_MODE_MONO:
{ {
switch_color_rgb2yuv(&handle->color, &yuv_color);
for ( j = y, q = 0; j < y_max; j++, q++ ) { for ( j = y, q = 0; j < y_max; j++, q++ ) {
for ( i = x, p = 0; i < x_max; i++, p++ ) { for ( i = x, p = 0; i < x_max; i++, p++ ) {
uint8_t byte; uint8_t byte;
@ -670,7 +666,7 @@ static void draw_bitmap(switch_img_txt_handle_t *handle, switch_image_t *img, FT
byte = bitmap->buffer[(q * linesize + p) / 8]; byte = bitmap->buffer[(q * linesize + p) / 8];
if ((byte >> (7 - (p % 8))) & 0x1) { if ((byte >> (7 - (p % 8))) & 0x1) {
switch_img_draw_pixel(img, i, j, &yuv_color); switch_img_draw_pixel(img, i, j, &handle->color);
} }
} }
} }
@ -700,8 +696,7 @@ static void draw_bitmap(switch_img_txt_handle_t *handle, switch_image_t *img, FT
c.g = ((rgb_color.g * (255 - gradient)) >> 8) + ((handle->color.g * gradient) >> 8); c.g = ((rgb_color.g * (255 - gradient)) >> 8) + ((handle->color.g * gradient) >> 8);
c.b = ((rgb_color.b * (255 - gradient)) >> 8) + ((handle->color.b * gradient) >> 8); c.b = ((rgb_color.b * (255 - gradient)) >> 8) + ((handle->color.b * gradient) >> 8);
switch_color_rgb2yuv(&c, &yuv_color); switch_img_draw_pixel(img, i, j, &c);
switch_img_draw_pixel(img, i, j, &yuv_color);
} }
} }
} }
@ -1047,7 +1042,6 @@ SWITCH_DECLARE(switch_status_t) switch_png_patch_img(switch_png_t *use_png, swit
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_rgb_color_t *rgb_color; switch_rgb_color_t *rgb_color;
switch_yuv_color_t yuv_color;
uint8_t alpha; uint8_t alpha;
int i, j; int i, j;
@ -1062,8 +1056,7 @@ SWITCH_DECLARE(switch_status_t) switch_png_patch_img(switch_png_t *use_png, swit
if (alpha) { // todo, mux alpha with the underlying pixel if (alpha) { // todo, mux alpha with the underlying pixel
//rgb_color = (switch_rgb_color_t *)(use_png->pvt->buffer + i * use_png->pvt->png.width * 4 + j * 4); //rgb_color = (switch_rgb_color_t *)(use_png->pvt->buffer + i * use_png->pvt->png.width * 4 + j * 4);
rgb_color = (switch_rgb_color_t *)(use_png->pvt->buffer + i * use_png->pvt->png.width * 4 + j * 4 + 1); rgb_color = (switch_rgb_color_t *)(use_png->pvt->buffer + i * use_png->pvt->png.width * 4 + j * 4 + 1);
switch_color_rgb2yuv(rgb_color, &yuv_color); switch_img_draw_pixel(img, x + j, y + i, rgb_color);
switch_img_draw_pixel(img, x + j, y + i, &yuv_color);
} }
} }
} }