[FFmpeg-cvslog] avfilter/vf_blend: use float for opacity calculations
Paul B Mahol
git at videolan.org
Fri Aug 27 10:35:56 EEST 2021
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Aug 27 09:30:36 2021 +0200| [0cacef58facc7509a6d29dd90360d7b28a887760] | committer: Paul B Mahol
avfilter/vf_blend: use float for opacity calculations
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cacef58facc7509a6d29dd90360d7b28a887760
---
libavfilter/vf_blend.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index c968ca8012..84f1e9f5bb 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -147,12 +147,12 @@ static void blend_normal_8bit(const uint8_t *top, ptrdiff_t top_linesize,
ptrdiff_t width, ptrdiff_t height,
FilterParams *param, double *values, int starty)
{
- const double opacity = param->opacity;
+ const float opacity = param->opacity;
int i, j;
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
- dst[j] = top[j] * opacity + bottom[j] * (1. - opacity);
+ dst[j] = top[j] * opacity + bottom[j] * (1.f - opacity);
}
dst += dst_linesize;
top += top_linesize;
@@ -169,7 +169,7 @@ static void blend_normal_16bit(const uint8_t *_top, ptrdiff_t top_linesize,
const uint16_t *top = (uint16_t*)_top;
const uint16_t *bottom = (uint16_t*)_bottom;
uint16_t *dst = (uint16_t*)_dst;
- const double opacity = param->opacity;
+ const float opacity = param->opacity;
int i, j;
dst_linesize /= 2;
top_linesize /= 2;
@@ -177,7 +177,7 @@ static void blend_normal_16bit(const uint8_t *_top, ptrdiff_t top_linesize,
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
- dst[j] = top[j] * opacity + bottom[j] * (1. - opacity);
+ dst[j] = top[j] * opacity + bottom[j] * (1.f - opacity);
}
dst += dst_linesize;
top += top_linesize;
@@ -194,7 +194,7 @@ static void blend_normal_32bit(const uint8_t *_top, ptrdiff_t top_linesize,
const float *top = (float*)_top;
const float *bottom = (float*)_bottom;
float *dst = (float*)_dst;
- const double opacity = param->opacity;
+ const float opacity = param->opacity;
int i, j;
dst_linesize /= 4;
top_linesize /= 4;
@@ -202,7 +202,7 @@ static void blend_normal_32bit(const uint8_t *_top, ptrdiff_t top_linesize,
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
- dst[j] = top[j] * opacity + bottom[j] * (1. - opacity);
+ dst[j] = top[j] * opacity + bottom[j] * (1.f - opacity);
}
dst += dst_linesize;
top += top_linesize;
@@ -217,7 +217,7 @@ static void blend_## name##_8bit(const uint8_t *top, ptrdiff_t top_linesize,
ptrdiff_t width, ptrdiff_t height, \
FilterParams *param, double *values, int starty) \
{ \
- double opacity = param->opacity; \
+ const float opacity = param->opacity; \
int i, j; \
\
for (i = 0; i < height; i++) { \
@@ -240,7 +240,7 @@ static void blend_## name##_##depth##bit(const uint8_t *_top, ptrdiff_t top_line
const uint16_t *top = (const uint16_t*)_top; \
const uint16_t *bottom = (const uint16_t*)_bottom; \
uint16_t *dst = (uint16_t*)_dst; \
- double opacity = param->opacity; \
+ const float opacity = param->opacity; \
int i, j; \
dst_linesize /= 2; \
top_linesize /= 2; \
@@ -266,7 +266,7 @@ static void blend_## name##_##depth##bit(const uint8_t *_top, ptrdiff_t top_line
const float *top = (const float*)_top; \
const float *bottom = (const float*)_bottom; \
float *dst = (float*)_dst; \
- double opacity = param->opacity; \
+ const float opacity = param->opacity; \
int i, j; \
dst_linesize /= 4; \
top_linesize /= 4; \
More information about the ffmpeg-cvslog
mailing list