From patchwork Thu Jan 25 17:05:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 45834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp212077pzf; Thu, 25 Jan 2024 09:05:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+aPwzzf7LMVoSC2/DFG3R41imI+iH46wlkCo+UJ/WoFpQpmHyeir7rgcf6AkUT9zZC69B X-Received: by 2002:a17:906:a2d2:b0:a30:6107:cdea with SMTP id by18-20020a170906a2d200b00a306107cdeamr107321ejb.2.1706202358617; Thu, 25 Jan 2024 09:05:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z10-20020a17090655ca00b00a316f782fa0si862688ejp.750.2024.01.25.09.05.51; Thu, 25 Jan 2024 09:05:58 -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=@frankplowman.com header.s=zmail header.b=L5k+oUxg; arc=fail (body hash mismatch); 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 4A24368D093; Thu, 25 Jan 2024 19:05:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sender11-op-o12.zoho.eu (sender11-op-o12.zoho.eu [31.186.226.226]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A16468C25D for ; Thu, 25 Jan 2024 19:05:40 +0200 (EET) Delivered-To: post@frankplowman.com ARC-Seal: i=1; a=rsa-sha256; t=1706202337; cv=none; d=zohomail.eu; s=zohoarc; b=kgruaQO31mc9HICazAEH4AIPnbMDasOc+TtCQmKjYNTbFZALt69+96GckUovFgai672ogJjLqoYXmOD7PvW8a04Z6CEEWuVSFuhLBxgH62G3cXp5wOtzTuUaWDQ/KFFiA8qNsVNtbNnA6a6A5DA79jOGYvu5exLPb3eWRz6WyRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1706202337; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=4p5Cs9NonpqIJa6CVGpm6oDkvM015SLcEKxDGmYhoZc=; b=MX93KSRFdDt+KYM4XKPiz82ftRTPm3UtjRL+UUJaBg+gOTRPzy95V1BJWY2oK2tSzci1cecMWTT0NpBOlCq5FJBCkn8d/W0VFHRlkftQ13mU91GVHoAxBPBoSnXNkQHrNQpD6GMyfBvdo3nQ6oDtvS9p0OyrNd2bJgR6DvfcHnI= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1706202337; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=4p5Cs9NonpqIJa6CVGpm6oDkvM015SLcEKxDGmYhoZc=; b=L5k+oUxgyhkspB8lSGozWUFqK4D29DXNE/hn7s1E6eZ2j7w51u2n2N4a/4zVVHHf Vj6f64Re1bUAB4zGnUrY+7lMIEEeg2qM340yCfiHckEdh7VVrsjc4yHLhFX1GAqNjEG 2/EBA5zxpweV3kqeXMMAImqV4ANVPhObeQb64igw= Received: from localhost.localdomain (frankplowman.com [51.89.148.29]) by mx.zoho.eu with SMTPS id 1706202336318989.7160671694634; Thu, 25 Jan 2024 18:05:36 +0100 (CET) From: post@frankplowman.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 17:05:18 +0000 Message-ID: <20240125170518.61211-1-post@frankplowman.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Use av_log2 when destination is integer 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: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YpVZRXpNzp6n From: Frank Plowman Signed-off-by: Frank Plowman --- libavcodec/vvc/vvc_ctu.c | 4 ++-- libavcodec/vvc/vvc_ps.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/vvc_ctu.c index 307bc3490e..d166b16a19 100644 --- a/libavcodec/vvc/vvc_ctu.c +++ b/libavcodec/vvc/vvc_ctu.c @@ -257,8 +257,8 @@ static TransformBlock* add_tb(TransformUnit *tu, VVCLocalContext *lc, tb->y0 = y0; tb->tb_width = tb_width; tb->tb_height = tb_height; - tb->log2_tb_width = log2(tb_width); - tb->log2_tb_height = log2(tb_height); + tb->log2_tb_width = av_log2(tb_width); + tb->log2_tb_height = av_log2(tb_height); tb->max_scan_x = tb->max_scan_y = 0; tb->min_scan_x = tb->min_scan_y = 0; diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c index ac96ed9f43..c2afc0ac93 100644 --- a/libavcodec/vvc/vvc_ps.c +++ b/libavcodec/vvc/vvc_ps.c @@ -910,7 +910,7 @@ static void scaling_derive(VVCScalingList *sl, const H266RawAPS *aps) { for (int id = 0; id < SL_MAX_ID; id++) { const int matrix_size = derive_matrix_size(id); - const int log2_size = log2(matrix_size); + const int log2_size = av_log2(matrix_size); const int list_size = matrix_size * matrix_size; int coeff[SL_MAX_MATRIX_SIZE * SL_MAX_MATRIX_SIZE]; const uint8_t *pred;