From patchwork Fri Jul 9 03:32:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp270964ios; Thu, 8 Jul 2021 20:36:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEgiGCO7r5MbTGNw/dMF3QO4PSpJj4Hvd7PTKUs66OjNDlmG7Sswu0vrUNQq81hri4rxbm X-Received: by 2002:a05:6402:154:: with SMTP id s20mr43239576edu.103.1625801791176; Thu, 08 Jul 2021 20:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625801791; cv=none; d=google.com; s=arc-20160816; b=nn2Gp5Gyy3+3pwb5c3/Vdc6HVXqx4lkw0QssvvPiUo+ZFzumMQbsJRqNAfJ/4+Wxsq ayiPbSERRzHBgM/PtVau4FngLO9A2HorVOY2Mu56EY8hlktNwLonJoifwJJC7Eja3jyW hipj79cdtaJ5OYTaqef1P/yyknu7qY7p/MMTQp8GIMZGsswqp8/Q/8kMGvoTWgTetLHc T+vOE6H9rlGxWbZWKMnGoAvd0/Nh2CnjwTZcsUV/5+ws3hAV2hy7Kv8wZ7b0btuqmxfR dumcUpXmtwTX6E2OoIvxJLsW5U7msXL6/6NmDEmRUIBfOyomnZQj1x8XV+aMcPyCnnvR jYrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=/gOZcqdnHPr6pRClQYZNb+oJzRVEW5jAeyl3cgjmKaM=; b=Dci9w2FrqPFF28qnvC7etfgA9oH+5oeNzpRfJBhk8KkVXVcq4wjD9itmR34ivDeRMv y/XDLGAnm1MkOJTA5GXFCQf34jT6jW8Ol4SV4O2cSaf7hlTc3Yzq8AVRtjD+NNyObTHp uHOu/OAMZIJd8GASZDtDOMXMds8yQyZeE2NX/mWc22QQQIXrj0E5QKLP8fuV9ExmXMzQ XfEzS0otzDu15WMyvHiJTP8EogAhnHhSrlmLeQNx0eKN6wzB9uFVCxQejrUXhCIi6QBq wf2YywozlrDhzmcQA2H5Q6eDznVjcMrLJzHfuUEhcqTKw9kLfc+A8S6Wmv6Ed2rHOGHA BYRA== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f18si4968136ejx.521.2021.07.08.20.36.30; Thu, 08 Jul 2021 20:36:31 -0700 (PDT) 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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EA4D68A6E0; Fri, 9 Jul 2021 06:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1176C68A558 for ; Fri, 9 Jul 2021 06:35:08 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10039"; a="196814911" X-IronPort-AV: E=Sophos;i="5.84,225,1620716400"; d="scan'208";a="196814911" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2021 20:34:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,225,1620716400"; d="scan'208";a="461973680" Received: from f.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 08 Jul 2021 20:34:57 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jul 2021 11:32:27 +0800 Message-Id: <20210709033229.19125-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210709033229.19125-1-fei.w.wang@intel.com> References: <20210709033229.19125-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 7/9] avcodec/av1_vaapi: set display surface when apply film grain X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Fei Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dFrE9CAotyyh Signed-off-by: Fei Wang --- libavcodec/vaapi_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index f577447be4..81b13bb1aa 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -76,7 +76,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx, .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, .bit_depth_idx = bit_depth_idx, .current_frame = pic->output_surface, - .current_display_picture = pic->output_surface, + .current_display_picture = apply_grain ? ff_vaapi_get_surface_id(s->cur_frame.tf_display.f) : pic->output_surface, .frame_width_minus1 = frame_header->frame_width_minus_1, .frame_height_minus1 = frame_header->frame_height_minus_1, .primary_ref_frame = frame_header->primary_ref_frame,