diff options
| author | Clément Bœsch <u@pkh.me> | 2022-12-27 14:48:58 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2023-01-03 17:18:55 +0100 |
| commit | dafd43b78dc3cf737103fbcafe075a1a85f224c7 (patch) | |
| tree | 377b9a5a62de44e447d83e3b67d40d9d29f1f7a0 | |
| parent | 187f5e7f908efee4bb8d4743d910cf6ea4e2ee0f (diff) | |
| download | ffmpeg-dafd43b78dc3cf737103fbcafe075a1a85f224c7.tar.gz | |
avfilter/palettegen: change cut score from ∑e² to max e²
This is following the results from personal research¹.
¹: https://github.com/ubitux/research/tree/main/color-quantization#results
| -rw-r--r-- | libavfilter/vf_palettegen.c | 3 | ||||
| -rw-r--r-- | tests/ref/fate/filter-palettegen-1 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/filter-palettegen-2 | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 7ecb1211ba..00b5f88c49 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -171,7 +171,8 @@ static void compute_box_stats(PaletteGenContext *s, struct range_box *box) if (er2[0] >= er2[1] && er2[0] >= er2[2]) box->major_axis = 0; if (er2[1] >= er2[0] && er2[1] >= er2[2]) box->major_axis = 1; // prefer green again - box->cut_score = er2[0] + er2[1] + er2[2]; + /* The box that has the axis with the biggest error amongst all boxes will but cut down */ + box->cut_score = FFMAX3(er2[0], er2[1], er2[2]); } /** diff --git a/tests/ref/fate/filter-palettegen-1 b/tests/ref/fate/filter-palettegen-1 index 278d831846..57be338b42 100644 --- a/tests/ref/fate/filter-palettegen-1 +++ b/tests/ref/fate/filter-palettegen-1 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 16x16 #sar 0: 1/1 -0, 0, 0, 1, 1024, 0x394ee723 +0, 0, 0, 1, 1024, 0x21c6e6c4 diff --git a/tests/ref/fate/filter-palettegen-2 b/tests/ref/fate/filter-palettegen-2 index e9bc635c81..bcdf54af95 100644 --- a/tests/ref/fate/filter-palettegen-2 +++ b/tests/ref/fate/filter-palettegen-2 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 16x16 #sar 0: 1/1 -0, 0, 0, 1, 1024, 0xc54d773d +0, 0, 0, 1, 1024, 0x630d76b1 |