mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 23:08:35 +00:00
[core] Replace GetARGBBlend with ARGBBlend in switch_img_patch_rgb and add a unit test, GetARGBBlend is removed from newer libyuv (#3287)
This commit is contained in:
1 parent
9b38dcf201
commit
07dedba4a4
2 files changed
+123
-18
No files matched your search
+2
-18
@@ -370,8 +370,6 @@ SWITCH_DECLARE(void) switch_img_attenuate(switch_image_t *img)
|
||||
SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *img, int x, int y, switch_bool_t noalpha)
|
||||
{
|
||||
#ifdef SWITCH_HAVE_YUV
|
||||
int i;
|
||||
|
||||
if (noalpha) {
|
||||
switch_img_patch_rgb_noalpha(IMG, img, x, y);
|
||||
return;
|
||||
@@ -386,19 +384,9 @@ SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *i
|
||||
int dst_stride_argb = IMG->stride[SWITCH_PLANE_PACKED];
|
||||
int width = MIN(img->d_w, IMG->d_w - abs(x));
|
||||
int height = MIN(img->d_h, IMG->d_h - abs(y));
|
||||
void (*ARGBBlendRow)(const uint8_t* src_argb, const uint8_t* src_argb1, uint8_t* dst_argb, int width) = GetARGBBlend();
|
||||
|
||||
// switch_img_attenuate(img);
|
||||
|
||||
// Coalesce rows. we have same size images, treat as a single row
|
||||
if (src_stride_argb0 == width * 4 &&
|
||||
src_stride_argb1 == width * 4 &&
|
||||
x == 0 && y == 0) {
|
||||
width *= height;
|
||||
height = 1;
|
||||
src_stride_argb0 = src_stride_argb1 = dst_stride_argb = 0;
|
||||
}
|
||||
|
||||
if (y) {
|
||||
src_argb1 += (y * IMG->d_w * 4);
|
||||
dst_argb += (y * IMG->d_w * 4);
|
||||
@@ -408,12 +396,8 @@ SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *i
|
||||
dst_argb += (x * 4);
|
||||
}
|
||||
|
||||
for (i = 0; i < height; ++i) {
|
||||
ARGBBlendRow(src_argb0, src_argb1, dst_argb, width);
|
||||
src_argb0 += src_stride_argb0;
|
||||
src_argb1 += src_stride_argb1;
|
||||
dst_argb += dst_stride_argb;
|
||||
}
|
||||
/* ARGBBlend coalesces rows internally. */
|
||||
ARGBBlend(src_argb0, src_stride_argb0, src_argb1, src_stride_argb1, dst_argb, dst_stride_argb, width, height);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user