From patchwork Thu Sep 19 18:01:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51653 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp520788vqb; Thu, 19 Sep 2024 11:59:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbCEk34bfiliUQ+cSS0nQEKfsFdIeSJ77RCgMGUB+gSzEW2Qh27YlqaT+tBV9q3DWfgEIscJPQntxXXDak4bdc@gmail.com X-Google-Smtp-Source: AGHT+IGd4QpeFJl2nlugoKm4fdTCxguQjfG0Ww2+YMZLY+7Bpts9knnJ/6N8W7Vrlok2V76Rn3OZ X-Received: by 2002:a2e:bc0d:0:b0:2f7:5805:7a66 with SMTP id 38308e7fff4ca-2f7cc356b15mr427011fa.8.1726772354629; Thu, 19 Sep 2024 11:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726772354; cv=none; d=google.com; s=arc-20240605; b=Gr1KWbZFGFTs27TKs7vh1iSLF5qUh8IQlcmxYIZeMJdOOO+Ql9TK0yR9MlF4oH2XDF 81cIHx0AdybdCFOzHQLdFDegqWL2DR9b9yiTNaZIByOzb4Anets/WSfx1s/siK65cLcc /5FSN7NkDOER61W7MZiCoSIM1lxmqA63O+vapEy3FmYYFIVKJPiIueezvgmziV2bPzzk XU6G4LImD7BaFuQUP3rbEF0dbMp+SjCKZ+7HBnuUdFPnW39twkStuNcLOIttYHsvCDrG ijlGxgCP021JrMFS6VCO4zDccGlCowb25zcHTatHRvQMdJY3JjSIWleE+ioLilUNoQsz ZPIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:dkim-signature :delivered-to; bh=p62X+t26VN6PMvJcjiIs35wk9c+78+CPfa2SHsUlzXw=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=SpUBsKhMp7kKGr6MNGKXiqocJLRqH9DIK1YEaxxmJTarIKk5thWF8g5hPDJcXACBdL /tiIxWu4oo1h6eRs7lf/++EO64ebrk/VwVd4vC2l82rxEB66pd1sQFwUMY6+C4ECksHA sNJQnFq2yMqe7uevuKSUYwm/LqJ9YRcDVrM5U3/qtbv431cwNNy1faYmvT1LzmKoMt0l UAfuM0daPMFHCB2HiLXNEDR1Z5RnC574doXpEKp1dJ61NCTsdcm63lgVkjmje/CqEi6z r74XYDUgaxuQVDWY8QvL99Hc4J9mEERs1m6ibb1+aDGqeHX9az1lEMGqnJt9sdIwoPld SqcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=T+teHMKb; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@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 38308e7fff4ca-2f79d35daeasi34844571fa.218.2024.09.19.11.59.14; Thu, 19 Sep 2024 11:59:14 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=T+teHMKb; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 378A868DA47; Thu, 19 Sep 2024 21:03:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 315D568DA10 for ; Thu, 19 Sep 2024 21:03:38 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cae4eb026so10707145e9.0 for ; Thu, 19 Sep 2024 11:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726769017; x=1727373817; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=QeoweTgheE4Vb4S1vRqRnq4aAIp/I5ub+ghUPWeT77w=; b=T+teHMKbiEJaMYsH91GQO+MpoX8zhFbwn3zfhLMLeQd/bVofNW00NwZhUMHEanmoiM T7Hr7pWwBsUdZ2PVkCC8XmzjPy4ONZ0S0ZXvTStU9G482lTxkj9MesLT0qk9t7JflztU rYyiLUKcx7fReTiBpxI6wlmrC6mNlEvBEQplYboJ8yIO3eKqmToGaFqtvFLupF+iMzHi psq6vEGuokIpASj519n+Da4tpF/wqG5rMjUmBMZuS5mhE1AhZleJWPebKBfli2ACMY+P xplLAHz83XLt7fNuksXwyMusf1s6hXm1cq/HzFXkcVmd8p1wVlbcAMLkN0V018Cy6pwB mhZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726769017; x=1727373817; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QeoweTgheE4Vb4S1vRqRnq4aAIp/I5ub+ghUPWeT77w=; b=hKhNlWPujZQYyCl8BclORvkQ7sBklf27CqsGbaBm4cPo5+LCad2Zp2hd2tn/7liGg9 bYmVml0O7ZTA+Dc/xgzPNH07plmuSVDTOXTifXxJc3G1EBJN5h/L2N1k5MTinaxnUxew HWMRSezXJxhmwPj8qlAnyQ35LGZ6WnYolUacp2MtkysH5uTW92ah3uARUbQgvFT8cm/N Lr9erhy37LugINWj3Feg8sZlCHVNhZYI4MIVFBnrjo3eCEQGOj+96DgFUeKpCl4DXKTq WYGxs5Q1ZXLcCiJFB3bI/O8r0q7fF/S1eHUcpfTr1GECFx78o5Zj5+6PKtVQA5Rh1slf lNWA== X-Gm-Message-State: AOJu0YwvzFw4Z0014PY6ya/7MRXke4Zxze3LWo1miWy1NMF2i3IYULzz yNt8UKMVGP9ZqlBE6/yajx6jXp6qo4GB0ZbsUnQtKMnx0VZSHTnRec1shw== X-Received: by 2002:a05:600c:4e44:b0:42c:b4f2:7c30 with SMTP id 5b1f17b1804b1-42e7ac61b11mr1913585e9.23.1726769015756; Thu, 19 Sep 2024 11:03:35 -0700 (PDT) Received: from localhost (p200300cccf026100499a02dfdfb9f5bd.dip0.t-ipconnect.de. [2003:cc:cf02:6100:499a:2df:dfb9:f5bd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e7800138sm15654745f8f.68.2024.09.19.11.03.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Sep 2024 11:03:35 -0700 (PDT) Message-Id: To: From: "Marvin Scholz" Date: Thu, 19 Sep 2024 20:01:05 +0200 Subject: [FFmpeg-devel] [PATCH] avcodec/vaapi_encode_h265: fix missing slice_block_cols assignment 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7Ua9qYLJh0C7 Instead of assigning to unit_opts.slice_block_cols, the slice_block_cols value from the context was incorrectly assigned to slice_block_rows. Regression from 12f158ca8f2ecc172f27569af88426d0e39ce995 Fixes CID1619479 Unused value --- libavcodec/vaapi_encode_h265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: dc11c12b6466795f5f9eb057b1aebd76bf129785 diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index f4a9003c823..2283bcc0b4d 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -273,11 +273,11 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) priv->unit_opts.cu_qp_delta_enabled_flag = (ctx->va_rc_mode != VA_RC_CQP); priv->unit_opts.tile_rows = ctx->tile_rows; priv->unit_opts.tile_cols = ctx->tile_cols; priv->unit_opts.nb_slices = ctx->nb_slices; priv->unit_opts.slice_block_rows = ctx->slice_block_rows; - priv->unit_opts.slice_block_rows = ctx->slice_block_cols; + priv->unit_opts.slice_block_cols = ctx->slice_block_cols; memcpy(priv->unit_opts.col_width, ctx->col_width, ctx->tile_rows*sizeof(*priv->unit_opts.col_width)); memcpy(priv->unit_opts.row_height, ctx->row_height, ctx->tile_cols*sizeof(*priv->unit_opts.row_height));