From patchwork Mon Jul 5 02:29:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3736677ios; Sun, 4 Jul 2021 19:32:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEbwHJMMfCXFOm0rFagwFVa7znOmtYueFiKEmiO63TRyDau5EKYrTixt53xPCZLO2HqPS1 X-Received: by 2002:a17:907:3e09:: with SMTP id hp9mr11267242ejc.37.1625452376556; Sun, 04 Jul 2021 19:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625452376; cv=none; d=google.com; s=arc-20160816; b=PD6rhdzbo0aldTyLnFD2GR14pdMOkDQtOCsNi8XGwpvIPZVrhNh35X4KSqLxuIvxaY p/5I7GJIzHssd0ejpRMi0U9EoMdwxVFWdxuu7ohq2xuCXH5RmVJkT2/9c9PUNx/LTysS t2eN7WaHMzR7P1qvUI1fqaeBJlnkKr2kg8RojbNu0BrjqE/s7o1fN87oIBwPdPY4Pqp4 txMZRMBtt7Tr8/ASbenkUoQmGezD/msieF8cxrTfMgd0cPKoFeO9ZPI8NAAze7NvFgB5 DepSUPXAggU8Q/pEjPPsDWv8FsXZ17pZffYmmrMIKO1dgquzPJW2QOHYilOifKIEuUqn UhDg== 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=HNkK6MXxhGak+TLH72cEnrsB75KXDu9iKRqhKd0nSf8hTiTiQeZvWk4oNZnyfran2n TNAZ4ZxbNnJXntwNZqSWlLVHFKiiszyyyRFR6dnDLsepRxJYbAHHEBFa2joFQKNetqM6 vcOegbdfyomwv3uNYdcDTy2pi3XHafJWQcBLgsA6x59lJdAcmc7dkETLbOeUyysjmUPp xBwb7Q5yqgzduWm1OYTSuZc4bxSEo3OzWyvM1HqFT+7vNtwzf9npHR5Gx5ZCOIivVA6n oQufv2NfbL6pveXg/KzWKxL8d6x/1N5do9uT9NTBtjqna2ZyQGG8kCgOFRl6GJ+OhX6T DqTA== 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 ay3si9195030edb.142.2021.07.04.19.32.56; Sun, 04 Jul 2021 19:32:56 -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 9270F68A6A3; Mon, 5 Jul 2021 05:31:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D40468A609 for ; Mon, 5 Jul 2021 05:31:52 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10035"; a="208869464" X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="208869464" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2021 19:31:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,325,1616482800"; d="scan'208";a="456571467" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 04 Jul 2021 19:31:41 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Jul 2021 10:29:31 +0800 Message-Id: <20210705022933.29068-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210705022933.29068-1-fei.w.wang@intel.com> References: <20210705022933.29068-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: 1lBtkha4L5yV 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,