RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_colorkey: fix formula for calculation of difference

Browse Source 
Also fixes colorhold filtering.
This commit is contained in:
Paul B Mahol 2020-05-16 19:45:53 +02:00
parent f63939dedb
commit 8b0575d763
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_colorkey.c
View File

@ -45,7 +45,7 @@ static uint8_t do_colorkey_pixel(ColorkeyContext *ctx, uint8_t r, uint8_t g, uin
int dg = (int)g - ctx->colorkey_rgba[1]; int dg = (int)g - ctx->colorkey_rgba[1];
int db = (int)b - ctx->colorkey_rgba[2]; int db = (int)b - ctx->colorkey_rgba[2];
double diff = sqrt((dr * dr + dg * dg + db * db) / (255.0 * 255.0)); double diff = sqrt((dr * dr + dg * dg + db * db) / (255.0 * 255.0 * 3.0));
if (ctx->blend > 0.0001) { if (ctx->blend > 0.0001) {
return av_clipd((diff - ctx->similarity) / ctx->blend, 0.0, 1.0) * 255.0; return av_clipd((diff - ctx->similarity) / ctx->blend, 0.0, 1.0) * 255.0;

20
tests/ref/fate/ffmpeg-filter_colorkey
View File

@ -3,13 +3,13 @@
#codec_id 0: rawvideo #codec_id 0: rawvideo
#dimensions 0: 720x576 #dimensions 0: 720x576
#sar 0: 0/1 #sar 0: 0/1
0, 0, 0, 1, 622080, 0x78efb628 0, 0, 0, 1, 622080, 0x5775bb12
0, 1, 1, 1, 622080, 0x641f2564 0, 1, 1, 1, 622080, 0x84d8395a
0, 2, 2, 1, 622080, 0x348f25c3 0, 2, 2, 1, 622080, 0x599d3a6b
0, 3, 3, 1, 622080, 0x6afc485a 0, 3, 3, 1, 622080, 0x1df1e9dc
0, 4, 4, 1, 622080, 0xe949107f 0, 4, 4, 1, 622080, 0xf3255836
0, 5, 5, 1, 622080, 0x171716e5 0, 5, 5, 1, 622080, 0xf46bc26e
0, 6, 6, 1, 622080, 0x2985a01f 0, 6, 6, 1, 622080, 0x76d491da
0, 7, 7, 1, 622080, 0xc5ddabd7 0, 7, 7, 1, 622080, 0x2c9f3ca6
0, 8, 8, 1, 622080, 0xb4dd2b7f 0, 8, 8, 1, 622080, 0x5713e203
0, 9, 9, 1, 622080, 0x6e75ba82 0, 9, 9, 1, 622080, 0x47776493