From patchwork Mon Dec 11 01:35:31 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: 45056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652721pzf; Sun, 10 Dec 2023 17:48:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCt+Lni8m7Bg9xRrRdG3jOJdjMyT4I0O2Uy4HJtBd/nJ+lGwlXLi9ktQjmcwH8uQPRaIYz X-Received: by 2002:aa7:d8d4:0:b0:54b:d7e4:d262 with SMTP id k20-20020aa7d8d4000000b0054bd7e4d262mr4670366eds.2.1702259334116; Sun, 10 Dec 2023 17:48:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259334; cv=none; d=google.com; s=arc-20160816; b=HhgXqeaq+D4HznI4es2GH4jwz0e/rDLwJWLwDn2TkX+hjDy/ibtNr2J7xtVyIbqrjQ pd3cnXCqOCcXxVxb+pPGNciuejZkFf4T17F2cfI9zIjeWObj+dvO2aUDLnMxFQJhK8ji y85znRs2SVTYpvtK7vPqDOWdAu6E9clAAQ4AAUk8gvazQtvWpUjRM7V5EHHEIewb3wuS WQ6TtBebCESMDkgyYozdeO/ee6xirWJtTZk5qz4bANyC9dYaSAnMwAFozVwpdGX5FDp+ C9kuqpUVT8xV9GQ9+nXkA+08/8vc01j4ie7p5WxoLcvaJuTHwY/doMJzMEFYZXqfphPA M86A== 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=+lzStd1Xqb6lEW0R9X4RGYs6FFPv6TmRUqBuJszgSuo=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=i6s1KjkoqQqXFFajczLTObAPb171HbZ1gEGn7ulq5F+Rh3Q64wtSh6pwec6w0BvHNh iU3Ax9jkCXBgiRYBFCVr3o3D8mUS4X30O3tsaei76at8pH9Lqbk98pTt/4+p2yQgEG9m Ytcl83Zs+O5KVSDKG4mJJZSiAuqp+N6v353kVRVb/Zt8Y1mM7gNr8JwWcrQnUic8KaQS ifqzlaFhDsPAePL967HMEnRgRjno92Co/f2N5BAojpGv7Z3IC5mH6bgKv3RbK9n4fbFC l7ZEwGkyb4j9xD0NS/5uKRERdeW1WtOLj68ZvXhx5MHKb3zcoI1vZw2fRmhKndtZeru5 agtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=FK6N6DFs; 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 h3-20020a056402280300b0054ca260d79asi3174880ede.248.2023.12.10.17.48.53; Sun, 10 Dec 2023 17:48:54 -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=FK6N6DFs; 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 379D768D21A; Mon, 11 Dec 2023 03:45:22 +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 1A24168D14E 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=tsUxKn8UsVlQCfz05zzGQBi5vhbKNBJWorRjhNTUG/k=; b=FK6N6DFs2DG/yYNbUH5C8HlDqQGoZHZ5MiNo10eYmUcQ2XixyoGecjkChW2L9dB5IDgc3j 7wgdCCeYwPm4u21oKYRSMkHqDttw9QYHNJrCAdyUHdZORRgehQuQdMdhI49V4Tb5Yk3B3R 8u75T5J8HsFRfk8DORRejlpm2tu4hZY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 60fdc30f; 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:31 +0100 Message-ID: <20231211014429.1841681-31-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 30/35] avcodec/proresenc_anatoliy: rework encode_ac_coeffs() prototype 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: wfw0muX0j42r This makes the prototype closer to the function of the same name in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 88c6d47ab7..57324a3b27 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -282,8 +282,9 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, } } -static void encode_ac_coeffs(PutBitContext *pb, - int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64]) +static void encode_acs(PutBitContext *pb, int16_t *blocks, + int blocks_per_slice, + int *qmat, const uint8_t ff_prores_scan[64]) { int prev_run = 4; int prev_level = 2; @@ -292,7 +293,7 @@ static void encode_ac_coeffs(PutBitContext *pb, for (i = 1; i < 64; i++) { int indp = ff_prores_scan[i]; for (j = 0; j < blocks_per_slice; j++) { - int val = (in[(j << 6) + indp]) / qmat[indp]; + int val = (blocks[(j << 6) + indp]) / qmat[indp]; if (val) { encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run); @@ -378,7 +379,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig init_put_bits(&pb, buf, buf_size); encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]); - encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); + encode_acs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); flush_put_bits(&pb); return put_bits_ptr(&pb) - pb.buf;