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 84CBC480E9 for ; Mon, 11 Dec 2023 01:49:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3548B68D235; Mon, 11 Dec 2023 03:45:26 +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 3F9EB68D18F for ; Mon, 11 Dec 2023 03:44:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259080; 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=1jTfF85Km8Pgd0u3aLVEI5qNtKylDTEZd7O82Wmx0GI=; b=S9oFNxkn6T3IcrbZiQbPUj+TbYYd/h72yTA7niXaNE9facfzgaqqHnjDpsBcVzgRV16SAm P8Y3YPJ8VXTOVk98ToHtWiQEDPfI6D1CQ1p9Usgco2INpCIwDvPWboKqgBZn3MCa85vQCX o3QbWydOoh225akxz9fNzRiScV3ystE= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 0031ca03; Mon, 11 Dec 2023 01:44:40 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:34 +0100 Message-ID: <20231211014429.1841681-34-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 33/35] avcodec/proresenc_anatoliy: execute AC run/level FFMIN() at 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 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 matches the logic from the function of the same name in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 161a05a6e6..2515ee38f8 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -298,18 +298,18 @@ static void encode_acs(PutBitContext *pb, int16_t *blocks, for (idx = scan[i]; idx < max_coeffs; idx += 64) { int val = blocks[idx] / qmat[scan[i]]; if (val) { - encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run); + encode_vlc_codeword(pb, ff_prores_run_to_cb[prev_run], run); - prev_run = run; - run = 0; level = FFABS(val); code = level - 1; - encode_vlc_codeword(pb, ff_prores_lev_to_cb[FFMIN(prev_level, 9)], code); - - prev_level = level; + encode_vlc_codeword(pb, ff_prores_lev_to_cb[prev_level], code); put_sbits(pb, 1, GET_SIGN(val)); + + prev_run = FFMIN(run, 15); + prev_level = FFMIN(level, 9); + run = 0; } else { ++run; } -- 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".