From patchwork Mon Dec 11 01:35:26 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: 45051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652542pzf; Sun, 10 Dec 2023 17:48:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGLP1XHqBDyB6D0ewmtELIvfqxz14eFCdovf/7hdqJBc57orSS6k7ZvbVQC0rQglWs7eLOv X-Received: by 2002:a05:600c:2981:b0:40c:33f2:dc82 with SMTP id r1-20020a05600c298100b0040c33f2dc82mr1560886wmd.224.1702259292606; Sun, 10 Dec 2023 17:48:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259292; cv=none; d=google.com; s=arc-20160816; b=Mto31VMEGl15kptljLg0sOHTDP+w1FowfYkPE2fhRSSlilawukejeSK4byTgmtpU1C t74YMnJNnI/0Socmgp6l08c3ylHVVZk1DuUiJkGFmIdmN8bzllNxllQ5Fw+8TKzzySwi 04cnKFhq71mnTFuvXbPraJHN2oXU/fdtHjlQowA7obYRcN/9FM7oZoYR2QXzQL6fWj5i e1vT1NSlMl4Y6t4vbf+MQcy94uQ0ogklrwfi930AMKgygfuto6RN5EiyZ439OaTulmwk 4A1EpHyi4w8hOhVaaXB8oFKSlZ6TnWemmogkLTUpVhGP+BaONJcVmSQSd4oHpvgr7IPh Ybgw== 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=uie8DtWeIPcnnPc4oL2OJKx2uFBJxrfnOZVmbbr+Z9o=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=Ahr7eo0ibLbH7VZE+ePOtA7DlZdn3VlUk8DOQ3Zo4dwkc2OFX214qevaI66RKbM4My fbdEAZiYiPeiFm5KuMFHbo3sqrZ2KxmxE8Yc60/266tG0aBZpzZTjlWiobSHT44q9kiA uhQvLNbkkV42J+KIlzkkwdzjTGm24ZrFQLO+XqWlMayP29ro+Vjy8vOXCxuLEfnMfWL/ 2PxDD4McHFU05jxVvirGDBSlusdvv8ZJeA3Y99yxwc8JGeDcpMI6tRKcHIAxwrbH8xCV N0jDzHE0DAyfBGk481MU+5kLfIJ225ilasSWwarDlJFjl9vpX0aVkujybXv5BuXS1HYX Kuaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=M0QJE82a; 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 w19-20020a17090652d300b00a1c59ee9aa0si3106594ejn.15.2023.12.10.17.48.12; Sun, 10 Dec 2023 17:48:12 -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=M0QJE82a; 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 3A43A68D1FC; Mon, 11 Dec 2023 03:45:17 +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 A576668D14F 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=1702259078; 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=dDcoaRCWDeklRqV+I1Hxr/q4nzMqZMakc6C9p7etz4U=; b=M0QJE82aJ+9rP8XtrL3qOn157rzYuhkyZu1Fy0vZVZNKq0o/RK0ar0xHPmTotUgopURYwP Stu3A7f+Ch5rlC8gYMdNrGRO2LNazcpDm+oDxLQriq+GxCGHeyX8HfFAb4eSdzbs058/YB HKaRp4wzIy02kqBqMCMzveWGluIWlQc= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id fbc58f92; 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:26 +0100 Message-ID: <20231211014429.1841681-26-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 25/35] avcodec/proresenc_anatoliy: shuffle declarations around in encode_dcs() 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: ERP3XIG9bX5E This makes the function closer to the same function in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 4b72798689..56baeb9956 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -269,16 +269,15 @@ static av_always_inline int get_level(int val) static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int *qmat) { - int prev_dc, codebook; - int i, sign, new_sign; - int dc, delta, diff_sign, code; + int i; + int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; + int diff_sign; prev_dc = (blocks[0] - 0x4000) / qmat[0]; - codebook = MAKE_CODE(prev_dc); - encode_vlc_codeword(pb, FIRST_DC_CB, codebook); + encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); + sign = 0; blocks += 64; - codebook = 5; sign = 0; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { dc = (blocks[0] - 0x4000) / qmat[0]; delta = dc - prev_dc;