v3 : fix sharpless mapping issue
v2 : fix filter support flag check logic issue
From 415b00c6157d8311cc18713e6347400895f7333c Mon Sep 17 00:00:00 2001
From: Jun Zhao <mypopy...@gmail.com>
Date: Tue, 30 Aug 2016 14:36:00 +0800
Subject: [PATCH v3] lavf : scale_vaapi : add denoise/sharpless support.
add denoise/sharpless support, used scope [-1, 100] as the input
scope.
Signed-off-by: Jun Zhao <jun.z...@intel.com>
---
libavfilter/vf_scale_vaapi.c | 115 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 115 insertions(+)
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c
index 8dd5acf..5658746 100644
--- a/libavfilter/vf_scale_vaapi.c
+++ b/libavfilter/vf_scale_vaapi.c
@@ -53,6 +53,16 @@ typedef struct ScaleVAAPIContext {
int output_width;
int output_height;
+ VAProcFilterCap denoise_caps;
+ int support_denoise;
+ int denoise; // enable denoise algo. level is the optional
+ // value from the interval [-1, 100], -1 means
disabled
+
+ VAProcFilterCap sharpless_caps;
+ int support_sharpless;
+ int sharpless; // enable sharpless. level is the optional value
+ // from the interval [-1, 100], -1 means disabled
+
} ScaleVAAPIContext;
@@ -117,6 +127,8 @@ static int scale_vaapi_config_output(AVFilterLink *outlink)
AVVAAPIFramesContext *va_frames;
VAStatus vas;
int err, i;
+ unsigned int num_denoise_caps = 1;
+ unsigned int num_sharpless_caps = 1;
scale_vaapi_pipeline_uninit(ctx);
@@ -225,6 +237,29 @@ static int scale_vaapi_config_output(AVFilterLink *outlink)
goto fail;
}
+ vas = vaQueryVideoProcFilterCaps(ctx->hwctx->display, ctx->va_context,
+ VAProcFilterNoiseReduction,
+ &ctx->denoise_caps, &num_denoise_caps);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_WARNING, "Failed to query denoise caps "
+ "context: %d (%s).\n", vas, vaErrorStr(vas));
+ ctx->support_denoise = 0;
+ } else {
+ ctx->support_denoise = 1;
+ }
+
+ vas = vaQueryVideoProcFilterCaps(ctx->hwctx->display, ctx->va_context,
+ VAProcFilterSharpening,
+ &ctx->sharpless_caps,
&num_sharpless_caps);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_WARNING, "Failed to query sharpless caps "
+ "context: %d (%s).\n", vas, vaErrorStr(vas));
+ ctx->support_sharpless = 0;
+ } else {
+ ctx->support_sharpless = 1;
+ }
+
+
av_freep(&hwconfig);
av_hwframe_constraints_free(&constraints);
return 0;
@@ -250,6 +285,14 @@ static int vaapi_proc_colour_standard(enum AVColorSpace
av_cs)
}
}
+static float map_to_range(
+ int input, int in_min, int in_max,
+ float out_min, float out_max)
+{
+ return (input - in_min) * (out_max - out_min) / (in_max - in_min) +
out_min;
+}
+
+
static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame)
{
AVFilterContext *avctx = inlink->dst;
@@ -259,6 +302,10 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink,
AVFrame *input_frame)
VASurfaceID input_surface, output_surface;
VAProcPipelineParameterBuffer params;
VABufferID params_id;
+ VABufferID denoise_id;
+ VABufferID sharpless_id;
+ VABufferID filter_bufs[8];
+ int num_filter_bufs = 0;
VAStatus vas;
int err;
@@ -290,6 +337,43 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink,
AVFrame *input_frame)
av_log(ctx, AV_LOG_DEBUG, "Using surface %#x for scale output.\n",
output_surface);
+ if (ctx->denoise != -1 && ctx->support_denoise) {
+ VAProcFilterParameterBuffer denoise;
+ denoise.type = VAProcFilterNoiseReduction;
+ denoise.value = map_to_range(ctx->denoise, 0, 100,
+ ctx->denoise_caps.range.min_value,
+ ctx->denoise_caps.range.max_value);
+ vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+ VAProcFilterParameterBufferType, sizeof(denoise), 1,
+ &denoise, &denoise_id);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to create denoise parameter
buffer: "
+ "%d (%s).\n", vas, vaErrorStr(vas));
+ err = AVERROR(EIO);
+ goto fail;
+ }
+ filter_bufs[num_filter_bufs++] = denoise_id;
+ }
+
+ if (ctx->sharpless != -1 && ctx->support_sharpless) {
+ VAProcFilterParameterBuffer sharpless;
+ sharpless.type = VAProcFilterSharpening;
+ sharpless.value = map_to_range(ctx->sharpless,
+ 0, 100,
+ ctx->sharpless_caps.range.min_value,
+ ctx->sharpless_caps.range.max_value);
+ vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+ VAProcFilterParameterBufferType, sizeof(sharpless), 1,
+ &sharpless, &sharpless_id);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to create sharpless parameter
buffer: "
+ "%d (%s).\n", vas, vaErrorStr(vas));
+ err = AVERROR(EIO);
+ goto fail;
+ }
+ filter_bufs[num_filter_bufs++] = sharpless_id;
+ }
+
memset(¶ms, 0, sizeof(params));
params.surface = input_surface;
@@ -304,6 +388,11 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink,
AVFrame *input_frame)
params.pipeline_flags = 0;
params.filter_flags = VA_FILTER_SCALING_HQ;
+ if (num_filter_bufs) {
+ params.filters = filter_bufs;
+ params.num_filters = num_filter_bufs;
+ }
+
vas = vaBeginPicture(ctx->hwctx->display,
ctx->va_context, output_surface);
if (vas != VA_STATUS_SUCCESS) {
@@ -351,6 +440,28 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink,
AVFrame *input_frame)
goto fail;
}
+ // This doesn't get freed automatically for some reason.
+ if (ctx->denoise != -1 && ctx->support_denoise) {
+ vas = vaDestroyBuffer(ctx->hwctx->display, denoise_id);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to free denoise parameter
buffer: "
+ "%d (%s).\n", vas, vaErrorStr(vas));
+ err = AVERROR(EIO);
+ goto fail;
+ }
+ }
+
+ // This doesn't get freed automatically for some reason.
+ if (ctx->sharpless != -1 && ctx->support_sharpless) {
+ vas = vaDestroyBuffer(ctx->hwctx->display, sharpless_id);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to free sharpless parameter
buffer: "
+ "%d (%s).\n", vas, vaErrorStr(vas));
+ err = AVERROR(EIO);
+ goto fail;
+ }
+ }
+
av_frame_copy_props(output_frame, input_frame);
av_frame_free(&input_frame);
@@ -418,6 +529,10 @@ static const AVOption scale_vaapi_options[] = {
OFFSET(output_height), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags
= FLAGS },
{ "format", "Output video format (software format of hardware frames)",
OFFSET(output_format_string), AV_OPT_TYPE_STRING, .flags = FLAGS },
+ { "denoise", "denoise level [-1, 100], -1 means disabled",
+ OFFSET(denoise), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 100, .flags = FLAGS
},
+ { "sharpless", "sharpless level [-1, 100], -1 means disabled",
+ OFFSET(sharpless), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 100, .flags =
FLAGS },
{ NULL },
};
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
