From patchwork Mon Jan 8 08:35:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7201 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2386071jaa; Mon, 8 Jan 2018 00:35:56 -0800 (PST) X-Google-Smtp-Source: ACJfBovxc1iQUuzVGzfmUql6TochjKf95rsvkgKVpfvLul3dIDE7hzCsWzG9Y5GOujYTHkFcQtjx X-Received: by 10.223.183.21 with SMTP id l21mr8700416wre.220.1515400555999; Mon, 08 Jan 2018 00:35:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515400555; cv=none; d=google.com; s=arc-20160816; b=zVWe3NNFkz3mra9l2IGpEa2hMlEvp4woI30o3dyRRt+vtDNmS+FZTeUR66IYZ73DKT RxuoKmnwPXyyuo+bMwVkZDTIf6BH9x03Fv6JALLVQTX+oB7IzobtuPCVSOfHyDj9he2X PNLGiZQe0r5fP4bVeNwOALeAuR4ouBVjfdEYbypkm26bTPnZJysAh1kawaBR7aXECrYx jpxvbt4NHrYkzCvCoDbuyH6L3RkiDyBKDpOf3Q1kkiNmLCRHP09xSxwcgBZKKsIfYE6z 0KUxm5RaT8MwzAg9i9UQBNMpnkhPSzAGmIexwiI4KQBZzeCA0rl4nvELnTWBF5pVWqlK oQxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=UoPzPlDnbZOl2g8h7JKeK+HLuuza8349MmmUfcRaJ/E=; b=X16jZ1/ENQfUW2JfVoTk0/Vgrvnf5sB9jBc56AJkmD2QMJ5/Cncig3Mn5vNVaAfIwe FJFsWAMmJRVCBDnt9KLzLMIHhkCCUMSfSJZdjFB3mRgOzNBcf00juH8EuUlTaM7QKxzp NIuKfeftwOpuNT6qsCCeuHa3hqwx5BLL5UoebP2Ed7goC9XQxlJMgp4E+mOehj04Q7Fu GwuwOVypcHetRNFTwPkKn3y3XDyq5kxwEcinO5pwUuxq2admzdW/6tYbkKs0iLdCTgWj pRiGpDiORH9rAl5FHP0fA8KjYzuLfPLba/NsQSjoDq+v8vtmDV7yUwikuCps8LFHo2Dj X2qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rVlioklo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m194si7451085wma.37.2018.01.08.00.35.55; Mon, 08 Jan 2018 00:35:55 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rVlioklo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAFBB689F5D; Mon, 8 Jan 2018 10:35:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93321689BD0 for ; Mon, 8 Jan 2018 10:35:46 +0200 (EET) Received: by mail-pf0-f171.google.com with SMTP id d23so5473919pfe.9 for ; Mon, 08 Jan 2018 00:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=aqiBBz8bSl7VaFcE3J4p5hkFoS+Fa0LIb9sZJ9EkJog=; b=rVliokloEgxg34io4EE87b7Le10dQcW0gXTtPV6FZGx8DhEy4A5lo0ds2/yuctYDhj kCcvtmMcwaIVA4Vu0RKRhKsCmD5T50p7q3VwaCYpWJZufBttrBirchV7G98f4A7y7lU+ 2iuwxgbP97RW48f5DJAm3EQsh1zu3nvDf5LwJ71RN+5+hvplnbEnLDU6yz2XxhGhTX9X lVt2AC2j+S/pLZU2/KM901kAvfsyczIz14mCEzt/ilHppyI7X4idbBBJB8hgxVYRu3ew DjVmG93C+35fatiUTNfX8OJjvNwS96X40sf2bbJUMQ6hJYR2HQOd08DEMs091CdQbnkb FlrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=aqiBBz8bSl7VaFcE3J4p5hkFoS+Fa0LIb9sZJ9EkJog=; b=c0WxA9oq+3pnR/o4gLr5zeGK5T+38Df70gjZ48xBaYnwOVoWzNplBYnJmpB0olo6vj gj98PTmlWjICFJ4EfeQEcSxvjWUhSO4gSK/4YF1ec5ay/iwLOQmyV73+nvfX8b3+j2lI fwNdsD60bNHl69myJHb8B6izTGRifAm2SgyXHLzcMH7gnA/hhgmQcMqKRj1Javjf8+v0 nrUt6FhMY+jvo/bJHbrRilu7Rx+MDnN8fOPxWjfLQUWzOrrUHoiwTY5+0QnzmIFDqds9 XQQkVRqI7jXbFdIwf0Q/yJeq+75kIVE2xZbfiahKJFQlfzLFw5ZiI9mdqWHCwEDxYyjX 7MMA== X-Gm-Message-State: AKGB3mJG0Ydsf5Pp62q4JxPErJF7ycTsxsUSxPnOvU57BDeysBh+JsY1 QvcoboRf5IWT652wLDwWSsQ445QC X-Received: by 10.98.209.68 with SMTP id t4mr9989281pfl.153.1515400546199; Mon, 08 Jan 2018 00:35:46 -0800 (PST) Received: from [10.67.68.34] ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id e7sm26933402pfj.44.2018.01.08.00.35.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 00:35:45 -0800 (PST) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <26a7a46d-aa7e-b90d-12da-1f5ad31886f4@gmail.com> Date: Mon, 8 Jan 2018 16:35:43 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 4/5] lavfi: add ProcAmp(color balance) vaapi video filter. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 72b242449086d7366ee524e608bb8f178c15b8cf Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 8 Jan 2018 16:12:41 +0800 Subject: [PATCH 4/5] lavfi: add ProcAmp(color balance) vaapi video filter. add ProcAmp(color balance) vaapi video filter, use the option like -vf "procamp_vaapi=b=10:h=120:c=2.8:s=3.7" to set brightness/hue/contrast/saturation. Signed-off-by: Yun Zhou Signed-off-by: Jun Zhao --- configure | 1 + libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_procamp_vaapi.c | 308 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 311 insertions(+) create mode 100644 libavfilter/vf_procamp_vaapi.c diff --git a/configure b/configure index 1c3e505b04..366a67d327 100755 --- a/configure +++ b/configure @@ -3245,6 +3245,7 @@ perspective_filter_deps="gpl" phase_filter_deps="gpl" pp7_filter_deps="gpl" pp_filter_deps="gpl postproc" +procamp_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" program_opencl_filter_deps="opencl" pullup_filter_deps="gpl" removelogo_filter_deps="avcodec avformat swscale" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index bbc97a0831..43d0dd36e6 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -275,6 +275,7 @@ OBJS-$(CONFIG_PP_FILTER) += vf_pp.o OBJS-$(CONFIG_PP7_FILTER) += vf_pp7.o OBJS-$(CONFIG_PREMULTIPLY_FILTER) += vf_premultiply.o framesync.o OBJS-$(CONFIG_PREWITT_FILTER) += vf_convolution.o +OBJS-$(CONFIG_PROCAMP_VAAPI_FILTER) += vf_procamp_vaapi.o vaapi_vpp.o OBJS-$(CONFIG_PROGRAM_OPENCL_FILTER) += vf_program_opencl.o opencl.o framesync.o OBJS-$(CONFIG_PSEUDOCOLOR_FILTER) += vf_pseudocolor.o OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o framesync.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 42516bbdf9..63550628e5 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -284,6 +284,7 @@ static void register_all(void) REGISTER_FILTER(PP7, pp7, vf); REGISTER_FILTER(PREMULTIPLY, premultiply, vf); REGISTER_FILTER(PREWITT, prewitt, vf); + REGISTER_FILTER(PROCAMP_VAAPI, procamp_vaapi, vf); REGISTER_FILTER(PROGRAM_OPENCL, program_opencl, vf); REGISTER_FILTER(PSEUDOCOLOR, pseudocolor, vf); REGISTER_FILTER(PSNR, psnr, vf); diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c new file mode 100644 index 0000000000..d169d54ebe --- /dev/null +++ b/libavfilter/vf_procamp_vaapi.c @@ -0,0 +1,308 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include + +#include +#include + +#include "libavutil/avassert.h" +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_vaapi.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" + +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "vaapi_vpp.h" + +typedef struct ProcampVAAPIContext { + const AVClass *class; + + VAAPIVPPContext *vpp_ctx; + + float bright; + float hue; + float saturation; + float contrast; +} ProcampVAAPIContext; + +static int procamp_vaapi_query_formats(AVFilterContext *avctx) +{ + return vaapi_vpp_query_formats(avctx); +} + +static int procamp_vaapi_pipeline_uninit(AVFilterContext *avctx) +{ + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + + return vaapi_vpp_pipeline_uninit(vpp_ctx); +} + +static int procamp_vaapi_config_input(AVFilterLink *inlink) +{ + AVFilterContext *avctx = inlink->dst; + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + + return vaapi_vpp_config_input(inlink, vpp_ctx); +} + +static int procamp_vaapi_build_filter_params(AVFilterContext *avctx) +{ + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + VAStatus vas; + VAProcFilterParameterBufferColorBalance procamp_params[4]; + VAProcFilterCapColorBalance procamp_caps[VAProcColorBalanceCount]; + int num_caps; + + memset(&procamp_params, 0, sizeof(procamp_params)); + memset(&procamp_caps, 0, sizeof(procamp_caps)); + + num_caps = VAProcColorBalanceCount; + vas = vaQueryVideoProcFilterCaps(vpp_ctx->hwctx->display, vpp_ctx->va_context, + VAProcFilterColorBalance, &procamp_caps, &num_caps); + + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to Query procamp " + "query caps: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR(EIO); + } + + procamp_params[0].type = VAProcFilterColorBalance; + procamp_params[0].attrib = VAProcColorBalanceBrightness; + procamp_params[0].value = + av_clip(ctx->bright, + procamp_caps[VAProcColorBalanceBrightness-1].range.min_value, + procamp_caps[VAProcColorBalanceBrightness-1].range.max_value); + + procamp_params[1].type = VAProcFilterColorBalance; + procamp_params[1].attrib = VAProcColorBalanceContrast; + procamp_params[1].value = + av_clip(ctx->contrast, + procamp_caps[VAProcColorBalanceContrast-1].range.min_value, + procamp_caps[VAProcColorBalanceContrast-1].range.max_value); + + procamp_params[2].type = VAProcFilterColorBalance; + procamp_params[2].attrib = VAProcColorBalanceHue; + procamp_params[2].value = + av_clip(ctx->hue, + procamp_caps[VAProcColorBalanceHue-1].range.min_value, + procamp_caps[VAProcColorBalanceHue-1].range.max_value); + + procamp_params[3].type = VAProcFilterColorBalance; + procamp_params[3].attrib = VAProcColorBalanceSaturation; + procamp_params[3].value = + av_clip(ctx->saturation, + procamp_caps[VAProcColorBalanceSaturation-1].range.min_value, + procamp_caps[VAProcColorBalanceSaturation-1].range.max_value); + + vaapi_vpp_make_param_buffers(vpp_ctx, + VAProcFilterParameterBufferType, + &procamp_params, + sizeof(procamp_params[0]), + 4); + + return 0; +} + +static int procamp_vaapi_config_output(AVFilterLink *outlink) +{ + AVFilterContext *avctx = outlink->src; + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + int err; + + ctx->vpp_ctx->output_width = avctx->inputs[0]->w; + ctx->vpp_ctx->output_height = avctx->inputs[0]->h; + + err = vaapi_vpp_config_output(outlink, vpp_ctx); + if (err < 0) + goto fail; + + return 0; + +fail: + return err; +} + +static int procamp_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) +{ + AVFilterContext *avctx = inlink->dst; + AVFilterLink *outlink = avctx->outputs[0]; + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + AVFrame *output_frame = NULL; + VASurfaceID input_surface, output_surface; + VAProcPipelineParameterBuffer params; + VARectangle input_region; + int err; + + av_log(ctx, AV_LOG_DEBUG, "Filter input: %s, %ux%u (%"PRId64").\n", + av_get_pix_fmt_name(input_frame->format), + input_frame->width, input_frame->height, input_frame->pts); + + if (vpp_ctx->va_context == VA_INVALID_ID) + return AVERROR(EINVAL); + + input_surface = (VASurfaceID)(uintptr_t)input_frame->data[3]; + av_log(ctx, AV_LOG_DEBUG, "Using surface %#x for procamp input.\n", + input_surface); + + output_frame = av_frame_alloc(); + if (!output_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate output frame."); + err = AVERROR(ENOMEM); + goto fail; + } + + err = av_hwframe_get_buffer(vpp_ctx->output_frames_ref, output_frame, 0); + if (err < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to get surface for " + "output: %d\n.", err); + } + + output_surface = (VASurfaceID)(uintptr_t)output_frame->data[3]; + av_log(ctx, AV_LOG_DEBUG, "Using surface %#x for procamp output.\n", + output_surface); + memset(¶ms, 0, sizeof(params)); + input_region = (VARectangle) { + .x = 0, + .y = 0, + .width = input_frame->width, + .height = input_frame->height, + }; + + params.surface = input_surface; + params.surface_region = &input_region; + params.surface_color_standard = + vaapi_vpp_colour_standard(input_frame->colorspace); + + params.output_region = NULL; + params.output_background_color = 0xff000000; + params.output_color_standard = params.surface_color_standard; + + params.pipeline_flags = 0; + params.filter_flags = VA_FRAME_PICTURE; + + params.filters = &vpp_ctx->filter_buffers[0]; + params.num_filters = 1; + + err = vaapi_vpp_render_picture(vpp_ctx, ¶ms, output_surface); + if (err < 0) + goto fail; + + err = av_frame_copy_props(output_frame, input_frame); + if (err < 0) + goto fail; + av_frame_free(&input_frame); + + av_log(ctx, AV_LOG_DEBUG, "Filter output: %s, %ux%u (%"PRId64").\n", + av_get_pix_fmt_name(output_frame->format), + output_frame->width, output_frame->height, output_frame->pts); + + return ff_filter_frame(outlink, output_frame); + +fail: + av_frame_free(&output_frame); + return err; +} + +static av_cold int procamp_vaapi_init(AVFilterContext *avctx) +{ + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx; + + ctx->vpp_ctx = av_mallocz(sizeof(VAAPIVPPContext)); + if (!ctx->vpp_ctx) + return AVERROR(ENOMEM); + + vpp_ctx = ctx->vpp_ctx; + + vaapi_vpp_ctx_init(vpp_ctx); + vpp_ctx->pipeline_uninit = procamp_vaapi_pipeline_uninit; + vpp_ctx->build_filter_params = procamp_vaapi_build_filter_params; + vpp_ctx->output_format = AV_PIX_FMT_NONE; + + return 0; +} + +static av_cold void procamp_vaapi_uninit(AVFilterContext *avctx) +{ + ProcampVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = ctx->vpp_ctx; + + vaapi_vpp_ctx_uninit(avctx, vpp_ctx); +} + +#define OFFSET(x) offsetof(ProcampVAAPIContext, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM) +static const AVOption procamp_vaapi_options[] = { + { "b", "Output video brightness", + OFFSET(bright), AV_OPT_TYPE_FLOAT, { .dbl = 0.0 }, -100.0, 100.0, .flags = FLAGS }, + { "s", "Output video saturation", + OFFSET(saturation), AV_OPT_TYPE_FLOAT, { .dbl = 1.0 }, 0.0, 10.0, .flags = FLAGS }, + { "c", "Output video contrast", + OFFSET(contrast), AV_OPT_TYPE_FLOAT, { .dbl = 1.0 }, 0.0, 10.0, .flags = FLAGS }, + { "h", "Output video hue", + OFFSET(hue), AV_OPT_TYPE_FLOAT, { .dbl = 0.0 }, -180.0, 180.0, .flags = FLAGS }, + { NULL }, +}; + +static const AVClass procamp_vaapi_class = { + .class_name = "procamp_vaapi", + .item_name = av_default_item_name, + .option = procamp_vaapi_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static const AVFilterPad procamp_vaapi_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &procamp_vaapi_filter_frame, + .config_props = &procamp_vaapi_config_input, + }, + { NULL } +}; + +static const AVFilterPad procamp_vaapi_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &procamp_vaapi_config_output, + }, + { NULL } +}; + +AVFilter ff_vf_procamp_vaapi = { + .name = "procamp_vaapi", + .description = NULL_IF_CONFIG_SMALL("ProcAmp (color balance) adjustments for hue, saturation, brightness, contrast"), + .priv_size = sizeof(ProcampVAAPIContext), + .init = &procamp_vaapi_init, + .uninit = &procamp_vaapi_uninit, + .query_formats = &procamp_vaapi_query_formats, + .inputs = procamp_vaapi_inputs, + .outputs = procamp_vaapi_outputs, + .priv_class = &procamp_vaapi_class, + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, +}; +