On 2018/1/19 8:33, Mark Thompson wrote: > On 18/01/18 05:18, Jun Zhao wrote: >> From 795fc41a83c23ff461fef1870a003d77b070084f Mon Sep 17 00:00:00 2001 >> From: Jun Zhao <jun.z...@intel.com> >> Date: Mon, 8 Jan 2018 16:12:41 +0800 >> Subject: [PATCH V3 4/6] 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 <yunx.z.z...@intel.com> >> Signed-off-by: Jun Zhao <jun.z...@intel.com> >> --- >> configure | 1 + >> libavfilter/Makefile | 1 + >> libavfilter/allfilters.c | 1 + >> libavfilter/vf_procamp_vaapi.c | 227 >> +++++++++++++++++++++++++++++++++++++++++ >> 4 files changed, 230 insertions(+) >> create mode 100644 libavfilter/vf_procamp_vaapi.c >> >> diff --git a/configure b/configure >> index 5d533621ae..12fb34a202 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..2d6c45366f >> --- /dev/null >> +++ b/libavfilter/vf_procamp_vaapi.c >> @@ -0,0 +1,227 @@ >> +/* >> + * 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 <string.h> >> + >> +#include "libavutil/avassert.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 { >> + float bright; >> + float hue; >> + float saturation; >> + float contrast; >> +} ProcampVAAPIContext; >> + >> +static int procamp_vaapi_build_filter_params(AVFilterContext *avctx) >> +{ >> + VAAPIVPPContext *vpp_ctx = avctx->priv; >> + ProcampVAAPIContext *ctx = vpp_ctx->priv; >> + 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 " >> + "filter caps: %d (%s).\n", vas, vaErrorStr(vas)); >> + return AVERROR(EIO); >> + } >> + >> + procamp_params[0].type = VAProcFilterColorBalance; >> + procamp_params[0].attrib = VAProcColorBalanceBrightness; >> + procamp_params[0].value = ctx->bright; >> + >> + procamp_params[1].type = VAProcFilterColorBalance; >> + procamp_params[1].attrib = VAProcColorBalanceContrast; >> + procamp_params[1].value = ctx->contrast; >> + >> + procamp_params[2].type = VAProcFilterColorBalance; >> + procamp_params[2].attrib = VAProcColorBalanceHue; >> + procamp_params[2].value = ctx->hue; >> + >> + procamp_params[3].type = VAProcFilterColorBalance; >> + procamp_params[3].attrib = VAProcColorBalanceSaturation; >> + procamp_params[3].value = ctx->saturation; > I think you do still want the range checking you had in the first version - > drivers need not all use the same range. > > (With this version, procamp_caps isn't actually used.) Will re-think and double-check this part, tks. > >> + >> + return vaapi_vpp_make_param_buffers(vpp_ctx, >> + VAProcFilterParameterBufferType, >> + &procamp_params, >> + sizeof(procamp_params[0]), >> + 4); >> +} >> + >> +static int procamp_vaapi_filter_frame(AVFilterLink *inlink, AVFrame >> *input_frame) >> +{ >> + AVFilterContext *avctx = inlink->dst; >> + AVFilterLink *outlink = avctx->outputs[0]; >> + VAAPIVPPContext *vpp_ctx = avctx->priv; >> + ProcampVAAPIContext *ctx = vpp_ctx->priv; >> + 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 = ff_get_video_buffer(outlink, vpp_ctx->output_width, >> + vpp_ctx->output_height); >> + if (!output_frame) { >> + err = AVERROR(ENOMEM); >> + goto fail; >> + } >> + >> + 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(&input_frame); >> + av_frame_free(&output_frame); >> + return err; >> +} >> + >> +static av_cold int procamp_vaapi_init(AVFilterContext *avctx) >> +{ >> + VAAPIVPPContext *vpp_ctx = avctx->priv; >> + >> + vaapi_vpp_ctx_init(vpp_ctx); >> + vpp_ctx->pipeline_uninit = vaapi_vpp_pipeline_uninit; >> + vpp_ctx->build_filter_params = procamp_vaapi_build_filter_params; >> + vpp_ctx->output_format = AV_PIX_FMT_NONE; >> + >> + return 0; >> +} >> + >> +#define OFFSET(x) (offsetof(VAAPIVPPContext, priv_data) + \ >> + 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 }, >> + { "brightness", "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 }, >> + { "saturatio", "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 }, >> + { "contrast", "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 }, >> + { "hue", "Output video hue", >> + OFFSET(hue), AV_OPT_TYPE_FLOAT, { .dbl = 0.0 }, -180.0, 180.0, .flags >> = FLAGS }, > Perhaps hue should work on all values rather than restricting to [-180,+180]? > It seems quite reasonable to write a number >180 here. (Mod by 360 to get > into the right range above.) > >> + { NULL }, >> +}; >> + >> +AVFILTER_DEFINE_CLASS(procamp_vaapi); >> + >> +static const AVFilterPad procamp_vaapi_inputs[] = { >> + { >> + .name = "default", >> + .type = AVMEDIA_TYPE_VIDEO, >> + .filter_frame = &procamp_vaapi_filter_frame, >> + .config_props = &vaapi_vpp_config_input, >> + }, >> + { NULL } >> +}; >> + >> +static const AVFilterPad procamp_vaapi_outputs[] = { >> + { >> + .name = "default", >> + .type = AVMEDIA_TYPE_VIDEO, >> + .config_props = &vaapi_vpp_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(VAAPIVPPContext) + >> + sizeof(ProcampVAAPIContext)), >> + .init = &procamp_vaapi_init, >> + .uninit = &vaapi_vpp_ctx_uninit, >> + .query_formats = &vaapi_vpp_query_formats, >> + .inputs = procamp_vaapi_inputs, >> + .outputs = procamp_vaapi_outputs, >> + .priv_class = &procamp_vaapi_class, >> + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, >> +}; >> -- >> 2.14.1 >> > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel