From patchwork Tue Mar 5 08:02:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 46806 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp249163pzc; Tue, 5 Mar 2024 00:06:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUb2WzJzu4u8VNdsa4ac1X5GFSjY6/cYTKTgXwbkeb8Dlgb06w87ew1FwrOtQoPIcUQDfWXrqCW3OoHvFawCVlyotBgC8RjsqCF+w== X-Google-Smtp-Source: AGHT+IGgjo5bNxOPWQJs7Mh/fuzAkVyQDvKWIzxw/5GqZegoWuKkvaGktE6cIvFD7anlW/XekaEr X-Received: by 2002:a17:906:a3cd:b0:a45:1f03:4f23 with SMTP id ca13-20020a170906a3cd00b00a451f034f23mr4061133ejb.52.1709625965677; Tue, 05 Mar 2024 00:06:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709625965; cv=none; d=google.com; s=arc-20160816; b=BFGrRZsNYUtcTRuRwvmJpoka0HbZHlj3Gc57GbjpBoX4QsqVNE3YHgPvS3DDiR7woF UhP2sOfLjmvr0mUR/PynonEJHFDru+eBzE6fOxtHYBFSanHJjvWhK1zkJUikyn66c0MC 6slI9/WfWQ77cHCuDfrTzDNZq3Dk5HHFWvzCPXQZ6TpHm5h/dHszddU2X/EkrwDgtsdi TX6+ZHQyGMI3i+pX4ruLhQp1ePWvZbzo515VT6glDH+btjMgjOPKrS/xmqjhzQYpnSQ0 ZMy/a8fHqeuPy+06O1516Kxg5u+sezvJHYt1AbKwfpPpJ2dyl+T8hEwMpca4qHZaeEV8 Iw4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=PHCNoqngv6otIZ33hprjn8kSYzIggu29nT3DA/heSIY=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=rtGsP0+lOA0n0Yw8RDgJMOh1Na8ZM5firUmHaoUhxvkzGEGOUGmE4hZf5+aF2QsbDi aj1wAoTvsOr/RKjLyp5MCZZ2hIaM/ts7IM8Szilgp7puKZ/4Hhx03uN+4Gtsp/R0yTAH ghosGdbNSlH1WYbXqTqaV98qX4nUIi1Ix2aCZo/aNlmwbVrLYEKDk67zGpcqmmGzSTwY RNKooLg2DLGuWqPT25xh67oYtVSg0eIPOiTCAAQCXM8KVOtrdCXDj1dUF1WV6xmiza9r nLiD+sHMZUs8V1U6SjWReujz6w9Al33Od2IC6CLdt8VtxdgxyL0RdzYTMLSONx1P3fiT xQxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=YyQb82L+; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw22-20020a170906fcb600b00a443db43857si4707973ejb.836.2024.03.05.00.06.04; Tue, 05 Mar 2024 00:06:05 -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=@intel.com header.s=Intel header.b=YyQb82L+; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DBBB68C80D; Tue, 5 Mar 2024 10:06:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D91668C80D for ; Tue, 5 Mar 2024 10:05:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709625960; x=1741161960; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mkw4fZpHl2JOBNbAmpzj9SyvYpvi6OQaW8paIOdFyWQ=; b=YyQb82L+rH23e3vr1Ni5FV/JTmbVdR468D1Tdezp3Mtuvdaydq5BN8pl 5UoGSs6okIYBQj0/p2kzalhn+LXvr3hgj0ebGaFyCgAamXMd3v9NWVxa+ 6fOVasFaOv+ww4fNVi9Lx8WoZxjbP7lvMoKiwABEOUuSg0/lTV4JwoS/x yCZGZ06K+Mmn3rBnrxsO3OzOFBPOmv7ogO2umSME9H13BLg2F7LL2xE9r SyLBgxafNzI3DfD81YtyB+Ty00SN9M4KjkshfUbo+q3hyF9mCCfboC8db qy1RgHcLQkKJBlZpG+nNh+09VQOMRf5+fUb1qfA+sluOoFoaDI+Ios71G Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11003"; a="4282401" X-IronPort-AV: E=Sophos;i="6.06,205,1705392000"; d="scan'208";a="4282401" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2024 00:05:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,205,1705392000"; d="scan'208";a="9704375" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 05 Mar 2024 00:03:39 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 16:02:37 +0800 Message-ID: <20240305080238.965-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] avcodec/vaapi_encode_h264: use is_reference to fill reference_pic_flag 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iuZkcR67YDVq From: Tong Wu This codec supports FLAG_B_PICTURE_REFERENCES. We need to correctly fill the reference_pic_flag with is_reference variable instead of 0 for B frames. Signed-off-by: Tong Wu --- libavcodec/vaapi_encode_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 37df9103ae..4a738215c1 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -759,7 +759,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, vpic->frame_num = hpic->frame_num; vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR); - vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B); + vpic->pic_fields.bits.reference_pic_flag = pic->is_reference; return 0; } From patchwork Tue Mar 5 08:02:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 46807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp249235pzc; Tue, 5 Mar 2024 00:06:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUUD3xrq/5PpWIp2yjUqxA5Q7esW5v7MHr6eYwvw6ApMECylSWNl3H1IPyMUHNP0gYB48Z936U6BQmnOgDC1CaTqEllYOmMe8Jjdg== X-Google-Smtp-Source: AGHT+IG8uoD8mlOwkZvTQ1At9LRDaqHm/ugpgyUb6VOtJCF05dYlim66u6Wax5PGzIdtj51GnTa+ X-Received: by 2002:a05:6402:2267:b0:564:5764:a5d8 with SMTP id du7-20020a056402226700b005645764a5d8mr7867283edb.25.1709625974768; Tue, 05 Mar 2024 00:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709625974; cv=none; d=google.com; s=arc-20160816; b=YPrL7iC1zOR9XiPE5/JdvzmFgPduogkYuamFC7vIW23XT6hqNop+RjnT+AOh7fXpur IJih/TBbopzizAW90j5xZKRNL/ku5VjrLe+UZxozWCrqQHGCw+ueymrYNV6zjT5YM1xA 65HcrBt5fA5EoWCX67G6cVAyyLl8P1oR2Mt3OILdN4zwvGrvAzxMcux7iJjs730JFxgE Y0dRHRYHqEO1kCgdT29PEHVtM3uf8WjC4sHeMSn82AoD7Lcp+19MsG20RxGaFH8OWeCS MrXTgC9N2qwSjl4vD89LaQxNegTqCABLP0NUqzQVSiQlhMgFqT1QFObkzxpHunRCdgFY iNNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=U2yZ/g77G7swNLaZ81wIw3xlN2QzGOzoudzKoy+qLNw=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=b+eT9GpHS8Qt+orC4ueGf1l2dN7e3CSxCZ450AFip91OlsZ7N+bcmwx7eruBz+XCU+ /v2dacX82Wvy9fUEjaHlxEG/N249Wk0mWPp0X+NUeOTCKKLh//uNFJDUJtKlTvPrSmzR AeypOgYA7XQZie1w9v7A5djk1WUAFZTJvecvPS4/BYc9fgY+ZizshmUkl17jaPkjtl7h h0yGZkYGbLD0pNmSrzExbGMr+bIyMcFZVujLow4EJehR9NO+hlIqVXEN7re+Zy1gKapU JxBGQcM4uTDSYU5E4mkL1qpffPFzXb5X6xOm44qKFsCV+F0kR5fzEd0d1zAx4OIbbnSw oxUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=i6UolMx5; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b3-20020aa7c6c3000000b0056734268707si2217256eds.432.2024.03.05.00.06.14; Tue, 05 Mar 2024 00:06:14 -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=@intel.com header.s=Intel header.b=i6UolMx5; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49C5968CE03; Tue, 5 Mar 2024 10:06:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37C1568CDE2 for ; Tue, 5 Mar 2024 10:06:01 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709625966; x=1741161966; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D5+0PiPkUFUWsoSfhzx1OweriaobSB7HrfJStTWGRjs=; b=i6UolMx58dW0aIwhR/mGneQStnNqbzn9jkM7lLOKeNU+4C5p5zCmmnon HCOeOxGuL5eyIw2C/VHI0aDchndETd926faHy0wivR0+xUo1kdsIqK11W ixJVZtZ/DcxDJtS4dLv5JXLF3VfPgfoByQsyfHfXTh4MqknfywXe2S4hB QDi5+a5rNgJMq4bJ2YfhGJFawqblFmdIbtKKRECgUdi+mPKlWeCgW5duO 61fTe4kkmIc3Qmg4OTBjL6EYbQrIzV1Do9qarzxHMjrhhJmPTpmPpE0Vx UThXZ+xDG1smi3X7y+wRaTrapYCL4l+pDVg7CC/UA0u3I9huovEmuDYGh w==; X-IronPort-AV: E=McAfee;i="6600,9927,11003"; a="4282402" X-IronPort-AV: E=Sophos;i="6.06,205,1705392000"; d="scan'208";a="4282402" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2024 00:05:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,205,1705392000"; d="scan'208";a="9704379" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 05 Mar 2024 00:03:41 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 16:02:38 +0800 Message-ID: <20240305080238.965-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240305080238.965-1-tong1.wu@intel.com> References: <20240305080238.965-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] avcodec/vaapi_encode_h265: use is_reference to fill reference_pic_flag 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Q41aI2Gbru4/ From: Tong Wu This codec supports FLAG_B_PICTURE_REFERENCES. We need to fill reference_pic_flag with pic->is_reference. Signed-off-by: Tong Wu --- libavcodec/vaapi_encode_h265.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index c4aabbf5ed..beaeea52cd 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -945,26 +945,23 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, vpic->nal_unit_type = hpic->slice_nal_unit; + vpic->pic_fields.bits.reference_pic_flag = pic->is_reference; switch (pic->type) { case PICTURE_TYPE_IDR: vpic->pic_fields.bits.idr_pic_flag = 1; vpic->pic_fields.bits.coding_type = 1; - vpic->pic_fields.bits.reference_pic_flag = 1; break; case PICTURE_TYPE_I: vpic->pic_fields.bits.idr_pic_flag = 0; vpic->pic_fields.bits.coding_type = 1; - vpic->pic_fields.bits.reference_pic_flag = 1; break; case PICTURE_TYPE_P: vpic->pic_fields.bits.idr_pic_flag = 0; vpic->pic_fields.bits.coding_type = 2; - vpic->pic_fields.bits.reference_pic_flag = 1; break; case PICTURE_TYPE_B: vpic->pic_fields.bits.idr_pic_flag = 0; vpic->pic_fields.bits.coding_type = 3; - vpic->pic_fields.bits.reference_pic_flag = 0; break; default: av_assert0(0 && "invalid picture type");