From patchwork Mon Dec 11 01:35:16 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: 45041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652134pzf; Sun, 10 Dec 2023 17:46:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJs7S5Az9B2i2ye714komt4PkpGkgwCmsxEmUsDI8YU4XI0Aqi2Mjxy+13h719bNCJGhoB X-Received: by 2002:adf:f081:0:b0:333:2fd2:2ef1 with SMTP id n1-20020adff081000000b003332fd22ef1mr1444859wro.106.1702259211576; Sun, 10 Dec 2023 17:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259211; cv=none; d=google.com; s=arc-20160816; b=EEcqEF+Ide+rYEpZLpmhvLuBjTQVHJ7iLqEXp5nqoXgYUhVnIAiFpESy9R4SGFmT5P v7d7kld0Yp/h7YPmf6zYW1H1dqLdkca3O6n0IG+wpsJksR5V1V8uvvfp4QmROEMv2W2C gjmK+VzQChMlLFU/UTE78pduAl4KwQbnXgwWCmFjbNj1JKIyGGK7B80Q5eM8DPob8+4W Fpxb5cmoIr9DhSbXvtng7eBqXBBARTpdY4xFnkfSFtmohFrqH6e2DkrrdPACOyt+SMSU J5hwTL3lGa95qsPO3nYyJ33A3jkxop28KtA2EKKnPSLZv8r3ZI88yW2lYPjzV3jMo27A E28A== 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=c2Eiqrlq86/qLttNR5alXhpz5zLPGxZlVC4xZNdoFEo=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=Ak32YUkswVPMsl5ZWugLNx3U04I0zLaxSkb785LnEXE0T8/7IPQmum6riDLGxHnMxZ QRM5D0mYMidEpZ4IWG2uFk1vGIppsjVF5EG/E/vY/B0UBBmTtE0p8UoxVjB6zKAlNO9N zvqTaBSHUamtNxVd3kqL4yWNe3uI9waC9MgJ74W6wIq/1zAp0uiElpLw206PMWn8Y1pe kRi3q42sInJ1BJirl6eF4qS22ziMmisShVWFLU+RealMxh+ViQjMFhubfa/yEqbUvgMa /1LEFgHxEfVYUhrFVuCqvB2/U5+EVVqJHEczjfAFFqeEyl1B+ohQb4xdPF5hDzIvOPOO BRrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=bYlSxbKS; 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 u14-20020a170906408e00b00a1dcc169cf2si3304956ejj.936.2023.12.10.17.46.51; Sun, 10 Dec 2023 17:46:51 -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=bYlSxbKS; 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 C80A868D15D; Mon, 11 Dec 2023 03:45:05 +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 1748168D163 for ; Mon, 11 Dec 2023 03:44:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259077; 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=xUFQs0sDxUYG+Lf9DAG1vN1TvoAn0XWts1D5o/o8TrQ=; b=bYlSxbKSI6DtAc0umIuxlYl55ixy5Fc2+F0gx9NsGhzUS4mRjCmos1GA2Tg0AcskAJuR3g Gcg+JR3uAaAloJbpGMSkAGCDS96KzN8boxVDS/5yw9WtToE0ZHIOI4yBaHMHzI0v251JTT HA4aUBX1cI4Ci3D0vUvFJZqrArZW5gU= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 82fdc75d; Mon, 11 Dec 2023 01:44:37 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:16 +0100 Message-ID: <20231211014429.1841681-16-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 15/35] avcodec/proresenc_anatoliy: rename new_code/code to code/codebook 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: rbDV78YMrWj+ This makes the function closer to encode_dcs() in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index b8433ee872..e79c465590 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -270,24 +270,24 @@ static av_always_inline int get_level(int val) static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, int blocks_per_slice, int *qmat) { - int prev_dc, code; + int prev_dc, codebook; int i, sign, idx; - int new_dc, delta, diff_sign, new_code; + int new_dc, delta, diff_sign, code; prev_dc = (in[0] - 0x4000) / qmat[0]; - code = TO_GOLOMB(prev_dc); - encode_vlc_codeword(pb, FIRST_DC_CB, code); + codebook = TO_GOLOMB(prev_dc); + encode_vlc_codeword(pb, FIRST_DC_CB, codebook); - code = 5; sign = 0; idx = 64; + codebook = 5; sign = 0; idx = 64; for (i = 1; i < blocks_per_slice; i++, idx += 64) { new_dc = (in[idx] - 0x4000) / qmat[0]; delta = new_dc - prev_dc; diff_sign = DIFF_SIGN(delta, sign); - new_code = TO_GOLOMB2(get_level(delta), diff_sign); + code = TO_GOLOMB2(get_level(delta), diff_sign); - encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(code, 6)], new_code); + encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(codebook, 6)], code); - code = new_code; + codebook = code; sign = delta >> 31; prev_dc = new_dc; }