From patchwork Tue Jan 23 04:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7395 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3807072jak; Mon, 22 Jan 2018 20:34:04 -0800 (PST) X-Google-Smtp-Source: AH8x226Ov1uHFzWAaPSNl+j/uEJKSIC1mhx2LDfCo5uxeeV7IIgf8eiyn9eAmSbs/hRfoBlep0cd X-Received: by 10.28.63.65 with SMTP id m62mr649585wma.29.1516682044369; Mon, 22 Jan 2018 20:34:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516682044; cv=none; d=google.com; s=arc-20160816; b=jo6Lc9NKDQRFTYZ2XHxDwILwZox+wFhtek4rbZbFGylDyKM0JyZwixbQYfQWASrYKG 08zkEJCJz8ZmTxftJ1ED/VbA3GYjcxXfspVKNFHaGtrSAj7e8WZXKeHayx6bgbXF+NI+ xG2ZYj3DH3VezAtpU6c7RcsxopABkyh8j6Ka4N4FLeym90lDs4QkYAP/fGfv5DUcTzYx VrB3zD40oNqHeM9T6IswcQKJ0Te3BF0+GX8utI+hVLVJkIHrS7HC3lz/R+wvmbPBWdG+ nKmYlDB43syYsfnV/KBYCSiDdDdq87wv3ARwSvul4eSqIGpfSvBL2zkzahxbgoJyJu6T I20w== 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=qGjSVfTcES3DoSFQPB78yPDMCtL+uQzEDnRhg1mqpmE=; b=jvfmwrgGDqPkBSXCCRlVL1OdoH9UYE9pp0VYSuMSbCOeaQ24xPOtEmRK+nMTw7RHTC /Bbq06yN1bSWVyLR7CViMenge0r4bkXXSKQ3oPQ9TQIrWnh47113BzFIUcGKgb+xAnzC VspxpcsjDbRb2ZYbAqeWpnsyS7bmmp18DIi/fZo6fiWVYfxyuJeWZm8H6uWHhhgK0u5E QeBfwwO61A9p+gRfhtCwI+te+b9CkHN4KHYweM/mU3I4CzMlPMJ1bt1E9OM3i4aw97mg n3WAPINxVWK0an+q6ZH8ey324dBA2JQSTiPdU2ifoYQGe7HPm4TK2Z8eb1EZEsHZsuHN W2Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jUGFhVvW; 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 i9si6534009wre.62.2018.01.22.20.33.56; Mon, 22 Jan 2018 20:34:04 -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=jUGFhVvW; 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 65783689B3A; Tue, 23 Jan 2018 06:33:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 122C5689B35 for ; Tue, 23 Jan 2018 06:33:46 +0200 (EET) Received: by mail-pg0-f54.google.com with SMTP id w17so8834767pgv.6 for ; Mon, 22 Jan 2018 20:33:48 -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=B6B0u1rlBrjmpWxb1k0odhxgDOPYrW7KEA8Ia82F2EY=; b=jUGFhVvWU8KlqOJWtEu+/XSxPaVEo+rXzPKjmN5esitsjd4tdebxjqzdcYy0giDu6W 6o/5Ghk28npdt22yxxSs+eEK/bqP9Zv1PnX5Ez0Hjy9yVKgvvXR8GV/YwGff3mmBZg/L mkWqHlGFgtKfhCw3EJJorRL4pjb8GoJC4BLsuWmDHVhjgtQlLkTCPZwtmCMMlfTQ7+hf 9UsLVnUfQXj11sMRUfQjd0abC3ocYFa0KnSC/mXYf/Be1JY1BTa2kDuTo2HmwXemD9fP 1S17sCY5PJEhrGivV/hSLOLPfyo19wVJRNWvn/Xn6uFhH9du55Mz7dUET5ou6E9LYNr9 inWg== 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=B6B0u1rlBrjmpWxb1k0odhxgDOPYrW7KEA8Ia82F2EY=; b=G4sMeQPWLUVpI5fs0q3x0vsNOgAZbr/LUzzECA+iGPiqMTwTazHAJUE1F+3ZOqU2wa QqGP41Tvvsz1+lZtxK/q1octRAixDfusSniMLU696RmyLla7Kiord5rPkk8nPfZfQIIc xNoI/RPbg026j0L4bo4DEgTpgzoxc7BE7Hs6R+yLivKxpEZ6Z75jYyy3orbVgOna1wig iDeKQTUtzPbFKZJAG7tKAdls/Rgiyfe58SvRE148GtCHuvUTxeyDgngB1bBwFahqLgOe QNhJTkE3gAzkSa9VVL5nDFC1OOzK8aGnVf71NSKUVhU+C+qJq+uDB45bEVlNq8wASHGl GVyw== X-Gm-Message-State: AKwxytcC8LwIWyvO6pZ2AZpZOoTDrQR7FD+CZB4SCe95xH+R0U8drvjw bsqRY5c4Sc5hHcWHNEKRujQ= X-Received: by 10.99.6.14 with SMTP id 14mr7711037pgg.8.1516682027026; Mon, 22 Jan 2018 20:33:47 -0800 (PST) Received: from [10.67.68.20] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id j6sm2541077pfg.90.2018.01.22.20.33.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 20:33:46 -0800 (PST) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: Date: Tue, 23 Jan 2018 12:33:44 +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/4] lavfi/misc_vaapi: fix typo and add check for params buffer. 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 021278e2b1a5cee873fbc6c36e5666b2ca7a4e8d Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 23 Jan 2018 12:12:21 +0800 Subject: [PATCH 4/4] lavfi/misc_vaapi: fix typo and add check for params buffer. Signed-off-by: Jun Zhao --- libavfilter/vf_misc_vaapi.c | 68 +++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 316f15e38b..8b179fe215 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -38,13 +38,13 @@ #define SHARPNESS_DEFAULT 44 typedef struct DenoiseVAAPIContext { - VAAPIVPPContext vpp_ctx; // must be the first fileld + VAAPIVPPContext vpp_ctx; // must be the first field int denoise; // enable denoise algo. } DenoiseVAAPIContext; typedef struct SharpnessVAAPIContext { - VAAPIVPPContext vpp_ctx; // must be the first fileld + VAAPIVPPContext vpp_ctx; // must be the first field int sharpness; // enable sharpness. } SharpnessVAAPIContext; @@ -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; }