From patchwork Wed Jan 24 03:04:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7406 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp230442jak; Tue, 23 Jan 2018 19:04:47 -0800 (PST) X-Google-Smtp-Source: AH8x2254URhiOJ+vRpslv4aJKwex3JcKo8k74ujCIYEJ8xvk0BPj3KmkXDzXfOCz/rp9+py553ML X-Received: by 10.28.148.150 with SMTP id w144mr3398630wmd.0.1516763087121; Tue, 23 Jan 2018 19:04:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763087; cv=none; d=google.com; s=arc-20160816; b=UcdVy9vAtBGBARAuH2ycYVJP14BgSMfRNNo2D51wbivCrF9ealynBQujAFT/Hilc6L oB+bcu686V1I3yEPHvgvmX1Lu+KCjzNonjoIp6v7UeVmM1uk+JG2pVSSpJvvK8DKaska sbdjSosQSRMSehOFgX/+2V5i02L3wo732oaXUR8ojo4l3kHm6UzONaiJJR8RZw9NHrjM mrvQhUk3nUgfsfEL81ueSFLgGBpV2kGFZ7N1gYGfkJFBN/Qtw+C40IzMDimHkAyZasKd mF09Mtflf288NQIF5p2W7IRjN8ImhYJqvc1tzH5Mkvqtca+VPZXExN5so3uJEdKAwl7K A4kA== 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=S5zfQrSFem5dCOhXTslS51L6QHDIJ6aXmrqcfNWdO1Y=; b=C7dg1Ce9YWtrLp/uu84xLl3Re7mYpHgP8/Qe5wSr55FsprLxCq/pZWXhuLrWZX/8kC AxemDzWfUQb+DIOo3s8fAkoolBZqwoFthAhb8xmVjz2dHRNUJ4VJ/q9rdKlWF34LdQ1h 0yerGpsFao9UQYx8ipf9xlz3FgFgdNaiYoC5wHzxCXELwS8D+teH3C0F/xVj9K0FtCwg OaYmRyjGxmFNH+p3cFFO0h9zl3N4svpncgOcILAz3Zlsbh9n1X+PDJIqbEWRtgP3YA6/ YJaEzqBa8Dvfo4qJVNoi3637ehLKgr4yZlFuGNsw+XlUG//B10MqKfNo7+p6rvSPjuxg VzCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tmS1NR3B; 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 f15si184870wmg.184.2018.01.23.19.04.46; Tue, 23 Jan 2018 19:04:47 -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=tmS1NR3B; 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 60D96689E05; Wed, 24 Jan 2018 05:04:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D85B689DD9 for ; Wed, 24 Jan 2018 05:04:34 +0200 (EET) Received: by mail-pf0-f172.google.com with SMTP id p1so1965122pfh.4 for ; Tue, 23 Jan 2018 19:04:36 -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=WvCbyudo02LsJm6OHTqcBspG6lcqUh0Y1CmCokrIpSo=; b=tmS1NR3ByvQIuB1ErEGgp30EoXdue2enhsemntTLP8V+wnT5pnIGpaKimh81MJrUZj m4e6PERQEfcFZt4HH/UFGdN3WDrS2vMdArFOx2Skqb6wkV2zL+T0XpRlEpBWunpSBKEH ToUBSfmozbXAujfNLofaYZUBnpvHuHw8Ni9mA/6+PANORxhw/phCQ2JjmyuWXuUaK6qc XuV4qC2IqjjJg0XVw0gaOpBOS6xRvzfoNNNvL4OGBd+heZJM3KcTfl+6DCTZqBf4IZHL IcTThW35kGJ+M0tV2Ui5WbvFNaCsQ0ZYsgTJGSJJqhksV5kdWcbczmsvcKj1OQtVm0dM ZUHw== 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=WvCbyudo02LsJm6OHTqcBspG6lcqUh0Y1CmCokrIpSo=; b=o8cTbsQUKxv6OPGy0omGmFRa8u59QO2i44Neff3NZjDoJwQgCumm710lu91nKvhX7p zA/DjFzu/ftOTzvAeuQ5qaZ+McywSsMbcVB1Z6YxHCEPxGNqmCSL09mA9VFmJrhpF8WK REd/usBcGNrcoKNymt8LZYBIeGz1zN+T5wPSZy1XYcd1RUrJXuLAqLsl47UWHQTZi2Dl NehZ3mqT4/608HySB7RXOBrKg+iagHXVnQ9ehedzpX1RS01RXw5J54gLEh0/az+Nx7EM QCHxewP+FrLh6t4lGHpSN9T1r6WOgL7FvLnLVBPDi+SvDjRWhGHwCMQ0Z3Tm76Ahod8i uKCg== X-Gm-Message-State: AKwxytc2dmeVcrsgQlTtovNcH7bR/QO5T0WcrrzoVEuOpPb44NV2Z/Lh Ejr715aI+fc9AooVk8xGu9A= X-Received: by 10.99.62.10 with SMTP id l10mr9398785pga.288.1516763075134; Tue, 23 Jan 2018 19:04:35 -0800 (PST) Received: from [10.67.68.20] ([192.55.54.41]) by smtp.gmail.com with ESMTPSA id k3sm1207193pff.41.2018.01.23.19.04.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 19:04:34 -0800 (PST) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Wed, 24 Jan 2018 11:04:31 +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 V2 3/3] lavfi/misc_vaapi: use default value setting if without arguments. 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 7a4a53fcc5a9b31b11818976dc02ea8e004d2c5a Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 24 Jan 2018 09:32:50 +0800 Subject: [PATCH V2 3/3] lavfi/misc_vaapi: use default value setting if without arguments. Signed-off-by: Jun Zhao --- libavfilter/vf_misc_vaapi.c | 64 +++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index c60b7b0c48..8b179fe215 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -71,24 +71,22 @@ static int denoise_vaapi_build_filter_params(AVFilterContext *avctx) VAProcFilterParameterBuffer denoise; - if (ctx->denoise != DENOISE_DEFAULT) { - vas = vaQueryVideoProcFilterCaps(vpp_ctx->hwctx->display, vpp_ctx->va_context, - VAProcFilterNoiseReduction, - &caps, &num_caps); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to query denoise caps " - "context: %d (%s).\n", vas, vaErrorStr(vas)); - return AVERROR(EIO); - } - - denoise.type = VAProcFilterNoiseReduction; - denoise.value = map(ctx->denoise, DENOISE_MIN, DENOISE_MAX, - caps.range.min_value, - caps.range.max_value); - ff_vaapi_vpp_make_param_buffers(avctx, VAProcFilterParameterBufferType, - &denoise, sizeof(denoise), 1); + vas = vaQueryVideoProcFilterCaps(vpp_ctx->hwctx->display, vpp_ctx->va_context, + VAProcFilterNoiseReduction, + &caps, &num_caps); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query denoise caps " + "context: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR(EIO); } + denoise.type = VAProcFilterNoiseReduction; + denoise.value = map(ctx->denoise, DENOISE_MIN, DENOISE_MAX, + caps.range.min_value, + caps.range.max_value); + ff_vaapi_vpp_make_param_buffers(avctx, VAProcFilterParameterBufferType, + &denoise, sizeof(denoise), 1); + return 0; } @@ -104,26 +102,24 @@ static int sharpness_vaapi_build_filter_params(AVFilterContext *avctx) VAProcFilterParameterBuffer sharpness; - if (ctx->sharpness != SHARPNESS_DEFAULT) { - vas = vaQueryVideoProcFilterCaps(vpp_ctx->hwctx->display, vpp_ctx->va_context, - VAProcFilterSharpening, - &caps, &num_caps); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to query sharpness caps " - "context: %d (%s).\n", vas, vaErrorStr(vas)); - return AVERROR(EIO); - } - - sharpness.type = VAProcFilterSharpening; - sharpness.value = map(ctx->sharpness, - SHARPNESS_MIN, SHARPNESS_MAX, - caps.range.min_value, - caps.range.max_value); - ff_vaapi_vpp_make_param_buffers(avctx, - VAProcFilterParameterBufferType, - &sharpness, sizeof(sharpness), 1); + vas = vaQueryVideoProcFilterCaps(vpp_ctx->hwctx->display, vpp_ctx->va_context, + VAProcFilterSharpening, + &caps, &num_caps); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query sharpness caps " + "context: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR(EIO); } + sharpness.type = VAProcFilterSharpening; + sharpness.value = map(ctx->sharpness, + SHARPNESS_MIN, SHARPNESS_MAX, + caps.range.min_value, + caps.range.max_value); + ff_vaapi_vpp_make_param_buffers(avctx, + VAProcFilterParameterBufferType, + &sharpness, sizeof(sharpness), 1); + return 0; }