X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_vibrance.c;h=8e1a55caca875aef03ad0aa7d6e09eea6a1bbb2c;hb=257a83b969157eb76c18158a4e503e908d8b1125;hp=1e5bf26512f371e6ae16f02d2d629c79bcc299e9;hpb=d6b62ce1aced9e2456582870382f384581cc7cbb;p=ffmpeg

diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c
index 1e5bf26512f..8e1a55caca8 100644
--- a/libavfilter/vf_vibrance.c
+++ b/libavfilter/vf_vibrance.c
@@ -31,6 +31,7 @@ typedef struct VibranceContext {
     float intensity;
     float balance[3];
     float lcoeffs[3];
+    int alternate;
 
     int depth;
 
@@ -49,13 +50,18 @@ static int vibrance_slice8(AVFilterContext *avctx, void *arg, int jobnr, int nb_
     AVFrame *frame = arg;
     const int width = frame->width;
     const int height = frame->height;
+    const float scale = 1.f / 255.f;
     const float gc = s->lcoeffs[0];
     const float bc = s->lcoeffs[1];
     const float rc = s->lcoeffs[2];
     const float intensity = s->intensity;
+    const float alternate = s->alternate ? 1.f : -1.f;
     const float gintensity = intensity * s->balance[0];
     const float bintensity = intensity * s->balance[1];
     const float rintensity = intensity * s->balance[2];
+    const float sgintensity = alternate * FFSIGN(gintensity);
+    const float sbintensity = alternate * FFSIGN(bintensity);
+    const float srintensity = alternate * FFSIGN(rintensity);
     const int slice_start = (height * jobnr) / nb_jobs;
     const int slice_end = (height * (jobnr + 1)) / nb_jobs;
     const int glinesize = frame->linesize[0];
@@ -67,16 +73,16 @@ static int vibrance_slice8(AVFilterContext *avctx, void *arg, int jobnr, int nb_
 
     for (int y = slice_start; y < slice_end; y++) {
         for (int x = 0; x < width; x++) {
-            float g = gptr[x] / 255.f;
-            float b = bptr[x] / 255.f;
-            float r = rptr[x] / 255.f;
+            float g = gptr[x] * scale;
+            float b = bptr[x] * scale;
+            float r = rptr[x] * scale;
             float max_color = FFMAX3(r, g, b);
             float min_color = FFMIN3(r, g, b);
             float color_saturation = max_color - min_color;
             float luma = g * gc + r * rc + b * bc;
-            const float cg = 1.f + gintensity * (1.f - FFSIGN(gintensity) * color_saturation);
-            const float cb = 1.f + bintensity * (1.f - FFSIGN(bintensity) * color_saturation);
-            const float cr = 1.f + rintensity * (1.f - FFSIGN(rintensity) * color_saturation);
+            const float cg = 1.f + gintensity * (1.f - sgintensity * color_saturation);
+            const float cb = 1.f + bintensity * (1.f - sbintensity * color_saturation);
+            const float cr = 1.f + rintensity * (1.f - srintensity * color_saturation);
 
             g = lerpf(luma, g, cg);
             b = lerpf(luma, b, cb);
@@ -101,15 +107,20 @@ static int vibrance_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb
     AVFrame *frame = arg;
     const int depth = s->depth;
     const float max = (1 << depth) - 1;
+    const float scale = 1.f / max;
     const float gc = s->lcoeffs[0];
     const float bc = s->lcoeffs[1];
     const float rc = s->lcoeffs[2];
     const int width = frame->width;
     const int height = frame->height;
     const float intensity = s->intensity;
+    const float alternate = s->alternate ? 1.f : -1.f;
     const float gintensity = intensity * s->balance[0];
     const float bintensity = intensity * s->balance[1];
     const float rintensity = intensity * s->balance[2];
+    const float sgintensity = alternate * FFSIGN(gintensity);
+    const float sbintensity = alternate * FFSIGN(bintensity);
+    const float srintensity = alternate * FFSIGN(rintensity);
     const int slice_start = (height * jobnr) / nb_jobs;
     const int slice_end = (height * (jobnr + 1)) / nb_jobs;
     const int glinesize = frame->linesize[0] / 2;
@@ -121,16 +132,16 @@ static int vibrance_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb
 
     for (int y = slice_start; y < slice_end; y++) {
         for (int x = 0; x < width; x++) {
-            float g = gptr[x] / max;
-            float b = bptr[x] / max;
-            float r = rptr[x] / max;
+            float g = gptr[x] * scale;
+            float b = bptr[x] * scale;
+            float r = rptr[x] * scale;
             float max_color = FFMAX3(r, g, b);
             float min_color = FFMIN3(r, g, b);
             float color_saturation = max_color - min_color;
             float luma = g * gc + r * rc + b * bc;
-            const float cg = 1.f + gintensity * (1.f - FFSIGN(gintensity) * color_saturation);
-            const float cb = 1.f + bintensity * (1.f - FFSIGN(bintensity) * color_saturation);
-            const float cr = 1.f + rintensity * (1.f - FFSIGN(rintensity) * color_saturation);
+            const float cg = 1.f + gintensity * (1.f - sgintensity * color_saturation);
+            const float cb = 1.f + bintensity * (1.f - sbintensity * color_saturation);
+            const float cr = 1.f + rintensity * (1.f - srintensity * color_saturation);
 
             g = lerpf(luma, g, cg);
             b = lerpf(luma, b, cb);
@@ -213,7 +224,7 @@ static const AVFilterPad vibrance_outputs[] = {
 };
 
 #define OFFSET(x) offsetof(VibranceContext, x)
-#define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+#define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
 
 static const AVOption vibrance_options[] = {
     { "intensity", "set the intensity value",   OFFSET(intensity),  AV_OPT_TYPE_FLOAT, {.dbl=0},       -2,  2, VF },
@@ -223,6 +234,7 @@ static const AVOption vibrance_options[] = {
     { "rlum", "set the red luma coefficient",   OFFSET(lcoeffs[2]), AV_OPT_TYPE_FLOAT, {.dbl=0.072186}, 0,  1, VF },
     { "glum", "set the green luma coefficient", OFFSET(lcoeffs[0]), AV_OPT_TYPE_FLOAT, {.dbl=0.715158}, 0,  1, VF },
     { "blum", "set the blue luma coefficient",  OFFSET(lcoeffs[1]), AV_OPT_TYPE_FLOAT, {.dbl=0.212656}, 0,  1, VF },
+    { "alternate", "use alternate colors",      OFFSET(alternate),  AV_OPT_TYPE_BOOL,  {.i64=0},        0,  1, VF },
     { NULL }
 };
 
@@ -237,4 +249,5 @@ AVFilter ff_vf_vibrance = {
     .inputs        = vibrance_inputs,
     .outputs       = vibrance_outputs,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
+    .process_command = ff_filter_process_command,
 };