From patchwork Mon Dec 11 01:35:18 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: 45043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652215pzf; Sun, 10 Dec 2023 17:47:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEskZJ1yjJwn6MQx0DWpVrlX52hBTlI0II2lKbDAg7Ukzcek8fconFnWrCm7CtzSOCJjJCq X-Received: by 2002:aa7:ccca:0:b0:54c:c733:2946 with SMTP id y10-20020aa7ccca000000b0054cc7332946mr1965747edt.81.1702259227999; Sun, 10 Dec 2023 17:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259227; cv=none; d=google.com; s=arc-20160816; b=wmVOqmgSldwx3LK6bSzRndrtc7j69mplrhgKtG71ZLkwFa0WIvWvSf14900S5+Gy15 kWvZUuhnvXd1RZt00fMXxaooWlmJljXEkPdXpaaycREf2eT0Rj6/bVNzN5LRJCnp0WRg omtczzcxkiJXwn9UxANx2Ebr63OLwVfENpQgk+apU7sfmJCRzS0MUGZapFxvZKuZTck0 ToYdtyTqu3yPs3hRwXJrefiG2NtPR6GTpH38wS0wEoY2eXhHhGUs5nftvlKU1C6/Lq6o Im9ctQyDhESB6uEm8l1mkcPIos97AFSG1TADE2Y4gtNQG0wDNn5cMj0vDujMOjplrF9N 16cA== 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=U0uQ3HRgoQQfp2CdGN8FEd5/qa2AFhqDDu/t0Jnpk60=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=rl8/i5RDekMMzwD/EdkhYtHmYghCMYTVWsv++vXvZGtB4CsnoZygzzY6+tmBGv7biW vmykDzPI/r1bBizqH37GQSTDjAeLzir/2D1ld8YpR8Ttmq2C+HT+GPBf58LsJ8mvi10X T+S3k5G/KZ7ud1psdw4rQbBcW16aDGkQEDXIwVSdlj6qBw8Da08FCuPeAx/JX43pPTIe Y5SGO1ItXif7YdpmqP2R0ci86CLsQpokvmvnWmY7B67Wsr+gCWNS9asJYViwiLtVF5wh FAaPBN02Adkf7nWPnCMsUDzcvNayYTj3gevymx0KJzFgFsVfJr+aZp4KWF8qXmkCIcfk cCPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=PywI2su3; 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 s25-20020a50d499000000b0054c51a1a2fesi3137387edi.338.2023.12.10.17.47.07; Sun, 10 Dec 2023 17:47:07 -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=PywI2su3; 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 C1A7D68D1C5; Mon, 11 Dec 2023 03:45:07 +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 2449E68D16A 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=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=Nj2hFYOqNHiuw5nZ3kSp5s3UAAwiZOPXzSKR4RWzvRI=; b=PywI2su3pc/1pINuuBfRhWr4Vxr6H0Si+UyNDLjIQe5sFAHFjPvzQwam6vN7uMbqg8h2eH Wt1PjXrdY9PvicQdP+9J1IsR1mkZI+Erd257TP3R25iGcSvqijKmACYX8uHh0va6B4PfRY Fm5SXhWU8fNJfIqb3tPS/WtaUtjvwJY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id d071680c; 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:18 +0100 Message-ID: <20231211014429.1841681-18-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 17/35] avcodec/proresenc_anatoliy: reduce DC encoding function prototype differences with Kostya encoder 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: V6k5Z72twgdB --- libavcodec/proresenc_anatoliy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index f8feff850f..97d681467d 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -267,20 +267,20 @@ 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) +static void encode_dcs(PutBitContext *pb, int16_t *blocks, + int blocks_per_slice, int *qmat) { int prev_dc, codebook; int i, sign, idx; int new_dc, delta, diff_sign, code; - prev_dc = (in[0] - 0x4000) / qmat[0]; + prev_dc = (blocks[0] - 0x4000) / qmat[0]; codebook = TO_GOLOMB(prev_dc); encode_vlc_codeword(pb, FIRST_DC_CB, codebook); codebook = 5; sign = 0; idx = 64; for (i = 1; i < blocks_per_slice; i++, idx += 64) { - new_dc = (in[idx] - 0x4000) / qmat[0]; + new_dc = (blocks[idx] - 0x4000) / qmat[0]; delta = new_dc - prev_dc; diff_sign = DIFF_SIGN(delta, sign); code = TO_GOLOMB2(get_level(delta), diff_sign); @@ -388,7 +388,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig blocks_per_slice = mb_count << (2 - sub_sample_chroma); init_put_bits(&pb, buf, buf_size); - encode_dc_coeffs(&pb, blocks, blocks_per_slice, qmat); + encode_dcs(&pb, blocks, blocks_per_slice, qmat); encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); flush_put_bits(&pb);