From patchwork Mon Dec 11 01:35:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 45055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652688pzf; Sun, 10 Dec 2023 17:48:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHv5cvmObR9qYYafFJEShs+9E3wESyYeBbFxWBNRa5HuRCaYiiIs0UF8amy4VZLglw26PMu X-Received: by 2002:a17:907:9486:b0:a1d:c376:216b with SMTP id dm6-20020a170907948600b00a1dc376216bmr4436007ejc.45.1702259325954; Sun, 10 Dec 2023 17:48:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259325; cv=none; d=google.com; s=arc-20160816; b=aWEvuWPkb1Hk1habnmhEeili72NtQaBfCSOfC5MOyV2+qQogGIl+yYuXkHxhs2/Ppy N3YuIIDPVHOPuBJd/hVOIAvFSBWNS459pG+UF6xDY5pqhHpDk5otjeGFMrE+byhgKm9v hcfNPUzVtV1dEoJkMo+EllORgr0kjwRZrBmC7jtMJQF4IgGbG/PhRPmNGknkj346PqtY XGVNzCfaWpZF/0W1faeLQqiy81jHMDHKvQRkerdtfXEBeAipIQqcIEo0wveIpHi+uFRP GkxAEmE3ZsGXtyxDlyQAmrz3EekMoxq6H8wIgnLfosNcKorFUvKrVTWS3YItWZDmdJR1 Tefg== 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=NQF2TP+UQxoCG/QmC781+pUiRXMRXus0TP3T0Kv2bmM=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=yAIn865WaOBQH2VZz9XF0PsFKa6VU7UxIMP6vaSr4FBiyRyZC1yVrGWbMjOdx55Q1N DhOtCzyDBAuOdS+aj7Ncn/c3LIUFcKBvqvxdgSNidIYiOnlWdyCdedK2SEyf9SV6htay pfgVt/lCl55mkGwrotjPS+b808OIsHF6Q0pO1cfGorymLUOKEKHovaEWknIP+H/uNc9b x1qa9X3HJCsl3dhTqjt+T0SCtcq2z87KGTuPB4LR0ubMN4kjtoABeBNS/E3UALzZ0I0h fHKSY9bcgIRdCgpLgnWjBHk/6GkAr7xxXmjaBtf/NugkXjEJPR0RWw4j8AKNHGNf/y/k ElHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=U8q0TUao; 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=NONE dis=NONE) header.from=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt20-20020a170906f21400b00a1db9a99ae9si3209719ejb.854.2023.12.10.17.48.45; Sun, 10 Dec 2023 17:48:45 -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=@pkh.me header.s=selector1 header.b=U8q0TUao; 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=NONE dis=NONE) header.from=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 412F368D214; Mon, 11 Dec 2023 03:45:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 D689768D17E 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=TGHCzCQ94hicvOziMSjO14joTgfRM5H8/NtMlOi6ayw=; b=U8q0TUaoV7u+5FoGK3mTlZQEIB9pGWZZ+mTJge4YprpmTARTgejYd32ke+LQaqhgVyMxDd XvpBW7lu2BER5BxEFVMAUAP+dUcUo8DsCxF/wvo1Cp4g0j6RHqDHwbFA2um/Vh6SxniKzf bLjKOz4uWaX/M60xfjslNv2mvrZkHZU= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id f6f82f3c; Mon, 11 Dec 2023 01:44:39 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:30 +0100 Message-ID: <20231211014429.1841681-30-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 29/35] avcodec/proresenc_anatoliy: replace get_level() with FFABS() 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?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: llL43E+hNkQ+ This matches the code from proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 0318379461..88c6d47ab7 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -258,13 +258,6 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) #define GET_SIGN(x) ((x) >> 31) #define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x)) -static av_always_inline int get_level(int val) -{ - int sign = (val >> 31); - return (val ^ sign) - sign; -} - - static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) { @@ -305,7 +298,7 @@ static void encode_ac_coeffs(PutBitContext *pb, prev_run = run; run = 0; - level = get_level(val); + level = FFABS(val); code = level - 1; encode_vlc_codeword(pb, ff_prores_lev_to_cb[FFMIN(prev_level, 9)], code);