Message ID | 20200516175130.18868-2-onemda@gmail.com |
---|---|
State | Accepted |
Commit | 5646d02cb37098d7581fddd6f09f7a0003318611 |
Headers | show |
Series | [FFmpeg-devel,1/2] avfilter/vf_colorkey: fix formula for calculation of difference | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
Will apply soon. On 5/16/20, Paul B Mahol <onemda@gmail.com> wrote: > Signed-off-by: Paul B Mahol <onemda@gmail.com> > --- > libavfilter/vf_chromakey.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c > index ce8003657c..4b1669d084 100644 > --- a/libavfilter/vf_chromakey.c > +++ b/libavfilter/vf_chromakey.c > @@ -56,7 +56,7 @@ static uint8_t do_chromakey_pixel(ChromakeyContext *ctx, > uint8_t u[9], uint8_t v > du = (int)u[i] - ctx->chromakey_uv[0]; > dv = (int)v[i] - ctx->chromakey_uv[1]; > > - diff += sqrt((du * du + dv * dv) / (255.0 * 255.0)); > + diff += sqrt((du * du + dv * dv) / (255.0 * 255.0 * 2)); > } > > diff /= 9.0; > @@ -78,7 +78,7 @@ static uint16_t do_chromakey_pixel16(ChromakeyContext > *ctx, uint16_t u[9], uint1 > du = (int)u[i] - ctx->chromakey_uv[0]; > dv = (int)v[i] - ctx->chromakey_uv[1]; > > - diff += sqrt((du * du + dv * dv) / (max * max)); > + diff += sqrt((du * du + dv * dv) / (max * max * 2)); > } > > diff /= 9.0; > -- > 2.17.1 > >
diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index ce8003657c..4b1669d084 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -56,7 +56,7 @@ static uint8_t do_chromakey_pixel(ChromakeyContext *ctx, uint8_t u[9], uint8_t v du = (int)u[i] - ctx->chromakey_uv[0]; dv = (int)v[i] - ctx->chromakey_uv[1]; - diff += sqrt((du * du + dv * dv) / (255.0 * 255.0)); + diff += sqrt((du * du + dv * dv) / (255.0 * 255.0 * 2)); } diff /= 9.0; @@ -78,7 +78,7 @@ static uint16_t do_chromakey_pixel16(ChromakeyContext *ctx, uint16_t u[9], uint1 du = (int)u[i] - ctx->chromakey_uv[0]; dv = (int)v[i] - ctx->chromakey_uv[1]; - diff += sqrt((du * du + dv * dv) / (max * max)); + diff += sqrt((du * du + dv * dv) / (max * max * 2)); } diff /= 9.0;
Signed-off-by: Paul B Mahol <onemda@gmail.com> --- libavfilter/vf_chromakey.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)