From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C693D474AA for ; Mon, 11 Dec 2023 01:48:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3AEE68D219; Mon, 11 Dec 2023 03:45:21 +0200 (EET) Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A24168D14E for ; Mon, 11 Dec 2023 03:44:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tsUxKn8UsVlQCfz05zzGQBi5vhbKNBJWorRjhNTUG/k=; b=FK6N6DFs2DG/yYNbUH5C8HlDqQGoZHZ5MiNo10eYmUcQ2XixyoGecjkChW2L9dB5IDgc3j 7wgdCCeYwPm4u21oKYRSMkHqDttw9QYHNJrCAdyUHdZORRgehQuQdMdhI49V4Tb5Yk3B3R 8u75T5J8HsFRfk8DORRejlpm2tu4hZY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 60fdc30f; Mon, 11 Dec 2023 01:44:39 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:31 +0100 Message-ID: <20231211014429.1841681-31-u@pkh.me> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231211014429.1841681-1-u@pkh.me> References: <20231211014429.1841681-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/35] avcodec/proresenc_anatoliy: rework encode_ac_coeffs() prototype 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: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This makes the prototype closer to the function of the same name in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 88c6d47ab7..57324a3b27 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -282,8 +282,9 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, } } -static void encode_ac_coeffs(PutBitContext *pb, - int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64]) +static void encode_acs(PutBitContext *pb, int16_t *blocks, + int blocks_per_slice, + int *qmat, const uint8_t ff_prores_scan[64]) { int prev_run = 4; int prev_level = 2; @@ -292,7 +293,7 @@ static void encode_ac_coeffs(PutBitContext *pb, for (i = 1; i < 64; i++) { int indp = ff_prores_scan[i]; for (j = 0; j < blocks_per_slice; j++) { - int val = (in[(j << 6) + indp]) / qmat[indp]; + int val = (blocks[(j << 6) + indp]) / qmat[indp]; if (val) { encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run); @@ -378,7 +379,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig init_put_bits(&pb, buf, buf_size); encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]); - encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); + encode_acs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); flush_put_bits(&pb); return put_bits_ptr(&pb) - pb.buf; -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".