virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/procamp_vaapi: fix the green video issue if without arguments.

Browse Source 
Fix the green output issue when use procamp_vaapi without any
arguments, now if use procamp_vaapi without any arguments, will use
the default value to setting procamp_vaapi.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Jun Zhao
2018-01-24 09:28:24 +08:00
committed by Mark Thompson
parent 74cf4a75f7
commit 658ac0672f
1 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/vf_procamp_vaapi.c
View File

@@ -44,8 +44,6 @@
#define SATURATION_MAX 10.0F #define SATURATION_MAX 10.0F
#define SATURATION_DEFAULT 1.0F #define SATURATION_DEFAULT 1.0F
#define EPSILON 0.00001F
typedef struct ProcampVAAPIContext { typedef struct ProcampVAAPIContext {
VAAPIVPPContext vpp_ctx; // must be the first field VAAPIVPPContext vpp_ctx; // must be the first field
@@ -65,11 +63,6 @@ static float map(float x, float in_min, float in_max, float out_min, float out_m
return (float)output; return (float)output;
} }
static int fequal(float a, float b)
{
return fabs(a-b) < EPSILON;
}
static int procamp_vaapi_build_filter_params(AVFilterContext *avctx) static int procamp_vaapi_build_filter_params(AVFilterContext *avctx)
{ {
VAAPIVPPContext *vpp_ctx = avctx->priv; VAAPIVPPContext *vpp_ctx = avctx->priv;
@@ -93,41 +86,37 @@ static int procamp_vaapi_build_filter_params(AVFilterContext *avctx)
return AVERROR(EIO); return AVERROR(EIO);
} }
if (!fequal(ctx->bright, BRIGHTNESS_DEFAULT)) { /* brightness */
procamp_params[i].type = VAProcFilterColorBalance; procamp_params[i].type = VAProcFilterColorBalance;
procamp_params[i].attrib = VAProcColorBalanceBrightness; procamp_params[i].attrib = VAProcColorBalanceBrightness;
procamp_params[i].value = map(ctx->bright, BRIGHTNESS_MIN, BRIGHTNESS_MAX, procamp_params[i].value = map(ctx->bright, BRIGHTNESS_MIN, BRIGHTNESS_MAX,
procamp_caps[VAProcColorBalanceBrightness-1].range.min_value, procamp_caps[VAProcColorBalanceBrightness-1].range.min_value,
procamp_caps[VAProcColorBalanceBrightness-1].range.max_value); procamp_caps[VAProcColorBalanceBrightness-1].range.max_value);
i++; i++;
}
if (!fequal(ctx->contrast, CONTRAST_DEFAULT)) { /* contrast */
procamp_params[i].type = VAProcFilterColorBalance; procamp_params[i].type = VAProcFilterColorBalance;
procamp_params[i].attrib = VAProcColorBalanceContrast; procamp_params[i].attrib = VAProcColorBalanceContrast;
procamp_params[i].value = map(ctx->contrast, CONTRAST_MIN, CONTRAST_MAX, procamp_params[i].value = map(ctx->contrast, CONTRAST_MIN, CONTRAST_MAX,
procamp_caps[VAProcColorBalanceContrast-1].range.min_value, procamp_caps[VAProcColorBalanceContrast-1].range.min_value,
procamp_caps[VAProcColorBalanceContrast-1].range.max_value); procamp_caps[VAProcColorBalanceContrast-1].range.max_value);
i++; i++;
}
if (!fequal(ctx->hue, HUE_DEFAULT)) { /* hue */
procamp_params[i].type = VAProcFilterColorBalance; procamp_params[i].type = VAProcFilterColorBalance;
procamp_params[i].attrib = VAProcColorBalanceHue; procamp_params[i].attrib = VAProcColorBalanceHue;
procamp_params[i].value = map(ctx->hue, HUE_MIN, HUE_MAX, procamp_params[i].value = map(ctx->hue, HUE_MIN, HUE_MAX,
procamp_caps[VAProcColorBalanceHue-1].range.min_value, procamp_caps[VAProcColorBalanceHue-1].range.min_value,
procamp_caps[VAProcColorBalanceHue-1].range.max_value); procamp_caps[VAProcColorBalanceHue-1].range.max_value);
i++; i++;
}
if (!fequal(ctx->saturation, SATURATION_DEFAULT)) { /* saturation */
procamp_params[i].type = VAProcFilterColorBalance; procamp_params[i].type = VAProcFilterColorBalance;
procamp_params[i].attrib = VAProcColorBalanceSaturation; procamp_params[i].attrib = VAProcColorBalanceSaturation;
procamp_params[i].value = map(ctx->saturation, SATURATION_MIN, SATURATION_MAX, procamp_params[i].value = map(ctx->saturation, SATURATION_MIN, SATURATION_MAX,
procamp_caps[VAProcColorBalanceSaturation-1].range.min_value, procamp_caps[VAProcColorBalanceSaturation-1].range.min_value,
procamp_caps[VAProcColorBalanceSaturation-1].range.max_value); procamp_caps[VAProcColorBalanceSaturation-1].range.max_value);
i++; i++;
}
return ff_vaapi_vpp_make_param_buffers(avctx, return ff_vaapi_vpp_make_param_buffers(avctx,
VAProcFilterParameterBufferType, VAProcFilterParameterBufferType,