From patchwork Thu Jun 17 06:10:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 28561 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp330171iol; Wed, 16 Jun 2021 23:13:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeOMs4BcSCBfeOyPP/a0TyI0ulF1PtQdJhbfnft0L5IUR/6P+9uw7HorJY3mmLoOjY17/8 X-Received: by 2002:a17:906:7d3:: with SMTP id m19mr3426401ejc.546.1623910381931; Wed, 16 Jun 2021 23:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623910381; cv=none; d=google.com; s=arc-20160816; b=FWFJl+QpMGng7Qg4zj20vlmgktGl55DaFtcnPiOlvang17/Q9B9ZdBaGhVGYLljBZ4 Ju5YHz1UCvRAyYc9X4smDsDAZc//NJzHmNUtgKRKrYzm2kYT/hJzE/1pDgEOZp8vFLhr d0lA9muZe+sBoCeVPQ/3ksfVtdVANn5m11x7dmH16w2CL/yepOWxCv2Jmv9leZf1Ehb9 1Ri6QTUfpbniD81M/oVs3DtIJMQRlmmDSXjUPXUdwDnKI5JpijU18hFAb8m7Cdzpg/j5 YbfoQmX5mJyBzmr/Y87wzdt1rInFsHOMUDXMyE7/FBs3vvHiUKrq9hPI2POp6XX5gavT 6qfw== 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:ironport-sdr:ironport-sdr:delivered-to; bh=/gOZcqdnHPr6pRClQYZNb+oJzRVEW5jAeyl3cgjmKaM=; b=KOr5lVBgqc0/KD+EW0WgzI7zRdp+BndQeUp1TQH6K4aAsSyf7BQkn4WCaTGPnXf6to P6nz3U2hEkyjlIoGan3aqIhpae3kR089tGN01us3lLeHolu82lzrTMisDnLC/khEHnXy D78h/yY6x1ORILWKN9dVbDDm7JiIntG7y+R45kKI59NvNqWYhx8ShW4ywYew0oMZN1FE pkHw5uAnLz+MDE/8ktgpVMUYTCPyE4v5ioiuU3H0ZpHOCXQj3qFM4s7JIOpSrHtpq0o/ tokE2neyhgUHv43VEP3nLnp5q8LadxTc2KAqNpBZmgI3ECgKykiTTB8HyUEN36vtV6fd +b5w== 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 c13si4620989ejm.484.2021.06.16.23.13.01; Wed, 16 Jun 2021 23:13:01 -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 0685D689721; Thu, 17 Jun 2021 09:12:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E775D688081 for ; Thu, 17 Jun 2021 09:12:21 +0300 (EEST) IronPort-SDR: IdWgG4PZSMpiyAxUTV103pBAgKTBCiqBWYIbaXyFlWMt/Bt6m3jpCH9YpqFlBYJHJNeipshBCb O9QssCRnRczA== X-IronPort-AV: E=McAfee;i="6200,9189,10017"; a="291942567" X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="291942567" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2021 23:12:13 -0700 IronPort-SDR: kWDxJIxhEqq5TcH+MzJm1nooFXbqinME5HJxa61BN6ODhd+G4t1R0YapeTVj4fMJceOkTlWUvi rU3XCRanEVPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="485177038" Received: from f.sh.intel.com ([10.239.159.147]) by orsmga001.jf.intel.com with ESMTP; 16 Jun 2021 23:12:12 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 14:10:35 +0800 Message-Id: <20210617061037.20335-7-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210617061037.20335-1-fei.w.wang@intel.com> References: <20210617061037.20335-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH 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: jEXY1SXsaM29 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,