From patchwork Mon Dec 11 01:35:28 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: 45053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652626pzf; Sun, 10 Dec 2023 17:48:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8jFxKTao+ypzZXSSWIYelHu6ENluLKiyVHuSOkyyW2B7ItAZGh+JBU2WTfd5gfXqaLqx/ X-Received: by 2002:a19:3854:0:b0:50b:f147:fb00 with SMTP id d20-20020a193854000000b0050bf147fb00mr1255327lfj.119.1702259309280; Sun, 10 Dec 2023 17:48:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259309; cv=none; d=google.com; s=arc-20160816; b=WQGJnynQiKqI1KO99qyOdQFG0rAhdvgSOKmj6kKcdFaBnMcA89X/zeV4Clz4ct4jdA d3WCw49nHXzhm/7p5N6gO+4PPRus6iWX/UmNVq8BqvQRM8RmI3Dcbt+ryud3hhmCCRaa bt+McycBZO3fkhZvhThy/GdpcZiKZQIWTLWUqRnY5J/2tK6pUv86rvLHCODH8xFrNVPD rWnnspf4SwOzfAsXHtsVNv6wSzbHCzAJakzpTTJ++ZMlYoBLCxOARQtnpCXkxjbLLdh9 UUAFcvQ/+Hjvux68AYa2t1eRht2M++qcw/APp10MhZzrsdo98UTcVLDAC6gyKLeaIN+M hGjw== 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=DvhZ0ytxW2jTPjV/16HmKDeKipYu+1iDVzs70/1F9HQ=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=CoBzySCMSIgRyWSPJb8CoT/6yQJGOMOUaGip0zp2kxEHJADQY3VcF0ydNw4LYm1Nwc QhoIVutXawefzzbRwFPc1uihj2fpqGdEfJ6T/kwnyeJ2Oq0o5FMQyf0YwTZBDnPeGEXD QxOk0QDuc7aPD2GEcFWc7w3DUSivf1/PvzJphgr/kTomGDAnepkQtigT6+AJ+QvflHKo eDNfhYrmGf0iBqqhnzyDEix1IOayDpOO57rdFMOW+3grMzR+lZI3fpW4rAVTfILRhF9r oR2NbBtBJri35KgMV2gL8YZVpZG8UZRCxmX9RLPrz5Bh/its6rAUXD9UigWA1eOxFURr 3amA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=q9S5Kd0Q; 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 t15-20020a508d4f000000b0054f4990aab5si3011148edt.496.2023.12.10.17.48.28; Sun, 10 Dec 2023 17:48:29 -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=q9S5Kd0Q; 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 54AF068D208; Mon, 11 Dec 2023 03:45:19 +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 CDD9F68D17A 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=36dxkXluW4Rcva3LOPfrQHOMEJ5+0u6UbWDsxOFzBnY=; b=q9S5Kd0Q0CFwopfM1r+Tl4s9rGNZV9RHTw9EINElBy/DCjbegilBvJBy73FLacsnDxzyJg 4Z0Ck1gkylicbT7+EmtF1aEz/a39Hxhd/otIuiiv9vMMfWEwqEZQlsQBUZaGOlkURjoo8N oYigo/M/6CpsQMJtAmhc30IpeY5yZX0= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id cf9e9101; Mon, 11 Dec 2023 01:44:38 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:28 +0100 Message-ID: <20231211014429.1841681-28-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 27/35] avcodec/proresenc_anatoliy: remove TO_GOLOMB2() 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: PjIRMVmb+d6B A few cosmetics aside, this makes the function identical to the one with the same name in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index bdf7bface4..aed5c68b1b 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -257,7 +257,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)) -#define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign)) static av_always_inline int get_level(int val) { @@ -271,7 +270,6 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, { int i; int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; - int diff_sign; prev_dc = (blocks[0] - 0x4000) / scale; encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); @@ -282,8 +280,8 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, dc = (blocks[0] - 0x4000) / scale; delta = dc - prev_dc; new_sign = GET_SIGN(delta); - diff_sign = new_sign ^ sign; - code = TO_GOLOMB2(get_level(delta), diff_sign); + delta = (delta ^ sign) - sign; + code = MAKE_CODE(delta); encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code);