From: Limin Wang <lance.lmw...@gmail.com>
Signed-off-by: Limin Wang <lance.lmw...@gmail.com>
---
libavfilter/vf_colorbalance.c | 36 +++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/libavfilter/vf_colorbalance.c b/libavfilter/vf_colorbalance.c
index 3fd1426696..1ab3a61039 100644
--- a/libavfilter/vf_colorbalance.c
+++ b/libavfilter/vf_colorbalance.c
@@ -36,9 +36,9 @@ typedef struct ThreadData {
} ThreadData;
typedef struct Range {
- double shadows;
- double midtones;
- double highlights;
+ float shadows;
+ float midtones;
+ float highlights;
} Range;
typedef struct ColorBalanceContext {
@@ -57,15 +57,15 @@ typedef struct ColorBalanceContext {
#define OFFSET(x) offsetof(ColorBalanceContext, x)
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
static const AVOption colorbalance_options[] = {
- { "rs", "set red shadows", OFFSET(cyan_red.shadows),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "gs", "set green shadows", OFFSET(magenta_green.shadows),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "bs", "set blue shadows", OFFSET(yellow_blue.shadows),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "rm", "set red midtones", OFFSET(cyan_red.midtones),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "gm", "set green midtones", OFFSET(magenta_green.midtones),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "bm", "set blue midtones", OFFSET(yellow_blue.midtones),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "rh", "set red highlights", OFFSET(cyan_red.highlights),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "gh", "set green highlights", OFFSET(magenta_green.highlights),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
- { "bh", "set blue highlights", OFFSET(yellow_blue.highlights),
AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, FLAGS },
+ { "rs", "set red shadows", OFFSET(cyan_red.shadows),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "gs", "set green shadows", OFFSET(magenta_green.shadows),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "bs", "set blue shadows", OFFSET(yellow_blue.shadows),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "rm", "set red midtones", OFFSET(cyan_red.midtones),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "gm", "set green midtones", OFFSET(magenta_green.midtones),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "bm", "set blue midtones", OFFSET(yellow_blue.midtones),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "rh", "set red highlights", OFFSET(cyan_red.highlights),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "gh", "set green highlights", OFFSET(magenta_green.highlights),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
+ { "bh", "set blue highlights", OFFSET(yellow_blue.highlights),
AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS },
{ NULL }
};
@@ -95,12 +95,12 @@ static int query_formats(AVFilterContext *ctx)
return ff_set_common_formats(ctx, fmts_list);
}
-static int get_component(int c, int depth, double l,
- double s, double m, double h)
+static int get_component(int c, int depth, float l,
+ float s, float m, float h)
{
- const double a = 4, b = 0.333, scale = 0.7;
- const double max = (1 << depth) - 1;
- double v = c / max;
+ const float a = 4, b = 0.333, scale = 0.7;
+ const float max = (1 << depth) - 1;
+ float v = c / max;
l /= max;
@@ -112,7 +112,7 @@ static int get_component(int c, int depth, double l,
v += m;
v += h;
v = av_clipd(v, 0, 1);
- c = v * max;
+ c = v * max + 0.5;
return av_clip_uintp2_c(c, depth);
}
--
2.21.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
