From patchwork Mon Dec 11 01:35:02 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: 45028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651528pzf; Sun, 10 Dec 2023 17:44:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IELwI2D/wZmfc4BUzZlmesXJMJHTtuG/oJsrnqSgW0PTRGe1Ty3KXDZ3ICstPkOEFCr2vqd X-Received: by 2002:a50:bae1:0:b0:54c:61ba:79ff with SMTP id x88-20020a50bae1000000b0054c61ba79ffmr4386228ede.4.1702259094298; Sun, 10 Dec 2023 17:44:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259094; cv=none; d=google.com; s=arc-20160816; b=O5fOLIGu4IqPlg1OguCk1L80JpM5kJrGzfb/JWqcYLU63V6laGKaph4BhvWWt4rY1x iQsS2DX3fXQgAZsyq8qA0lpGBMTqvweHmxIvkrJiWQSYkVHjcE7izV8jS5vn4rWIhjak bD94N5/V/VtQBfxJwplw4EArm54j2ci8fNn/nS+niFx+SFISDs+2yOmRjjnBFqmx+EY1 m02DtRH5PEgRh+eFDyrOtCm99VzBFTnzJrmidBr4jZsj9na0d4rqbDsdJxljcp+iCuH9 +vOkAO93Su/YrbvLaldEfX99Nm0vxzObMLnXNTngQ82iNMQDk0eHZwaLdHOFbv0OYNGX SkqQ== 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=6m74TM9hyQvTby8QAv0+RxbjrMN/QsYJ99jphLndJds=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=sNT/g/MnF4BRahUVMO/f8zmuzL/fhddU3ULw4TLrKiDiGlVyY1MaPUcNVZBYZd+mWc lOYguE6ncbLm6ualbacGOl5z+QqgpkSpHqCUnmTt709bT5DGgdhxgdVj+MYb6alx0Whg 7P0Non1C6EE4UN5QCSFWTSa1CZHAq16xlkn4+fbHgvb0BOV34R3ExWAQLdCkA9OYZy26 lDdwuM8JbD3XbqbpswBOMHgA7ibVY5ZVIImIY5HFqyhl5OtJAxjNtRuBkLMSsQwZ66CI ypPrmFasFA6yjLwmRA8MIeHlnS3QACSV8q5A2ctBZO/EPjrh79DmpUdKGa4biN5eSXMg 6Ycw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=UPRYVYKT; 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 d22-20020a50cd56000000b0054c68c86ad2si3091356edj.24.2023.12.10.17.44.53; Sun, 10 Dec 2023 17:44: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=UPRYVYKT; 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 C7C8C68D147; Mon, 11 Dec 2023 03:44:46 +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 4B87768D13D for ; Mon, 11 Dec 2023 03:44:40 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259074; 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=v7TRIRWPZyRAt5M+QscnM7fgMvlLnB5K6k0iGgO17Q8=; b=UPRYVYKTbcOtj5qEu7iNctlHJlBb0UCRnIXSbWRes7Mir/0ycCoXOgvOY1Lus40exJ7hR1 NNAfdm6oC/ylwffS/wR8npkZnJFLyURNir4/S65Fv4vGzHiFJms/cEJX9VJNEiOjT7u9Fy R8gutCjw94+gJUXGQCq0jZ9xGPzstZI= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 4c6aab44; Mon, 11 Dec 2023 01:44:34 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:02 +0100 Message-ID: <20231211014429.1841681-2-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 01/35] avcodec/proresenc_kostya: remove an unnecessary parenthesis level in MAKE_CODE() macro 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: C9ummW2XkroE --- libavcodec/proresenc_kostya.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 52fe5639b1..58fc340879 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -429,7 +429,7 @@ static inline void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int } #define GET_SIGN(x) ((x) >> 31) -#define MAKE_CODE(x) ((((x)) * 2) ^ GET_SIGN(x)) +#define MAKE_CODE(x) (((x) * 2) ^ GET_SIGN(x)) static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) From patchwork Mon Dec 11 01:35:03 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: 45029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651569pzf; Sun, 10 Dec 2023 17:45:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHhALi0s5Xwokz+27SC2c+igTjyYLOgaWmA1uV+wFsbSmEYGkJCqmGqAjSZao/Fhu/g/Uo9 X-Received: by 2002:a50:a6d8:0:b0:550:4412:5f with SMTP id f24-20020a50a6d8000000b005504412005fmr1772833edc.57.1702259104999; Sun, 10 Dec 2023 17:45:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259104; cv=none; d=google.com; s=arc-20160816; b=rx5b0/n+W8rKt3hraAwZesYm4LRX9OOSV9jwGKiIyJCTJrPgOHGOvNdf0U2QnPI10w UHQBAJuz13tt+tv5lbzJgfFSfqBIQrrvpJyzSZtomZsLt3Xn3ZCb1n9o9OmG7shuctJS fxQvFW6omXmcUpSyel7R7rwio6Tapzzx0TJEHCP1tOF4Aa3GK49jjdXhjRRlJp77fjAy /vIiX1+hdg2f5e7EAJSj/acSnw04u+j4KrSdDCHiEzFarccUCfpRxCVtJyqoqXp0F1Z5 P/kGZ+7mcEsCTRE2GBkaHI4r+8qQmtpapK+l7tkEArxK+0DW7TxmekEERX4+QA6kgD7w tmQg== 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=R245r0N42U2elr3OIJ9IFDCZlB7vGR7qcQQSX1j+GM0=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=Uh9g/9dqCfZPbanx76nhYYPwRRQdey3LxUlyz1FTNbOOhkWQPZkgmcOcVQs7rru0Lm pCBtxWlI/lVgBuLzMTfew5Rc7Sb35NVbHO/3hXIuMQ2IUUkBGmLPHF8OVvkknzv0S6mv RQY3NqkIpAma3No664ijOZGTW18msqVYLBvynz4eQDqzM7A/s8vqXiytpiwR9cVCvwiW GxUh6auGm3ksIoDHhgwQEIrO7c9Sb18dF/ae/kwXaEwdGx+X+92YBENNWt+beH2IUjq9 wmdTXxI0SA1g/BW5VGpUu3T4+TSJqGW83iIAYZPRwD4EyyMwDtwIQiM2Xxsy4f3iKtH+ UQ/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=otk1ao54; 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 e24-20020a50a698000000b0054c6709d2d6si3036546edc.260.2023.12.10.17.45.04; Sun, 10 Dec 2023 17:45:04 -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=otk1ao54; 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 DCA8468D151; Mon, 11 Dec 2023 03:44:51 +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 4CF7D68D141 for ; Mon, 11 Dec 2023 03:44:45 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259074; 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=QTIofhEjTJNRjzJg4R87Cqw8PB9KQuhiEzjsr90ThEI=; b=otk1ao54ax+ucQDY6ek/GR8UGfKzfdLJ6rkVri2xt4ADgu5ZiURkpSehqAZUnMwDEa6JPZ SHv1vbcqcL/cIMDDENAOPuVXU7H3+6ZJsbjeJu2l7cWw3JZkGGqX/aFqRF1hYmh3VWPbxt H1rGQaAwLQHEhTBAk0EW/KwpnFgeSu8= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 7ef20322; Mon, 11 Dec 2023 01:44:34 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:03 +0100 Message-ID: <20231211014429.1841681-3-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 02/35] avcodec/proresenc_kostya: remove unused plane factor variables 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: AmDmkccdPRqU --- libavcodec/proresenc_kostya.c | 36 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 58fc340879..7aed3974c3 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -459,7 +459,6 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, static void encode_acs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, - int plane_size_factor, const uint8_t *scan, const int16_t *qmat) { int idx, i; @@ -494,14 +493,13 @@ static void encode_acs(PutBitContext *pb, int16_t *blocks, static void encode_slice_plane(ProresContext *ctx, PutBitContext *pb, const uint16_t *src, ptrdiff_t linesize, int mbs_per_slice, int16_t *blocks, - int blocks_per_mb, int plane_size_factor, + int blocks_per_mb, const int16_t *qmat) { int blocks_per_slice = mbs_per_slice * blocks_per_mb; encode_dcs(pb, blocks, blocks_per_slice, qmat[0]); - encode_acs(pb, blocks, blocks_per_slice, plane_size_factor, - ctx->scantable, qmat); + encode_acs(pb, blocks, blocks_per_slice, ctx->scantable, qmat); } static void put_alpha_diff(PutBitContext *pb, int cur, int prev, int abits) @@ -575,10 +573,9 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, int i, xp, yp; int total_size = 0; const uint16_t *src; - int slice_width_factor = av_log2(mbs_per_slice); int num_cblocks, pwidth, line_add; ptrdiff_t linesize; - int plane_factor, is_chroma; + int is_chroma; uint16_t *qmat; uint16_t *qmat_chroma; @@ -604,9 +601,6 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, for (i = 0; i < ctx->num_planes; i++) { is_chroma = (i == 1 || i == 2); - plane_factor = slice_width_factor + 2; - if (is_chroma) - plane_factor += ctx->chroma_factor - 3; if (!is_chroma || ctx->chroma_factor == CFACTOR_Y444) { xp = x << 4; yp = y << 4; @@ -631,11 +625,11 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, if (!is_chroma) {/* luma quant */ encode_slice_plane(ctx, pb, src, linesize, mbs_per_slice, ctx->blocks[0], - num_cblocks, plane_factor, qmat); + num_cblocks, qmat); } else { /* chroma plane */ encode_slice_plane(ctx, pb, src, linesize, mbs_per_slice, ctx->blocks[0], - num_cblocks, plane_factor, qmat_chroma); + num_cblocks, qmat_chroma); } } else { get_alpha_data(ctx, src, linesize, xp, yp, @@ -704,7 +698,6 @@ static int estimate_dcs(int *error, int16_t *blocks, int blocks_per_slice, } static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice, - int plane_size_factor, const uint8_t *scan, const int16_t *qmat) { int idx, i; @@ -742,7 +735,7 @@ static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice, static int estimate_slice_plane(ProresContext *ctx, int *error, int plane, const uint16_t *src, ptrdiff_t linesize, int mbs_per_slice, - int blocks_per_mb, int plane_size_factor, + int blocks_per_mb, const int16_t *qmat, ProresThreadData *td) { int blocks_per_slice; @@ -751,8 +744,7 @@ static int estimate_slice_plane(ProresContext *ctx, int *error, int plane, blocks_per_slice = mbs_per_slice * blocks_per_mb; bits = estimate_dcs(error, td->blocks[plane], blocks_per_slice, qmat[0]); - bits += estimate_acs(error, td->blocks[plane], blocks_per_slice, - plane_size_factor, ctx->scantable, qmat); + bits += estimate_acs(error, td->blocks[plane], blocks_per_slice, ctx->scantable, qmat); return FFALIGN(bits, 8); } @@ -821,9 +813,8 @@ static int find_slice_quant(AVCodecContext *avctx, ProresContext *ctx = avctx->priv_data; int i, q, pq, xp, yp; const uint16_t *src; - int slice_width_factor = av_log2(mbs_per_slice); int num_cblocks[MAX_PLANES], pwidth; - int plane_factor[MAX_PLANES], is_chroma[MAX_PLANES]; + int is_chroma[MAX_PLANES]; const int min_quant = ctx->profile_info->min_quant; const int max_quant = ctx->profile_info->max_quant; int error, bits, bits_limit; @@ -843,9 +834,6 @@ static int find_slice_quant(AVCodecContext *avctx, for (i = 0; i < ctx->num_planes; i++) { is_chroma[i] = (i == 1 || i == 2); - plane_factor[i] = slice_width_factor + 2; - if (is_chroma[i]) - plane_factor[i] += ctx->chroma_factor - 3; if (!is_chroma[i] || ctx->chroma_factor == CFACTOR_Y444) { xp = x << 4; yp = y << 4; @@ -889,13 +877,13 @@ static int find_slice_quant(AVCodecContext *avctx, bits += estimate_slice_plane(ctx, &error, 0, src, linesize[0], mbs_per_slice, - num_cblocks[0], plane_factor[0], + num_cblocks[0], ctx->quants[q], td); /* estimate luma plane */ for (i = 1; i < ctx->num_planes - !!ctx->alpha_bits; i++) { /* estimate chroma plane */ bits += estimate_slice_plane(ctx, &error, i, src, linesize[i], mbs_per_slice, - num_cblocks[i], plane_factor[i], + num_cblocks[i], ctx->quants_chroma[q], td); } if (bits > 65000 * 8) @@ -926,13 +914,13 @@ static int find_slice_quant(AVCodecContext *avctx, bits += estimate_slice_plane(ctx, &error, 0, src, linesize[0], mbs_per_slice, - num_cblocks[0], plane_factor[0], + num_cblocks[0], qmat, td);/* estimate luma plane */ for (i = 1; i < ctx->num_planes - !!ctx->alpha_bits; i++) { /* estimate chroma plane */ bits += estimate_slice_plane(ctx, &error, i, src, linesize[i], mbs_per_slice, - num_cblocks[i], plane_factor[i], + num_cblocks[i], qmat_chroma, td); } if (bits <= ctx->bits_per_mb * mbs_per_slice) From patchwork Mon Dec 11 01:35:04 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: 45030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651615pzf; Sun, 10 Dec 2023 17:45:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNLG1EuGT/jD0oaBI782J1CB1cy0o1vqdw4dfnZiGM62GZUV1ucSXYCKa/h1/c5VWAAdHo X-Received: by 2002:a17:907:904d:b0:a1e:da90:a5e1 with SMTP id az13-20020a170907904d00b00a1eda90a5e1mr901841ejc.54.1702259115371; Sun, 10 Dec 2023 17:45:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259115; cv=none; d=google.com; s=arc-20160816; b=dLsdziaRdCL7k3u2mi2Z37ZZrzUY1aiYQWBIpm8MewO/Z+hZorNJL4wRd6sp+9yf9t 0cH1g/hCn/yuVa6vhSPgw2jft436fCpQ3xvV7baiCamNIaXWXTGvJtMT9ow4dcC+CZTY WqsK+28Bj9zygnk6knvmUaLWYMM0Xylc4QnKMLKTC0mBJdj0321c5Awhtbz1VXpwJGGp nzlFTr0o3pLa6vmjWNlkRzFdX8AIwRPEISQbXRkVzEUqW3ZG4goFGDm0q9SHq0c/8ayM RgQvHCVTxcq/NWWRWEzVZD7jQ7PBSs9ZDDatyhfgXTJ60suG3pu/1c5J+wCcyvOCgnuE 5RIg== 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=Mqa7DNoSNvM8CIBr88OfoZiFp1dmYP+o818YvLBcHH4=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=Dxj1sAa2pAbrZeHT2IDrdeaqZ22noDcZJ5glUfbTf2q5eCZMqfgWYvbge6qil9QP8X Z//70jnp7T7Vitg3sXrQ5CxQ0+K9Y+bn59oXSo0MQ5oEmR9uAYxZtcMwL6lVgRSmafpm DvjYVedSzQMsdetEctR6xFA7DYbAmtYB7D5Y0BZ+zHh8U7VhT5XALiYA7NuI3fFzQVa3 5UbRP083gLDxWFvagbSsdcN0Mtefd8LGbDwAPKys5QjK5gyZkiKMoUTx8Y/tD/c6XgHg 4zBQluB6yTVNvo5TxDazv1Dx/gs530trVd8EAPury+1f5W7XKcDkRp4WhqZWpzbt+sK6 1aXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=ZN7Lvcke; 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 s13-20020a170906284d00b00a1d5873e4e7si3076861ejc.61.2023.12.10.17.45.14; Sun, 10 Dec 2023 17:45:15 -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=ZN7Lvcke; 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 035BC68D156; Mon, 11 Dec 2023 03:44:53 +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 7B56C68D141 for ; Mon, 11 Dec 2023 03:44:45 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259075; 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=AfQ9GN3jURfpGYpUhQY/ph93aUB3QQw6eeGksLAXfiY=; b=ZN7LvckeEUN2pBP6uJGMtXYfRG1JUjjTKLG3GAX5fm1puYh5BoTKFx2/2fGeaiJxMVhlxx XGAJaW4VwJ37xMKJKamH04NKX7G8V/qaBxVm70lT16dNIBdjrEoSqiktwVXQilAehz9Yp7 SMRJuDdCA/Tr8xdH3aVku8LJR04iMPE= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id c0302043; Mon, 11 Dec 2023 01:44:35 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:04 +0100 Message-ID: <20231211014429.1841681-4-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 03/35] avcodec/proresenc_kostya: remove redundant codebook assignments 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: SH4UpX0ralbg This is already assigned at declaration. --- libavcodec/proresenc_kostya.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 7aed3974c3..6e1d5a0cef 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -440,7 +440,6 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, prev_dc = (blocks[0] - 0x4000) / scale; encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); sign = 0; - codebook = 3; blocks += 64; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { @@ -676,7 +675,6 @@ static int estimate_dcs(int *error, int16_t *blocks, int blocks_per_slice, prev_dc = (blocks[0] - 0x4000) / scale; bits = estimate_vlc(FIRST_DC_CB, MAKE_CODE(prev_dc)); sign = 0; - codebook = 3; blocks += 64; *error += FFABS(blocks[0] - 0x4000) % scale; From patchwork Mon Dec 11 01:35:05 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: 45031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651660pzf; Sun, 10 Dec 2023 17:45:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXSwl5fZhUQBJh9PwQL8JcJzBVzLZozqPmYpVWew/ffLpGWUoHzRPO+Qrc0RejwxRrc+F9 X-Received: by 2002:a50:9f26:0:b0:54c:a2f9:5667 with SMTP id b35-20020a509f26000000b0054ca2f95667mr4021381edf.4.1702259125791; Sun, 10 Dec 2023 17:45:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259125; cv=none; d=google.com; s=arc-20160816; b=NIokVxYCYhl57R5qTVZtMpzcJCpOi0Z6HFuCs6pSslbAFfOR2h6NqkLAadAsKo/hWM SKRNevOU6jdVNpiUlwnCyTUTk6IPV1iGljQGjOCJSoe0PSgZvDV8rE9XPMHJMtN5iHIp lDmTdfOy4oajHqekVelrD4oUaw9ppWPtYrMAtQivLBOTw+ZBfnGDUnaHlaZ3/ksWbmh3 ik+Urn78uZeJ73hW/t0W4S1zjteYI7RUv9YCfgzgY5Op7qk/I5QfxEskrIA8LlOVHMBx S71Ky/HkVpuTIFxsqj07PU3OmUlG0jzm71K3x9NN/BD8s8wygcEjE8RdR2vVKxvvKHqB KCXQ== 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=0ZRoK0NfkctREaUWUHxlbvPZE6sjTLoBQfBx+ECwKMI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=V/gQYQqcxFbry4JZ5JuZqWSDmu6yymwgmWc2Tn/0MzFdivPCYtajSJXS3QFw/WVsKT BR5OZ5m9hQxcHD+TRxFjQuNzqP8T2aVgDGAfyQn0YxRSBxoMOUAyZ3rkEhoVqKv5Lbtc 7/RLCsNnfiolhHUiVrtHFLk43Tm4VhcS73KRL3NGzGFPeqEa6AdnyN9fm5U8OFWZOo8k JkINIzRHd1L/8Ue0hXhUESnXFRak4s+5M6hc7yYxekUHt5maHEyXqTIxUQCQ1W3OP95p sXPCujBJuiLi5haqTe3P+cgGlrGUY8IwOdcYEpGD6iuytFS9U4f9IpgNlzXisRJsZ6gr rsBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=Y2vi3ull; 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 n13-20020a05640205cd00b0055130bb29ccsi385534edx.33.2023.12.10.17.45.25; Sun, 10 Dec 2023 17:45:25 -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=Y2vi3ull; 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 1DF8C68D169; Mon, 11 Dec 2023 03:44:56 +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 5129C68D131 for ; Mon, 11 Dec 2023 03:44:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259075; 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=TTGQGlaPebjX6Exylz6rLw9ed70calRFLHA3vu7ZtI0=; b=Y2vi3ullDp+RZQP/5ehoCVvWPzlGO2UkNRy9JB3NwXbpmAi2WZZhivWswvqKJJ/wu2OLuO S57IOVMcaTfZHKnSACIVR3roi481TVFB3c1VmwRzHptn0F+wf7JScbbveyBOfuuQMLYdfZ tcTSmpzZv+z0pbbGNsHBmOBsZiTr0TM= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id fa230802; Mon, 11 Dec 2023 01:44:35 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:05 +0100 Message-ID: <20231211014429.1841681-5-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 04/35] avcodec/proresenc_anatoliy: move run/lev to codebook LUT to shared proresdata 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: jBaeX6rb67qU This is going to be shared with proresenc_kostya in the upcoming commit. --- libavcodec/proresdata.c | 6 ++++++ libavcodec/proresdata.h | 2 ++ libavcodec/proresenc_anatoliy.c | 9 ++------- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/proresdata.c b/libavcodec/proresdata.c index 4787907c71..12ee43bddd 100644 --- a/libavcodec/proresdata.c +++ b/libavcodec/proresdata.c @@ -43,3 +43,9 @@ const uint8_t ff_prores_interlaced_scan[64] = { 30, 23, 31, 38, 45, 52, 60, 53, 46, 39, 47, 54, 61, 62, 55, 63 }; + +const uint8_t ff_prores_run_to_cb[16] = { 0x06, 0x06, 0x05, 0x05, 0x04, 0x29, + 0x29, 0x29, 0x29, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x4C }; + +const uint8_t ff_prores_lev_to_cb[10] = { 0x04, 0x0A, 0x05, 0x06, 0x04, 0x28, + 0x28, 0x28, 0x28, 0x4C }; diff --git a/libavcodec/proresdata.h b/libavcodec/proresdata.h index d8c8786689..4d16992892 100644 --- a/libavcodec/proresdata.h +++ b/libavcodec/proresdata.h @@ -29,6 +29,8 @@ extern const uint8_t ff_prores_progressive_scan[64]; extern const uint8_t ff_prores_interlaced_scan[64]; +extern const uint8_t ff_prores_run_to_cb[16]; +extern const uint8_t ff_prores_lev_to_cb[10]; #define FIRST_DC_CB 0xB8 // rice_order = 5, exp_golomb_order = 6, switch_bits = 0 diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index e7114f1646..6b2e513bed 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -296,11 +296,6 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, } } -static const uint8_t run_to_cb[16] = { 0x06, 0x06, 0x05, 0x05, 0x04, 0x29, - 0x29, 0x29, 0x29, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x4C }; -static const uint8_t lev_to_cb[10] = { 0x04, 0x0A, 0x05, 0x06, 0x04, 0x28, - 0x28, 0x28, 0x28, 0x4C }; - static void encode_ac_coeffs(PutBitContext *pb, int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64]) { @@ -313,14 +308,14 @@ static void encode_ac_coeffs(PutBitContext *pb, for (j = 0; j < blocks_per_slice; j++) { int val = QSCALE(qmat, indp, in[(j << 6) + indp]); if (val) { - encode_codeword(pb, run, run_to_cb[FFMIN(prev_run, 15)]); + encode_codeword(pb, run, ff_prores_run_to_cb[FFMIN(prev_run, 15)]); prev_run = run; run = 0; level = get_level(val); code = level - 1; - encode_codeword(pb, code, lev_to_cb[FFMIN(prev_level, 9)]); + encode_codeword(pb, code, ff_prores_lev_to_cb[FFMIN(prev_level, 9)]); prev_level = level; From patchwork Mon Dec 11 01:35:06 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: 45032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651709pzf; Sun, 10 Dec 2023 17:45:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvd2TTpd+Drif6HXjD1IcoPeYXGqtNdakCXn5ozK5QVq3lGyECQLsGkaM+886D2B2nuMzJ X-Received: by 2002:a17:907:270f:b0:a1e:a558:748c with SMTP id w15-20020a170907270f00b00a1ea558748cmr4293684ejk.18.1702259135191; Sun, 10 Dec 2023 17:45:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259135; cv=none; d=google.com; s=arc-20160816; b=PF292sGYMLEDFDRjitj0S8xNPO+tgUTilvH50W5Yj8rDW76xkIT05MNYnF/xTh/mXl UUZ/CY3NKPmAG7ZkG6WnjeIZS4ZrmFCS8xMhIaw1XTfziWfjGFRIVybyTvaXGsVij49Q Vsp/hdiV6fj9N46ti6ThaedN3fqyfpLWlB00x2rlsC+xU744XY/yEhhs1dKbqE4WCbWI UtJ9KutfpP9R2dT6CnVs/rQxZgzOHLADnwRoz1pvwyJ0LegIQGn27+EW58jUkokcmaJ8 VNZIWesmHpWaUEJ2uvHK7sP8/qaiTq/Nng+py8HzBvOp0D3fQf/GN4p5ISUvoI8P7LhO h/XA== 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=u7CzGLsiq0e6/7Dtrzu1GOt6l7r9OjyFWo0miBuuOQI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=dcK1uexJ8Uq+Ga73zOntrjaKaHkvRuUDOC9omTQPCZd0rugHShDJfjW0qyTu1fkerR jaf5x+8TVkJIxMOmtgG36KmT/kcjdIolVQ5cV4ye2iuyYb3C7iHGcJh/r5LR6GKRyI2P L7+xfcsI/huA7AdGJncZyF0SWKxyFd3oSFPXyoXUMzEXdtX2vhxH1hgjrqw21nGoGrh9 +W50y4Okrdvvd4+KdqdtOm3bHlVCwwCMC4uOz8mhEXjSOGiwOl76dsW6NrH5FjJpw1ey 7A+sJ10wts9QJ6RZfCvCUWIgcNHl41f8ZifRjXRsc8AFukF767S1gMvY/0ZguQGjJR6z 3IvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="DizY/7Hv"; 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 c22-20020a170906695600b00a1da2f7c1dcsi3221857ejs.359.2023.12.10.17.45.34; Sun, 10 Dec 2023 17:45:35 -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="DizY/7Hv"; 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 2789568D16A; Mon, 11 Dec 2023 03:44:57 +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 738D968D14F for ; Mon, 11 Dec 2023 03:44:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259075; 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=G/1WDgcIIqwm0zm9Ty7gic5tFUM3whHMLHF+QkKVvx0=; b=DizY/7HvApTRU/P6npmSub/X5ItboueLvmGQ8WItULsPN8H9hXmnaP+DUdtLdLo4OylMns q+maMXmYNn5LVb9sNw11Ns8f3zIA5bDu/4qn4GuTNqI7k4kLrPQCtRglktGjrC/RBHvJ4A /GCwMDGT7Y/XJZDHFaImi3bpUU6Fm+U= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 6a62d949; Mon, 11 Dec 2023 01:44:35 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:06 +0100 Message-ID: <20231211014429.1841681-6-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 05/35] avcodec/proresenc_kostya: remove one LUT indirection for run/level to codebook mapping 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: 7e6EXO6iIDUI This is following the same logic as proresenc_anatoliy. --- libavcodec/proresenc_kostya.c | 47 +++++++++++------------------------ 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 6e1d5a0cef..f883ab550b 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -142,25 +142,6 @@ static const uint8_t prores_dc_codebook[4] = { 0x70 // rice_order = 3, exp_golomb_order = 4, switch_bits = 0 }; -static const uint8_t prores_ac_codebook[7] = { - 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0 - 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0 - 0x4C, // rice_order = 2, exp_golomb_order = 3, switch_bits = 0 - 0x05, // rice_order = 0, exp_golomb_order = 1, switch_bits = 1 - 0x29, // rice_order = 1, exp_golomb_order = 2, switch_bits = 1 - 0x06, // rice_order = 0, exp_golomb_order = 1, switch_bits = 2 - 0x0A, // rice_order = 0, exp_golomb_order = 2, switch_bits = 2 -}; - -/** - * Lookup tables for adaptive switching between codebooks - * according with previous run/level value. - */ -static const uint8_t prores_run_to_cb_index[16] = - { 5, 5, 3, 3, 0, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 2 }; - -static const uint8_t prores_lev_to_cb_index[10] = { 0, 6, 3, 5, 0, 1, 1, 1, 1, 2 }; - #define NUM_MB_LIMITS 4 static const int prores_mb_limits[NUM_MB_LIMITS] = { 1620, // up to 720x576 @@ -461,12 +442,12 @@ static void encode_acs(PutBitContext *pb, int16_t *blocks, const uint8_t *scan, const int16_t *qmat) { int idx, i; - int run, level, run_cb, lev_cb; + int prev_run = 4; + int prev_level = 2; + int run, level; int max_coeffs, abs_level; max_coeffs = blocks_per_slice << 6; - run_cb = prores_run_to_cb_index[4]; - lev_cb = prores_lev_to_cb_index[2]; run = 0; for (i = 1; i < 64; i++) { @@ -474,13 +455,13 @@ static void encode_acs(PutBitContext *pb, int16_t *blocks, level = blocks[idx] / qmat[scan[i]]; if (level) { abs_level = FFABS(level); - encode_vlc_codeword(pb, prores_ac_codebook[run_cb], run); - encode_vlc_codeword(pb, prores_ac_codebook[lev_cb], + encode_vlc_codeword(pb, ff_prores_run_to_cb[prev_run], run); + encode_vlc_codeword(pb, ff_prores_lev_to_cb[prev_level], abs_level - 1); put_sbits(pb, 1, GET_SIGN(level)); - run_cb = prores_run_to_cb_index[FFMIN(run, 15)]; - lev_cb = prores_lev_to_cb_index[FFMIN(abs_level, 9)]; + prev_run = FFMIN(run, 15); + prev_level = FFMIN(abs_level, 9); run = 0; } else { run++; @@ -699,13 +680,13 @@ static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice, const uint8_t *scan, const int16_t *qmat) { int idx, i; - int run, level, run_cb, lev_cb; + int prev_run = 4; + int prev_level = 2; + int run, level; int max_coeffs, abs_level; int bits = 0; max_coeffs = blocks_per_slice << 6; - run_cb = prores_run_to_cb_index[4]; - lev_cb = prores_lev_to_cb_index[2]; run = 0; for (i = 1; i < 64; i++) { @@ -714,12 +695,12 @@ static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice, *error += FFABS(blocks[idx]) % qmat[scan[i]]; if (level) { abs_level = FFABS(level); - bits += estimate_vlc(prores_ac_codebook[run_cb], run); - bits += estimate_vlc(prores_ac_codebook[lev_cb], + bits += estimate_vlc(ff_prores_run_to_cb[prev_run], run); + bits += estimate_vlc(ff_prores_lev_to_cb[prev_level], abs_level - 1) + 1; - run_cb = prores_run_to_cb_index[FFMIN(run, 15)]; - lev_cb = prores_lev_to_cb_index[FFMIN(abs_level, 9)]; + prev_run = FFMIN(run, 15); + prev_level = FFMIN(abs_level, 9); run = 0; } else { run++; From patchwork Mon Dec 11 01:35:07 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: 45036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651934pzf; Sun, 10 Dec 2023 17:46:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzAefY9DAwLIB6LagcIegFfWXB9IZy8isKLJIyz90Q9IhaUR3y2Gx6FKrOcreWPYQHrrPm X-Received: by 2002:a17:907:c317:b0:a1d:5c72:3be2 with SMTP id tl23-20020a170907c31700b00a1d5c723be2mr3726895ejc.7.1702259170161; Sun, 10 Dec 2023 17:46:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259170; cv=none; d=google.com; s=arc-20160816; b=L4t4udgjMHucE+8hEP6ufv/2HzKpLqpK2rwBq+0aWJ0/4EOUlqf0fFQGn1D+zaRQ5G +5/YRRcEJD9NDfMCk4dZ5HpUr/SpkErawlYgbLNcHiIwwOPM8315fipur6ETuejxUbX6 qPIFhENy7uv4X3FR+rRxSVWSJfahXEiBf+91xTLCZzLafVutD9Z3f0tgRhK9x/nXUQJW ec24X1kedGSwBi7xsUCVNGmjykd1owcNtsyUEwqLQwYlfSJUIHumsG4k64I86/EfnbU8 3IE6duuKJtB8GKL7dDu7DQv9yijjZV+QGUYEMkfLY219uDhwc2xRq7EkqpnaAtwNpHHY aPKw== 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=jbbwUx5EOG3BGW97H7zWESkgH4fxpilIBQpzrl56nRI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=p6wDfYSxr177l15Mas8wVLRV4FMfwI1TyeKzQDKcsiS/KyrIJWdMmvbIWITy+fJp34 DiK39xgRI6yQ3fYTjgG0McugI+nBqLQFyCGBbSDXVCGMx9B7BjjULfMkPnJ0DS3yxKFs qheUFJ9gRYQ7CFeXnyO48tXJnsN2Jg8FH++t9YIbO+3+CwYd97RHkMAekEEyVfkUXCgP y7/+2s3PwHXe5RwKx3lzs+FDcM/HgRjGKUP4RDzEDL+ohGcIHFgtjM/6JtuCsDhjrXna GB20ohMdAPf8eAmrGuMDplH2EltY+0WNgcMmhXMN1gNJMjEScYl3HZdG+Ki+fZLBywpR cTpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=mGF5jrsA; 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 gl17-20020a170906e0d100b00a1d8fa85da8si3135472ejb.14.2023.12.10.17.46.09; Sun, 10 Dec 2023 17:46:10 -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=mGF5jrsA; 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 D40E468D1A5; Mon, 11 Dec 2023 03:45:00 +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 ACD4968D15C for ; Mon, 11 Dec 2023 03:44:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259075; 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=JTBBBSduRh0OgwTsPCCc3qN7qfsqRfGT1cxRnD6s6mw=; b=mGF5jrsA+vlXzYZVsgr8DMAZFLb9fR7vaadl8ua+p3uSSSZ1QQw2+JpODlXcUs+48kSrn4 vTQq7Qb6KVm8mcVJQuxD+TMEt6yqRCMWtKLxdnQYL8ol+CPGPQ3K7zol3Z0ZoI+2sKWT2A Q9FfdtvhyI19ebbV7tSuDZ2qZzm6f/A= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id a1824faa; Mon, 11 Dec 2023 01:44:35 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:07 +0100 Message-ID: <20231211014429.1841681-7-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 06/35] avcodec/proresenc_anatoliy: remove duplicated define 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: ovOxI3xvuY8C This is already defined in proresdata.h --- libavcodec/proresenc_anatoliy.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 6b2e513bed..c6f49be9b8 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -266,8 +266,6 @@ static av_always_inline int get_level(int val) return (val ^ sign) - sign; } -#define FIRST_DC_CB 0xB8 - static const uint8_t dc_codebook[7] = { 0x04, 0x28, 0x28, 0x4D, 0x4D, 0x70, 0x70}; static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, From patchwork Mon Dec 11 01:35:09 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: 45033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651770pzf; Sun, 10 Dec 2023 17:45:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSU9Vh5aZlAhnmLYiiGhyp+4mzUyPdiZ2SezMGwcMr4xZ7DqIQuUsnideZlwY8X6ygRPh3 X-Received: by 2002:a05:600c:3556:b0:40b:5e21:bdb4 with SMTP id i22-20020a05600c355600b0040b5e21bdb4mr1685462wmq.67.1702259143684; Sun, 10 Dec 2023 17:45:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259143; cv=none; d=google.com; s=arc-20160816; b=uy9+baBJMXdCxQQPcielsnISmFz52/IwU7bPIgGAondU63HHfRkFTYvYG/ZnvRd41k Dez4pLrK80eUxPsfUDXyD7hXWJ6d9JHhymTWTeGOHA/S/zCO6VFO+4NaY54hdA8pu6xY Rg+FpHRgHQPfsEID1XdBFWgfdj08GLGcd692ar1EGpAr+G8VIX8tyC5iAyJpV5w0KSU/ 3EJeFIP9obNBdPOuwTereFeitnyBdJ1fpn90qm+IwcPp/82Xi/2Xyvd8ntYYYL55adzK Um80ADB6xFRCJc36GC8f1KP5TxEXudVRlW0scQNgaPIa/uBI6wxTSWquj0j2hyH/ELNT tmnA== 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=tn15HEkMq5zPdfubX3dTUocK0bnwYh1SSKgJ3ohrMFc=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=LvvSCfjPMYexlVFXqAeaKk1+p3fVC1oCPrX3bGazNYPcsE4UD57ENTURL/0V/jNKWw wLe25DH1Ax3W81GFb4vHsGyleWUedfsBA2kzCJNMBa/n03RZStaCpJ/MmfMIm33QDwaX Vi1YUyTUxPe7bzzhH2NVOs+2EYgFBCRcehT49lCeNnubfW9lqis0JEUCcmfeOpHRF65s QRG3MmJSbOSqwRm7HWOmeXORiEMJZIZAuzyOsT8xkA1WGMt4aUT2ZcWfhrGrxs2bi2/Q vI/l2lap8blBACAaqoZ0WsZ0SHsJP2vTM78twtKT1f59nFnU81ML6FIkudvSAvSMeyB7 F04w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=rCp2LyvA; 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 z17-20020a1709067e5100b00a1e27e584casi3001253ejr.281.2023.12.10.17.45.43; Sun, 10 Dec 2023 17:45:43 -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=rCp2LyvA; 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 3527468D1A1; Mon, 11 Dec 2023 03:44:58 +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 77DB268D15C 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=1702259076; 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=TcnUQHN3vojWettb5naG2TJJg8kyEbR0v4LfwT3DHeg=; b=rCp2LyvAkoktS+2Bi+4p/+QHNt32w/ymCs9RQXaQz+G0qnAiFjqLxOcihZfth8whIoFtyr PPMxrf0SNnXB2P7vbB9dB67kOLZy/8IxntOslDU1B2Gn5pPEiHUdYwsELqKy4cpF2TCrrC cdYjd6gDXr/dBkU1c+i7qTohgVZh3Cw= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id df03006b; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:09 +0100 Message-ID: <20231211014429.1841681-9-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 08/35] avcodec/proresenc_kostya: save a few operations in DC encoding 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: 3Lh1a9FWBIp+ This matches the logic from proresenc_anatoliy. --- libavcodec/proresenc_kostya.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index f883ab550b..2d45f9a685 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -135,13 +135,6 @@ static const uint8_t prores_quant_matrices[][64] = { }, }; -static const uint8_t prores_dc_codebook[4] = { - 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0 - 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0 - 0x4D, // rice_order = 2, exp_golomb_order = 3, switch_bits = 1 - 0x70 // rice_order = 3, exp_golomb_order = 4, switch_bits = 0 -}; - #define NUM_MB_LIMITS 4 static const int prores_mb_limits[NUM_MB_LIMITS] = { 1620, // up to 720x576 @@ -416,7 +409,7 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) { int i; - int codebook = 3, code, dc, prev_dc, delta, sign, new_sign; + int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; prev_dc = (blocks[0] - 0x4000) / scale; encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); @@ -429,9 +422,8 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, new_sign = GET_SIGN(delta); delta = (delta ^ sign) - sign; code = MAKE_CODE(delta); - encode_vlc_codeword(pb, prores_dc_codebook[codebook], code); - codebook = (code + (code & 1)) >> 1; - codebook = FFMIN(codebook, 3); + encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); + codebook = FFMIN(code, 6); sign = new_sign; prev_dc = dc; } @@ -650,7 +642,7 @@ static int estimate_dcs(int *error, int16_t *blocks, int blocks_per_slice, int scale) { int i; - int codebook = 3, code, dc, prev_dc, delta, sign, new_sign; + int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; int bits; prev_dc = (blocks[0] - 0x4000) / scale; @@ -666,9 +658,8 @@ static int estimate_dcs(int *error, int16_t *blocks, int blocks_per_slice, new_sign = GET_SIGN(delta); delta = (delta ^ sign) - sign; code = MAKE_CODE(delta); - bits += estimate_vlc(prores_dc_codebook[codebook], code); - codebook = (code + (code & 1)) >> 1; - codebook = FFMIN(codebook, 3); + bits += estimate_vlc(ff_prores_dc_codebook[codebook], code); + codebook = FFMIN(code, 6); sign = new_sign; prev_dc = dc; } From patchwork Mon Dec 11 01:35:10 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: 45034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651824pzf; Sun, 10 Dec 2023 17:45:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFedi9yd5TjVK3pPIoSGueutZ49/9HIZy1DEK72vqmwz0HW4rRaALYzGt8AficusPpXV1uU X-Received: by 2002:a17:907:c207:b0:a18:96e3:ae2a with SMTP id ti7-20020a170907c20700b00a1896e3ae2amr3704944ejc.5.1702259152968; Sun, 10 Dec 2023 17:45:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259152; cv=none; d=google.com; s=arc-20160816; b=i1GKBQQwA6B6v/fQUdXj6uRenFNSWoCd79IdpWzR3IbsLNJs8VdeG6BACIY53A182p UMxmS5Ya2rfVU5H/ih9xxf/bRyU8OPGZnCF9KAoPEtqCOhmgp2vq3Ek2s+POztu/v4ul eKrfV8HtsrMw740yB3K6howIV6OjE+5D3mVJoC80tW7a3+/D0uGhz7g+XCFbH7FviT8J RrCnfYRUdwfj3Fm/BYBoq51rDU+5TtFNxmuyL+p/p160SZAzpI7vGyAQnLsfBOfR7373 TntiHI49mzss07qRjZCKKB+1qf+xBOkM7EI3BgTJXkelRPbNgmcJ483H4hcbcRvDENf6 ZKNA== 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=iRUrdHcH4fUxHu6NnJOpGtqBJAyHe7x8fn4YCQ6Z3mY=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=s/vvJeb+ldiP4X8jksWCrfPvbIC3I14Vx7Emw/hbzT6iCCp+0AIWwFHcVACsuBM0sJ 97tlgaMiGQYT3J6WhQ7HovCMpTWN8Hvk7Bfh7dhKYQ+DiSmSXv0tH/8MMGOXsRienKH/ /hsDTRwPQEl1fHJuFT3/UniY/TW/nYfpcTcXsiNi3ntJWHpLSbcbTwzxYhBe2cHl4mFd V3XGcNtdvFN7Ylg89+CyJCUGatLrsVaQqUaOubDyxgx/y9r9CjNgthySB2JHZEo/I5W4 NOXHTxKpKL7zjKTeQrrJZajRBVoc/1JGOmiXu63kKuNEU4/9ZTdBRQeNsnHVlTvFEqKy jjCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=p9zLbTbI; 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 gy6-20020a170906f24600b00a1d84c554e8si2938157ejb.844.2023.12.10.17.45.52; Sun, 10 Dec 2023 17:45:52 -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=p9zLbTbI; 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 3061868D1A4; Mon, 11 Dec 2023 03:44:59 +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 99B5F68D153 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=1702259076; 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=UY9g6cT9CpR8bzFe98rg3lN0rhL05FiJnGh+fbKOu7Q=; b=p9zLbTbIDKLHI0qxsJJaSe7b2MxXTvp/0JaDGIsN3PH0VFLSUO0BxfivpPUIgrPVMYD5f6 S+SXUbfwOwEADYnnRMWBbVxsYuMHUbEAcnrS6BdRiUCVBOTqiCOqCgH7Eo2LzNM/b+in0M 49n9CjYnNB+F0UQchWgc6+nNeWUSr+c= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 24e338b4; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:10 +0100 Message-ID: <20231211014429.1841681-10-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 09/35] avcodec/proresenc_kostya: fix chroma quantisation matrix in frame header 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: UnrACkBKx8kB --- libavcodec/proresenc_kostya.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 2d45f9a685..103051830a 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1019,7 +1019,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_byte(&buf, ctx->quant_mat[i]); // chroma quantisation matrix for (i = 0; i < 64; i++) - bytestream_put_byte(&buf, ctx->quant_mat[i]); + bytestream_put_byte(&buf, ctx->quant_chroma_mat[i]); } else { bytestream_put_byte (&buf, 0x00); // matrix flags - default matrices are used } From patchwork Mon Dec 11 01:35:11 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: 45035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651892pzf; Sun, 10 Dec 2023 17:46:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsxHPhe/heU4s//+cKL8HrFxNiA0s1Q/UUAroFbiLxUgHTv/kgZOSZAZ9DryISRXT+EuFm X-Received: by 2002:a50:cd56:0:b0:54c:b72b:93 with SMTP id d22-20020a50cd56000000b0054cb72b0093mr4390923edj.25.1702259161498; Sun, 10 Dec 2023 17:46:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259161; cv=none; d=google.com; s=arc-20160816; b=imqtPIXqWK/jQryhBq7wWWOYySr1UlUFUigsZ4Rlz7OMCVXA43Oq/4b3UEhWs40ins m0UcFXFNTLSpte2Teu8f6yhyVtf0CWruSaOncf8LnfDCDlh7re/TQ0i4L/F0DpMirDL+ ETbphqgCzpYXnO5tvtcNFDL+bDSG4cLg/LP0/FuDA2cyVdO0u0fG2LE5BJTfp5Pb3kUn MLz5L7+hJ5hVKwu6QT+XLBf9H9mLmRjNjZihjXldsy8RuKDkFiqZXr3NyIbgwxbe5XT1 7ySOmAusZ2LNj3wWxmStPS2Sa/bOTf9HM5QKYAI7a4dBeQ3U5uY9HU6HsPEwL69/k3/j 5hCw== 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=AAc/OMVnWXsUPkJUCmhugvPYtYXx7EBWVWVNmomrzRM=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=LnsEafRq1dWMg5i2oAz8jtPtejBpc2lgBYq0LGpDlxJYeY+qXS+4ScpiNnmHpgGaXt e1lkeVYa6UnyY4ax0/dMpaJ1id/6UxF1g9LQT7savK1C11cqyl06+p/EISe1divt6o3o hlX+J12N3aj1roWzyRW2WHHyhiSM6XU0c4Uz+Zo0svhKw1HcuyVCxEj1+ilgkEyJj1w7 aZER26fs5evLODlpIT3tsdXw9zp5GHDQCc5r4eTSPcoeapzAG7NmFuV3vzvedneZZejw UTvBQG0hcASul7SkthMi9LLz3MhMtbyNLvXEhW0y4nXYW8TLx4CwV9IQOj2suJaEnU9l M71A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=VMB0l6mE; 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 v29-20020a50d09d000000b0054d06e84f96si3043255edd.426.2023.12.10.17.46.01; Sun, 10 Dec 2023 17:46:01 -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=VMB0l6mE; 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 0BCAC68D16F; Mon, 11 Dec 2023 03:45:00 +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 9E25768D160 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=1702259076; 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=36g6RjC/RtWkzig9xj8iTzkK3fL2xUZEKA7biGZhECo=; b=VMB0l6mEXNXjavz6xQtmrAa22RMN7kRRYmUes19/EkqOHaus4VZyhTLvNKNC1E3vACDEWx hNO9SpizSL2iDSgJVDso5LfO7tsS4YjD3EtBqW/T1OAhV/d5WftoRDYcCbMUox4/FAfjfx ABGZP10nicHSBkyCBp9VOshSY2oDNcg= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 05eec223; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:11 +0100 Message-ID: <20231211014429.1841681-11-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 10/35] avcodec/proresenc_kostya: simplify quantization matrix bytestream writing 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: EyqMG3l2GA0n --- libavcodec/proresenc_kostya.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 103051830a..e0aa7cf47a 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1014,12 +1014,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_byte (&buf, 0); // reserved if (ctx->quant_sel != QUANT_MAT_DEFAULT) { bytestream_put_byte (&buf, 0x03); // matrix flags - both matrices are present - // luma quantisation matrix - for (i = 0; i < 64; i++) - bytestream_put_byte(&buf, ctx->quant_mat[i]); - // chroma quantisation matrix - for (i = 0; i < 64; i++) - bytestream_put_byte(&buf, ctx->quant_chroma_mat[i]); + bytestream_put_buffer(&buf, ctx->quant_mat, 64); // luma quantisation matrix + bytestream_put_buffer(&buf, ctx->quant_chroma_mat, 64); // chroma quantisation matrix } else { bytestream_put_byte (&buf, 0x00); // matrix flags - default matrices are used } From patchwork Mon Dec 11 01:35:12 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: 45038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652006pzf; Sun, 10 Dec 2023 17:46:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IHdwZYV6ssqQAKpPkADM8kHR9Z6LyJ8ozDbZiwBv8E0sPsPcOxy4i/eBWbZ3EeTbO6Z5CBL X-Received: by 2002:a05:600c:16d4:b0:40c:275b:319 with SMTP id l20-20020a05600c16d400b0040c275b0319mr1720721wmn.111.1702259186738; Sun, 10 Dec 2023 17:46:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259186; cv=none; d=google.com; s=arc-20160816; b=EJYyxdhoHYrI0Q9GGIwU6tmbqAI5l1Et3Vt4JGT4USLDOgv8/zCUp0luEOtVfyl2GE kbxDjI/8laTFUe/aVwc2TVtk+uaesPLeEn2gy08reMiJn/dkQsjCD+xntur+2M9OXZbh HH+QUUBFDFye7JUXLTIRFwA/qJQsgRm1rkiOJ0TRyDAgxWlzSTfwMf1cNx4LLmsHIWGf QSagL9OGPNr+p6p7VVkHLfXc9doVoULhe5GAPRT1yuKuU1NB4obU1sqOcAf9eGLrtHmA rSisvK2uEzKaBFIX3gag0UaCqlC9nTO4Fk/mQtyoPjcyWfxt5vqIWna1BARy6r+GIAO2 cV0A== 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=khmTSMSTbwENMl5iRi0zKO7G8HxOwf70ZS9hJNIJGiI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=wX2dJM6jRHKL5o9Ko0R8h/Go1EX+xINVxUQila6k33/GxiNvWD5XAk40qQ9Nd8vyA7 Acd9E1IgqdTyvqgY91cqRkq5S9V8O9EoLA/z4B2o8+W14SplKMPozr13TaFVMj6S7NPv WwTIHh9nsQa5lnJsTcWc7pvOH6tb2tmS7vyotkEKJXLyBWC60dkVMhJkRKRaN2aObzCM 2lIH8tzBAGd/okyets+VVTaI14hkZBKsyV5lm+7kxv0GozNwPbxOG5YVUeuUp+xNvjW5 b1YEY9C9bi7zsxlmdkxGwm6I7gvCJh9YM7u1Hsv/hzRj2KOrpCQ9hrhOmmuxA8xHHQce yuZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=EOQ2moCS; 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 dz13-20020a0564021d4d00b0054c656d8016si3339326edb.511.2023.12.10.17.46.26; Sun, 10 Dec 2023 17:46:26 -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=EOQ2moCS; 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 C098368D189; Mon, 11 Dec 2023 03:45:02 +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 CCCBA68D163 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=1702259076; 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=UWCvK97RsmuUKTiKT+hUqc1qhvGXhP/+YLicTMFxlJU=; b=EOQ2moCSs7Zfhwk6Y1bOQuPzMpBsJw38gywYY79KVNF1b+ru6sYTXJd/M4LLxWocbWIffx 3Jk3DPIUgcvcHNKl71wUJNSB1noMaf8n7ywKYMnAqtJfKILBppmi1o6Dip2PMDK/+SQm0Y pf7IpLtQ9I1/M72Ij5pVmHHsumwgjA4= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 19d2d5b7; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:12 +0100 Message-ID: <20231211014429.1841681-12-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 11/35] avcodec/proresenc_anatoliy: use FRAME_ID defined in proresdata.h 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: ulFp1dsE+4vc --- libavcodec/proresenc_anatoliy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index d6f5cefc16..804ff6ddf7 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -755,7 +755,7 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt, compress_frame_size = 8 + header_size; bytestream_put_be32(&buf, compress_frame_size);/* frame size will be update after picture(s) encoding */ - bytestream_put_buffer(&buf, "icpf", 4); + bytestream_put_be32(&buf, FRAME_ID); bytestream_put_be16(&buf, header_size); bytestream_put_be16(&buf, 0); /* version */ From patchwork Mon Dec 11 01:35:13 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: 45037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2651975pzf; Sun, 10 Dec 2023 17:46:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoH0WJVwBy9ZazQMIHV247vMrOsXxHJw1DWJ8LK7hWfe3gX3j9Nx4Q+OOh02lE4VbHU+EZ X-Received: by 2002:a50:9e6b:0:b0:54b:5a7:143c with SMTP id z98-20020a509e6b000000b0054b05a7143cmr2629855ede.3.1702259178199; Sun, 10 Dec 2023 17:46:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259178; cv=none; d=google.com; s=arc-20160816; b=ajtKuMk6OxOm3UYBSGUX3R+JBY6Y53U1Dc4dvLOlekuN7+0nplOe9dKMvOjo7bK01b sBrUFvJEj4oFlKWAUFqUGQh5LzQgoRjtigtz7ClhcuDrRv5sFtJH5nkZG1mO2CxWMQ8G liGfONsAeEJbK8pUiDsdcnWItAY/uKcqtW/0ifahF7al9YcWl9Uey+FUuNNaDeGNcuty IVXcBT9Fq/Gyf5D7BqcPcWL7cWlhBKAfFdcKOIB/c05qOZ1Jth1RABraiBA4sJHpO7cM F06AwUnWK/3mwkYVKpy7h6nlhMdl9WoJk1IURuR+QcubUtwfbDhd3NKSCkCFtI0Ex9Mh eCzQ== 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=D8BfFmZS5xw5U0LpfOBdfnmOY46oieAIcAcut9E4Wh0=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=DzQmqwWUTqjtatVh3/3qV2XA+WKe3rtTITpH77qKS/1q2XkdA2JYjuEsBCds28GfI2 3tLm4lKgt73jNN6HzPu2i6FrBzC10EulFndwGAt9o96z3P9cx0lAii+jIycvCoJQ9vXW fL08xd+DazFOKJAM63Yx2WpngKNng2KDLDNdhSucI8VrGRHI2ipbRcYsKe7n0zfQmLt8 VF1z3Kdcke/e6bhdsanVNQIJEflO2+2MTncsCIpQ0IvYJgg2FCDsynAioHm6uis0ns1/ CMjBjPuRp/myKvWP5oVjuLU6//Zq08VHGM4Fwti+B5xgC/sEB102G3qBVDnfPBGucQQZ 5tfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=iqDB9WJj; 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 t25-20020a50c259000000b00550e9b850aesi1595320edf.143.2023.12.10.17.46.17; Sun, 10 Dec 2023 17:46:18 -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=iqDB9WJj; 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 B748468D16B; Mon, 11 Dec 2023 03:45:01 +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 CD5D768D164 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=1702259076; 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=ZLdH8urkpKGi7POPzIMiviV357+1+ySAY6iXJECUAXA=; b=iqDB9WJjtoysDYthzFVtpFn2wqxTLMsndjXrOVrzQQBv3PCI6cx6wch2jJFj052k56KfI8 /+x1Te9WicwpTzMtz/QvkQrCBWL23RD4BDiQY31fvVdky6kqHfoR2H67nswPw3y+RPzN1a MMc4LQ6ltRUl5R+r0R2GUjk/utpASYo= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 6b3559ca; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:13 +0100 Message-ID: <20231211014429.1841681-13-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 12/35] avcodec/proresenc_anatoliy: shuffle encode_codeword() code to match 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: S0v/ufM8Godt Code is functionally identical, it's just rename of variables, cosmetics and branch logic shuffling. --- libavcodec/proresenc_anatoliy.c | 45 +++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 804ff6ddf7..c7e43fc88c 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -226,31 +226,32 @@ static int int_from_list_or_default(void *ctx, const char *val_name, int val, return default_value; } -static void encode_codeword(PutBitContext *pb, int val, int codebook) +static void encode_codeword(PutBitContext *pb, int val, unsigned codebook) { - unsigned int rice_order, exp_order, switch_bits, first_exp, exp, zeros; - - /* number of bits to switch between rice and exp golomb */ - switch_bits = codebook & 3; - rice_order = codebook >> 5; - exp_order = (codebook >> 2) & 7; - - first_exp = ((switch_bits + 1) << rice_order); - - if (val >= first_exp) { /* exp golomb */ - val -= first_exp; - val += (1 << exp_order); - exp = av_log2(val); - zeros = exp - exp_order + switch_bits + 1; - put_bits(pb, zeros, 0); - put_bits(pb, exp + 1, val); - } else if (rice_order) { - put_bits(pb, (val >> rice_order), 0); - put_bits(pb, 1, 1); - put_sbits(pb, rice_order, val); + unsigned int rice_order, exp_order, switch_bits, switch_val; + int exponent; + + /* number of prefix bits to switch between Rice and expGolomb */ + switch_bits = (codebook & 3) + 1; + rice_order = codebook >> 5; /* rice code order */ + exp_order = (codebook >> 2) & 7; /* exp golomb code order */ + + switch_val = switch_bits << rice_order; + + if (val >= switch_val) { + val -= switch_val - (1 << exp_order); + exponent = av_log2(val); + + put_bits(pb, exponent - exp_order + switch_bits, 0); + put_bits(pb, exponent + 1, val); } else { - put_bits(pb, val, 0); + exponent = val >> rice_order; + + if (exponent) + put_bits(pb, exponent, 0); put_bits(pb, 1, 1); + if (rice_order) + put_sbits(pb, rice_order, val); } } From patchwork Mon Dec 11 01:35:14 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: 45039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652056pzf; Sun, 10 Dec 2023 17:46:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFENTgIvvRhIy5hN3XFr9c3XUs2JbaDnsOlsx4J/y7pyjzSntK8hBrnqRJUl7D3dxn7FDik X-Received: by 2002:a50:8e12:0:b0:54c:5419:c16c with SMTP id 18-20020a508e12000000b0054c5419c16cmr1553143edw.70.1702259194663; Sun, 10 Dec 2023 17:46:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259194; cv=none; d=google.com; s=arc-20160816; b=XOeFC1a8ZEPRtVmg2fDfrxtekGYaC1nGfJUc7xYs+GadwevHQGfriXy3x2jiDh1mjR IgF+hKIFbb9Np5mVOcNO5hzeuPqbvUPP8jtPeTlxeRtBUBq8VAz8mQvNe0A37VpFD/9q jIFW6shzT9/s1j4nILrHdosWaMZc0/jtnCPQuekK5x0Thxu+x8DKJeHlf8thcRX/D2jP Gr2hz90pwO/ITb1KWLO4YZAsdEi1Uyhep0ziKf/KZbWX9K7EooukZs9LX2+aEYofS4lI CnK7rcxQwZG0rI1QIHilKXZ6EflZp6lEEcR1C8DovlU6djReav6qBt8B/fP7UeouARb4 /RSA== 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=7IPTRzLaGZnblwWP/cV3v8rdmJuQoaTB46lUBl0tj60=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=I8GURClsYawrA4kIYGekBJvOOqMBvNPVPwB6nJ0dhNfotv5mapHx2DS+4bXTBlNjR3 RNYqTQyxHPvLYEouB2NEvt5DyxDgDKcDHN1UmwKmrTEoLbH/tCb3ZsgjojGbpeXvPZWg B1bKfglEhLPlidGGeoWq8r/vuzmOgkYWRsPAl37CzxGaBiVErefV67AfsZ0cE75fpvv8 /lJb+zNYAcxotGPnzm26PLOdn25DzuOfF+GMfj/fkQCjqVb+NBmbvbTdHT7Kc7RFSbd2 6eoyyP69bXMcCA4AVrFJZdrJ8NCwgIzlCOwAoQyu6EGgQ0FCWe0KPwX4onybBypManuJ pbaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=ERbPGFOp; 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 di8-20020a056402318800b0054ca37a260bsi3106964edb.654.2023.12.10.17.46.34; Sun, 10 Dec 2023 17:46:34 -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=ERbPGFOp; 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 DE8F068D1B7; Mon, 11 Dec 2023 03:45:03 +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 E00F368D160 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=1702259076; 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=V/LW2F0cbsHdOlWpnT7MfKgchK8fF2bqSRdg1aaOIq0=; b=ERbPGFOpM0vDyfbLZIr3RyEscnLnRpAXJ8B3w+/wddxwjzPtLB9AY4ImreQknAzXSWj+AC W18mBmazPzF5gfIYajgXT4K5f8bdgiQOzt9Krlv0VwXdB9QufVUiFWned9fAJmHHlLjyJ2 JMFXAriqgg4vjjCMNSyMkTmsxjqomvI= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 088b1da7; Mon, 11 Dec 2023 01:44:36 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:14 +0100 Message-ID: <20231211014429.1841681-14-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 13/35] avcodec/proresenc_anatoliy: rework encode_codeword() 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: tArbslLuzOL7 This matches the function of the same name in proresenc_kostya. --- 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 c7e43fc88c..86e436615c 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -226,7 +226,7 @@ static int int_from_list_or_default(void *ctx, const char *val_name, int val, return default_value; } -static void encode_codeword(PutBitContext *pb, int val, unsigned codebook) +static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) { unsigned int rice_order, exp_order, switch_bits, switch_val; int exponent; @@ -277,7 +277,7 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, prev_dc = QSCALE(qmat, 0, in[0] - 16384); code = TO_GOLOMB(prev_dc); - encode_codeword(pb, code, FIRST_DC_CB); + encode_vlc_codeword(pb, FIRST_DC_CB, code); code = 5; sign = 0; idx = 64; for (i = 1; i < blocks_per_slice; i++, idx += 64) { @@ -286,7 +286,7 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, diff_sign = DIFF_SIGN(delta, sign); new_code = TO_GOLOMB2(get_level(delta), diff_sign); - encode_codeword(pb, new_code, ff_prores_dc_codebook[FFMIN(code, 6)]); + encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(code, 6)], new_code); code = new_code; sign = delta >> 31; @@ -306,14 +306,14 @@ static void encode_ac_coeffs(PutBitContext *pb, for (j = 0; j < blocks_per_slice; j++) { int val = QSCALE(qmat, indp, in[(j << 6) + indp]); if (val) { - encode_codeword(pb, run, ff_prores_run_to_cb[FFMIN(prev_run, 15)]); + encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run); prev_run = run; run = 0; level = get_level(val); code = level - 1; - encode_codeword(pb, code, ff_prores_lev_to_cb[FFMIN(prev_level, 9)]); + encode_vlc_codeword(pb, ff_prores_lev_to_cb[FFMIN(prev_level, 9)], code); prev_level = level; From patchwork Mon Dec 11 01:35:15 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: 45040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652095pzf; Sun, 10 Dec 2023 17:46:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6KDgIy/jdJ3SXOSC8CWSIS8meOfeqxvogcp1ZuSoCVrK1UG8D0cwNVArfvtnECbHruTQk X-Received: by 2002:a50:99c9:0:b0:54c:d1a2:45fc with SMTP id n9-20020a5099c9000000b0054cd1a245fcmr3731853edb.3.1702259203288; Sun, 10 Dec 2023 17:46:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259203; cv=none; d=google.com; s=arc-20160816; b=hyXN9Wqv7oOAijfaAnoP8mJJi+tPVSXCXwNouVZElPOGXH33ycnndL8kmpeztag8K7 dV3VKkGa+KtuTXzxkCqScYqAaBvkR+GVLzEe0onrW35StvBpVNON+2pVo8IZn8xN4h7k OLI9E5CvNsWCqD0RjUzBJjvGf/GksAjy0IG8HkKrp7Pu0Csi34eLrUdJbIdtRllRGAh5 4AUkKYcze8vFJHRX7Pegn/XHwgaKWtLXa0kYj8gSpaBozSuXMBOlT6TGW0yMEs/ie3T4 sHZaOTw9MeaWNS1QQsrKSp5p1fBJtq1kC0Z0mqxLdFUdAfTeBaObBYRCsfU789KF+5g0 4KTw== 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=3RfcvhyMHNXtRual4vAM87dYx+MI+Uvo8NaGlmWdDIA=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=biUeoh3Q6MvcSCPVpw62JlcRQ8SUi+NUF5ucPtGdcrYtdSmvp2sWwFwORbke1izK4I Ht291ZNjjm2OgbhYeHG97WT4gSCwpl51NVGD2aGQriZgCK6/k3rKPXTgWyzR7kCP3AxZ NTAAhEvwQqYXnDvFwpBThFX9kqol8FSvKyMmhaAqDf0qP+bdNdcRsdcVTny1neJTawSr mw83OVnDXbimQE1yCnMF0Jez3MYp5RASLsc4IHcUWWsnRnJG2MDirAapnznN21X8jQnb le7avzAVF9swretw9FRI42zyjJ4LO1xKtXhaloZiD85160eXo6qkdMBIZnD/0KLsjsfg M1PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=I0gDCIrk; 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 q5-20020a50cc85000000b0054c511feceasi1367503edi.195.2023.12.10.17.46.42; Sun, 10 Dec 2023 17:46:43 -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=I0gDCIrk; 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 D118C68D188; Mon, 11 Dec 2023 03:45:04 +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 F2FBD68D15C 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=TV+moDhTIhipzMteuPkQ9dZv3KuGcXIawUhwMNjeY/o=; b=I0gDCIrkfOkaqJ7cTw5tMMiSZbAY8AvNPfHmDqYOqW33AqijRAzF8ASbbcJChlraDzFBcD w+yEcG9lCjwHKqABL1GZPvCUwcbtO/VjupitLiZW4k6Q6t+AvRdewuOCJvqf1vRx2EOliK j8GpuChC9KTKRxf7GoaPj9EYc7sA/Lo= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 56ab491b; 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:15 +0100 Message-ID: <20231211014429.1841681-15-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 14/35] avcodec/proresenc_anatoliy: inline QSCALE() 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: xxan5Mc/HNfO Also replaces 16384 with 0x4000. This makes the function slightly closer to same function in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 86e436615c..b8433ee872 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -255,7 +255,6 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) } } -#define QSCALE(qmat,ind,val) ((val) / ((qmat)[ind])) #define TO_GOLOMB(val) (((val) * 2) ^ ((val) >> 31)) #define DIFF_SIGN(val, sign) (((val) >> 31) ^ (sign)) #define IS_NEGATIVE(val) ((((val) >> 31) ^ -1) + 1) @@ -275,13 +274,13 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, int i, sign, idx; int new_dc, delta, diff_sign, new_code; - prev_dc = QSCALE(qmat, 0, in[0] - 16384); + prev_dc = (in[0] - 0x4000) / qmat[0]; code = TO_GOLOMB(prev_dc); encode_vlc_codeword(pb, FIRST_DC_CB, code); code = 5; sign = 0; idx = 64; for (i = 1; i < blocks_per_slice; i++, idx += 64) { - new_dc = QSCALE(qmat, 0, in[idx] - 16384); + 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); @@ -304,7 +303,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 = QSCALE(qmat, indp, in[(j << 6) + indp]); + int val = (in[(j << 6) + indp]) / qmat[indp]; if (val) { encode_vlc_codeword(pb, ff_prores_run_to_cb[FFMIN(prev_run, 15)], run); 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; } From patchwork Mon Dec 11 01:35:17 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: 45042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652180pzf; Sun, 10 Dec 2023 17:47:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhhpONazs9auCVY8VpfNw0S9QgdUAKg1b0gCD2ygUpGJvlKJYqpCNuv9PENOrCZiq+nQeV X-Received: by 2002:a50:c05b:0:b0:54f:53b1:c941 with SMTP id u27-20020a50c05b000000b0054f53b1c941mr2100624edd.13.1702259220147; Sun, 10 Dec 2023 17:47:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259220; cv=none; d=google.com; s=arc-20160816; b=eEjkmtZSoWcFypfi6OM4O+7S6sduG8IuiBN9/F8zy9VZtYP7RDUUWQD4Hp60ucBifg SREZPVu7YBQYM/WejJsVlI6UYegjazAP67VcsxDL0UphIPOv0O+xt+At1ACK+ypUbno9 Py9zBJBlSdJM0JLsBRxjTbmxgTiop3KuSPRpDz4VM6F9SJdBjnmpAD0H8oOeLw+j4t0I GGD3vhE81fq1k8I4c93ryorCfeox3wAvHcKSg/iAYnTZEwdzeArROJ4jd2O2tiD4a/RM H35juWBs0P8O5Idc2v6IZCT4H8SmU7X3wrljBMOnPPst/LGwxQuTTdpWqu5jFe7EHVtk MhfQ== 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=a7XK55BZ4wbHVVyAYjMlAY4sO+sa+yhirc9DKq17S2Q=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=rKbK24SDxzzZshRzhKJXJOsJWqk8p5tv6yYOznI9zSL/anGUYodsv5v8J7rZTSe7zE uUSBuw1wU9m1XyWp49ZCbYMWOAy/LrBjuNUbiPt0U44U0qchPgvSO9wlWlEfX09iSGSk 5IUOu7Kh7CGxM6BGa+drwVeIf5C/O6vsoAkV1nT92XceJsLO7U3RCY3C3JRLoz9sXdQB worJ+hpOBzSzVVwVNCrs2Hh/4VFunACI3ejKBKWiMaGMm/u22hgvkxqlLs0u5dKtwNdb VP+bM0cYRT2cCv9lW69CtoEr4LWK2pg9fArozLIov1J8KigkIbd/G+PKinu8hJaFy/bE YKbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=OJL9WSuW; 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 v4-20020a056402348400b0054c90d54da4si3116414edc.180.2023.12.10.17.46.59; Sun, 10 Dec 2023 17:47:00 -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=OJL9WSuW; 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 B24B268D1C1; Mon, 11 Dec 2023 03:45:06 +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 171FD68D14E 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=KHml5dWrGJ6BzLdk1rJUTQyx1mpfMSjQR6ZRNM48UO0=; b=OJL9WSuWOob0Ns9g+pUKc49VtZKzl4MdUsdqfL3XqMp6rqQ/DTp+YdiSPYVu5GfpebcQKN X3aaYgOUJSrrp6kejHG6IruUya49bJlUeVoNXwF87YNtZyI5/7p7dfMXQj+hh0Fo91+ESB 7XSDtAcWgjs49ise8alMebHPSXoIGIY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 2f7dc0bf; 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:17 +0100 Message-ID: <20231211014429.1841681-17-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 16/35] avcodec/proresenc_anatoliy: execute codebook FFMIN() at assignment 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: j32jYg62tsFa This makes the function closer to encode_dcs() in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index e79c465590..f8feff850f 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -285,9 +285,9 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, diff_sign = DIFF_SIGN(delta, sign); code = TO_GOLOMB2(get_level(delta), diff_sign); - encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(codebook, 6)], code); + encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); - codebook = code; + codebook = FFMIN(code, 6); sign = delta >> 31; prev_dc = new_dc; } 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); From patchwork Mon Dec 11 01:35:19 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: 45045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652292pzf; Sun, 10 Dec 2023 17:47:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGXW2iFlbqZGMbTRkaYNjTZfSjYFs7MFgA/2r4GQVePKPCX4sapgz/9dW12ql127Ko7aPJ4 X-Received: by 2002:a50:9f0b:0:b0:550:18ea:4270 with SMTP id b11-20020a509f0b000000b0055018ea4270mr2343517edf.59.1702259243790; Sun, 10 Dec 2023 17:47:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259243; cv=none; d=google.com; s=arc-20160816; b=W1of8MBit4EN61guorjm6p/+kr0nkvQtI37CvL52HroxfYRdMuASSsfsmXMpKtygG+ EzQ9XCSsCY6quPVc7azwr0H8mEennoTsAJabA9BoMrYVAXbsdAE2WK1exmN4FkSw6+WJ dx/DeAMdkAhnUU7sTdSThkTHIcAu+6yq4GFIs0OVPFcMa2TfxRuJ7GJHfZrJAKaoH/tr A9mUW2ZKavajkGst40DRfcUIv4VJqXFBS5yEf3ybZrhl01WFkRRpENEpzr1mqngfvxB+ PUM8aGNgeATQTdXLK8XPsHT6jzUHCItxh+yVXwFsPBB8ez7ZcZ2Va3qhTxtP73MAI8QO SWzg== 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=Zf1iAwAE05jO2q2LKyrZG3mFVckuxj/X59FastIH39k=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=rnFYhakfXvF7+BSkhvcFMED0rNNJUmPnxdAzwRa2NzCDkfe1JDP3iGezT1MyRq1gSf YCjYVAvLkTzcT65C58zaB4U3CwvBGIPEePHPVbfKQ9D9w1W/1fjXJbrD98TqbMCmUPCd i+8fxcvNX5XC7CSi7jpiNmbE8klF0nyf8WA2XjXW+r9dgzFsmkPJSRIamiWZvjsg11Ux fkDUgofD7VyAW/851Wd28F4Ii0+dSU8oxqgsoi1wbWlF9NwGTr/+qoDrq47yeOD15i+E /iyh+uOkJf1MDhs2h+3W3+sfvbaf+HM5aG62HT/RYvdu+9XZZ3/Vwsy/swnND4QoL5At OejQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=qp+kiEyR; 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 r15-20020a05640251cf00b0054bb95548f6si3262059edd.323.2023.12.10.17.47.23; Sun, 10 Dec 2023 17:47:23 -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=qp+kiEyR; 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 3A5DC68D173; Mon, 11 Dec 2023 03:45:10 +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 46A6E68D15C 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=DZMdJFIzVdev7xVXTOzxBzmDuEeg5N49lh8wwFcPbbM=; b=qp+kiEyR4YMEBg0rrHBmt0w4Iuwy733U10czDC0GLLuTXe4YZNeugiiKsxbBTR4w4B3LfW zIhJqwYXCtVlzBpNB4rxnbe1zVrscb5y3v2SJJ6cfRdh3NwB2RGW4eOqI2zOY6LlMt/mSB TggGv1U8h1e8wN+5M5Btr+F9rbzpelA= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 91946794; 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:19 +0100 Message-ID: <20231211014429.1841681-19-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 18/35] avcodec/proresenc_anatoliy: directly work with blocks 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: gFYs06e+nbmg This makes the function closer to encode_dcs() 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 97d681467d..a418a12705 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -271,16 +271,17 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int *qmat) { int prev_dc, codebook; - int i, sign, idx; + int i, sign; int new_dc, delta, diff_sign, code; prev_dc = (blocks[0] - 0x4000) / qmat[0]; codebook = TO_GOLOMB(prev_dc); encode_vlc_codeword(pb, FIRST_DC_CB, codebook); + blocks += 64; - codebook = 5; sign = 0; idx = 64; - for (i = 1; i < blocks_per_slice; i++, idx += 64) { - new_dc = (blocks[idx] - 0x4000) / qmat[0]; + codebook = 5; sign = 0; + for (i = 1; i < blocks_per_slice; i++, blocks += 64) { + new_dc = (blocks[0] - 0x4000) / qmat[0]; delta = new_dc - prev_dc; diff_sign = DIFF_SIGN(delta, sign); code = TO_GOLOMB2(get_level(delta), diff_sign); From patchwork Mon Dec 11 01:35:20 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: 45046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652336pzf; Sun, 10 Dec 2023 17:47:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpqPdOxGsqQJ3p7y8yk579bTCxiKWjyY4paPTrpn6B3VGHKGmx9BJ9xCieAHT5Dvb4yre9 X-Received: by 2002:a50:f604:0:b0:54c:c745:49dd with SMTP id c4-20020a50f604000000b0054cc74549ddmr3376320edn.19.1702259251502; Sun, 10 Dec 2023 17:47:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259251; cv=none; d=google.com; s=arc-20160816; b=fPoPTMP9NU837P0Jx5rnn5KF1LArEY9ryMWAFU4tOp9/AuHurh1IEE0Uy3iYDKTtKH qmI7eNid1bE4DZe/bdg8QGGBCA0uegubRqrhjjsPnabA5vLMfsTE4Ev5T+pZkK5AalHn LoQgOZ5qDRRNIhqkjpWi0ibITEc1VDjmUuy3XANQTp+su7IdOBFm0K3MKHy5XTW9+eu2 r596i/qfOVnFTAPLuw+bhC+oCt1wqOIBg3ZACXpAFKKgWsjxTL9913TLmCxm5d59h2Fg M4gXAl+7mPbHJ8QcpqAf//tdHxCk04/SQ4+lZru7TSbNrJf956q8SJskCEWtT+sapf53 ym2w== 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=C8imFd9hBX0qTAD7E3GWIZrR4+2uw1/nXa7vfuWUbEM=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=dzV9f6cV0mSCRBVFUqBC3cBgtSlKnayFU5f2TEfUfb09yoWeIpo799dRrE2QPyaIbY 4P0ysaP5Rwu/oeGskVubs4m6cPrwiZM2AwOxmpI7fadZY+Mj/0us3B2sUaQG8P8h7nEp VkSDilMOhFfsZY21bjI77uEflj6QWBCDjv9T1Xgd7Y2PVyxLearUneeesmAvQsO9gIOA QU6wW8fzWq0/NyjOqzYlcDsMXEmzshUfAX8oDLJzUdAN8yXPUsCUypBUWna4WU9BAB32 gcmComr7sj8LKjXH5eJxBKayBK7yU8Qs0GiyIEAZIve1/O6SlSrs+8d7TLoNf/D2zCh1 pJYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=HkltBOC8; 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 i23-20020a50d757000000b00550f52c70aasi1487977edj.271.2023.12.10.17.47.31; Sun, 10 Dec 2023 17:47:31 -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=HkltBOC8; 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 DF40468D1CF; Mon, 11 Dec 2023 03:45:11 +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 4708668D160 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=BQXPyOWpPl6DiHzxHA2ORSB1EKuKMiOXJZgfo+4xbek=; b=HkltBOC8T3sN03PbwLrR+Al5Ub4CsUNf0rF7+/6J/5EGAtjiWA4sci8YarJxTrXgYCmBWo tzUd/vxIOwzXndkh3wZcsTziaG8o0PLzMMH8NTqZyAy+7rD9rgzwytg4//BjjbiFUqe7/Z NrJhhsgumWFPPdFOq6Vy6prV5Y+QvS8= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 15198005; 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:20 +0100 Message-ID: <20231211014429.1841681-20-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 19/35] avcodec/proresenc_anatoliy: import GET_SIGN() macro from Kostya encoder and use it 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: 5W2iTeOrfBoa --- libavcodec/proresenc_anatoliy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index a418a12705..0de262c9c5 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -255,9 +255,10 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) } } -#define TO_GOLOMB(val) (((val) * 2) ^ ((val) >> 31)) -#define DIFF_SIGN(val, sign) (((val) >> 31) ^ (sign)) -#define IS_NEGATIVE(val) ((((val) >> 31) ^ -1) + 1) +#define GET_SIGN(x) ((x) >> 31) +#define TO_GOLOMB(val) (((val) * 2) ^ GET_SIGN(val)) +#define DIFF_SIGN(val, sign) (GET_SIGN(val) ^ (sign)) +#define IS_NEGATIVE(val) ((GET_SIGN(val) ^ -1) + 1) #define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign)) static av_always_inline int get_level(int val) From patchwork Mon Dec 11 01:35:21 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: 45044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652256pzf; Sun, 10 Dec 2023 17:47:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEm3cpURnbzbMtbcF3kHW5zY/hO+AWfmMR6OygWhPb6+kbkG0W/6Hzok8ct8l/wXCg5sCeB X-Received: by 2002:ac2:42c6:0:b0:50b:f091:3342 with SMTP id n6-20020ac242c6000000b0050bf0913342mr1348473lfl.39.1702259236011; Sun, 10 Dec 2023 17:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259235; cv=none; d=google.com; s=arc-20160816; b=xUQlolDvmCtDmiwVu2Bdk/f0hhWSaWPOYHEsGxE2SnOFXwGtAn4Y1lvXtzVXacHG9z Hj+eTEYHzoiJElK70wHVdiqzQq7+ZroKqjN+aysi3sZ3EEgzama9RCVhd2HCLPy1uQcy 7EKF79rFDwd2sg7S1oeHCpVftPmr/tUudW0g96CrBU8Kfzfll7+snwQlWzfGOcETmvcZ WINWs4rKyIclEW6/LI3ZV3GKo+Vd+VxWujQoYXR3hPkdpqn3NuPS8gBvDLV0lJeTrIq9 j99BlppM54JCElqcfU08BGWQE0zS36ag86ZWWVSTJnbNB8BMpp2q0FDeyH4tUTnEP1C+ xFAA== 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=rEd3hlqST9pi6ldupfOouB6jdjDnvj6Ig/U6bjcMc68=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=hq84t/0q+D+SBAeaPJ4octlUggtOtgMc9VpdOGLl/CBBNztTVbRxoJ+RJSr5M7beYe KcsmgCcJFsqLPX0Q1TQ8nfRlRDWiUQUE81EqKqZXlpSx4FNTDW4a2HWk7kjpmEZVHbr0 CauiWtcKXxfk1VY+SYuvsMtraqOEz4p+592eDEmrRCkAHegBcIPFlu8pQi+9GgK8vmd7 T4RDmiaa6LBOeSf15+qJkNya+7c5/YmVjD4ZbNSi0qvaQb4I5MieJVxJpZ4g7fm2xij2 Vd16JqDTGrWGXHep0ZsyEtPxIkM0FAf74QDz1v477mp8W6GnaepzMnmEb07CXbyyYu3c iuHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=IsXTbmKX; 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 j21-20020a508a95000000b0054c91ee1620si3003208edj.263.2023.12.10.17.47.15; Sun, 10 Dec 2023 17:47:15 -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=IsXTbmKX; 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 C22A568D18C; Mon, 11 Dec 2023 03:45:08 +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 49CAC68D16E 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=9Ri2cLMbKToPWbC6sbs+kDIGydwnsV8Csew8V6ySmKU=; b=IsXTbmKX8ZB0a/zQYXbNkZZe9/FaNVjYGprjk/2AC5O+kcM3OoIhIh9ge1wRiM9yVWRkEe eDsAknZxpHBbmzpdVcVGYsoiLEUo/g5cO7au70+YW8SM0RtgR1XqQ/hhQxfZBjnYuwTMsH j14hRTtrP14GeLefvHgzp8WEEZqvDCE= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 870b8db0; 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:21 +0100 Message-ID: <20231211014429.1841681-21-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 20/35] avcodec/proresenc_anatoliy: compute sign only once 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: q6Gz9RST96n5 This makes the function closer to encode_dcs() in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 0de262c9c5..0d8ca5515f 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 TO_GOLOMB(val) (((val) * 2) ^ GET_SIGN(val)) -#define DIFF_SIGN(val, sign) (GET_SIGN(val) ^ (sign)) #define IS_NEGATIVE(val) ((GET_SIGN(val) ^ -1) + 1) #define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign)) @@ -272,7 +271,7 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int *qmat) { int prev_dc, codebook; - int i, sign; + int i, sign, new_sign; int new_dc, delta, diff_sign, code; prev_dc = (blocks[0] - 0x4000) / qmat[0]; @@ -284,13 +283,14 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, for (i = 1; i < blocks_per_slice; i++, blocks += 64) { new_dc = (blocks[0] - 0x4000) / qmat[0]; delta = new_dc - prev_dc; - diff_sign = DIFF_SIGN(delta, sign); + new_sign = GET_SIGN(delta); + diff_sign = new_sign ^ sign; code = TO_GOLOMB2(get_level(delta), diff_sign); encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); codebook = FFMIN(code, 6); - sign = delta >> 31; + sign = new_sign; prev_dc = new_dc; } } From patchwork Mon Dec 11 01:35:22 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: 45047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652370pzf; Sun, 10 Dec 2023 17:47:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhbiwM+EOA+tKz2Bn9pw6aBxy9GrH/fmsAvRCFsuEXsVzNIJIws7c94Bpfc6D8RUbLTLOm X-Received: by 2002:a17:907:72cb:b0:a18:e9fe:2d9 with SMTP id du11-20020a17090772cb00b00a18e9fe02d9mr2682048ejc.25.1702259259733; Sun, 10 Dec 2023 17:47:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259259; cv=none; d=google.com; s=arc-20160816; b=xyd0afmT63Ix4glvO2hwgy1h6FHic4W+qr+y9Vs8vb2FB2TpWF1fKL07I5CapPCVje ldcQZecZZZmjV2cd2gxwr/ZyUTOZFlsPpe89Im01pIahVHaHApGutkaF7SPBzktiAIrd UXYKliHXkPAIFXWX15N2Y1hU73bKv5W9IXAQahNWw8jVbr/u0Y3Ewhu/J9QqWpIWb2Vl hpamVUWrF30L1VMA+eu3/mrl43uKS9U4AIpYaIhgDTigQDrEny0Fi5GClaW4oYSyQFO6 4H2zPr9/yb+labu2CTUokUT/ck/Uf8jJVPqCIGn0cogfEymu91c31OMlZPr2m8hI0feN MQAA== 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=gOwm5scF19fuNDC8yb8myGn2gkPEMWuPI0s80TrOqEM=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=FMSxZOOG5/DsyobRrlUUEjAW6yewHgJgJDizaDw18ZBgiq6yoxSkf4GXQL7McT1Ugw 0bBpfWvg0LADPEj7+WmDiEB2zETtJyfQUKL1OCWHbj0+2WNNfw5AIr4WFnkreE7VJQie ky1C8uIztGt1MWMac9QeyDoTD0cslDy9wRmEWI8oMjymCEDMndNn71IsjmLhkTQZebUS 9ckDvrudGkvops44F3pUNgUtcsKFmPdm0849Vo0jv6ssonxyhFqBZRbQbLuU5rPjW+Ax EQtandmsS2CgzNVvluzjfvmxg3b0tsApnif+3kyiDoVBK+/QVDquuge8QLVDOYDgCjRd JJMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=Y3IGgON7; 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 h6-20020a1709062dc600b00a1db5fb8be7si3131188eji.418.2023.12.10.17.47.39; Sun, 10 Dec 2023 17:47:39 -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=Y3IGgON7; 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 D548D68D1E1; Mon, 11 Dec 2023 03:45:12 +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 6FBBB68D163 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=x1b34ba8fUf41R9RFIQYdS95Zwtcfy0JlD4eanKFonc=; b=Y3IGgON7ry6o1id2c7CASYG3wgzEi8YhrIvzY2iAUkmdYDTjYsk5+4+QTxqdmhDkLLSK9W 3/qa7MtIjLuuYMni8SaXK4rQlYKGPVTjgqyLfFubU67sNFhuJDQTHHSJcD/tjUF0EVscWD aXX/AS/IJgyxE4339nOEUObXSH7cCcU= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id fcbe1862; 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:22 +0100 Message-ID: <20231211014429.1841681-22-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 21/35] avcodec/proresenc_anatoliy: rename new_dc to dc 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: WJ0x3Uk5/pWn This makes the function closer to encode_dcs() in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 0d8ca5515f..4ea3d89126 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -272,7 +272,7 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, { int prev_dc, codebook; int i, sign, new_sign; - int new_dc, delta, diff_sign, code; + int dc, delta, diff_sign, code; prev_dc = (blocks[0] - 0x4000) / qmat[0]; codebook = TO_GOLOMB(prev_dc); @@ -281,8 +281,8 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, codebook = 5; sign = 0; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { - new_dc = (blocks[0] - 0x4000) / qmat[0]; - delta = new_dc - prev_dc; + dc = (blocks[0] - 0x4000) / qmat[0]; + delta = dc - prev_dc; new_sign = GET_SIGN(delta); diff_sign = new_sign ^ sign; code = TO_GOLOMB2(get_level(delta), diff_sign); @@ -291,7 +291,7 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, codebook = FFMIN(code, 6); sign = new_sign; - prev_dc = new_dc; + prev_dc = dc; } } From patchwork Mon Dec 11 01:35:23 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: 45049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652457pzf; Sun, 10 Dec 2023 17:47:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IF07ChQECGw1qHTyuKyYbomUBhZuB6WCDTm+ohoowN0mfCboMR/VOmS2xgs7OorMvkF7Rju X-Received: by 2002:a17:907:cbc8:b0:a19:a1ba:baed with SMTP id vk8-20020a170907cbc800b00a19a1babaedmr1210210ejc.147.1702259276201; Sun, 10 Dec 2023 17:47:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259276; cv=none; d=google.com; s=arc-20160816; b=Z9a6+6CoBx4diSsyP0Q2VXeYLsDUk0DRvh3nMHoh04/QxVYhhcRL8ph5oECEtDxbL3 /jc+g+KajyCGz4i2b1N62Yes0BylaOYdVRifYq2J72MiFeju6QK54znQuCfwkbl7BQ7c i6rzL5zeIePdquYZXVyk/ZQys8Lb/RjOOTvvRNioSeiEpf6i4GIdx6ns3WeymaDiDzZH NHajpM9eYU+cayW8e0x0t4Evt8ZcI41Duc0XbBItx4US9W2wZfQbSqkf2y+ARl7vn9+n WW8aPZM9Lkn064bhje9Uagpi0a00OuPFpeYrC63OvahPFTDoOcmAnf+xoDu3fKfpC6G9 92jQ== 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=wAjRbD1oCmXfAg8U18lp/c+QmM4Pt5w+7jcsdjb1bn8=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=vT1otBNVUrgTUCFfXARJlEcirWoTvGBfVp8DXEnaxMcPfaWOmBntdofc079rpyGLlq WCA7ZQm+E33LR1J+vHVIB/DaRoEmo4szq4pw4qQEPj5wid64BWW0FVgbP5MdQKIjxoEf AaFX+zbQ/eAZGJ0huTc2dQqYsePOBQWfcKjoREC0LXNFUnSlXnWRoQ1xaZePDtyS+Com FpccA+jcVwiHFmTJcTRn9SgYaOo+1iesNfJVtBeKw7ZcR6oUwF5zC1hEqI9zHn5HtN3i kib4+jr5MMXN3zwBghPmW6Wke1cg5pKU6yhgId89fHTA+YweC6QhPGPZ9eGhp+HzV/m+ L8Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=q96CExb+; 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 t23-20020a1709063e5700b00a1b7751c0b2si3008653eji.526.2023.12.10.17.47.55; Sun, 10 Dec 2023 17:47:56 -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=q96CExb+; 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 144F368D1F0; Mon, 11 Dec 2023 03:45:15 +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 74C3668D16F 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=ULUBJHuJgxKO+V/fILNLgqaOMIuXCsSYMV8JvksN9sw=; b=q96CExb+dPXH8EYRTpOcOwwKU3L2ukyGZXnLw7IvZVcnt0OTnftJHmX2yuZIWFXFWccjx/ GPtpTPxK1mwwBN8+3lOuZK6ZBpnNMCssIOqXj7e2zn6ml8ylkHaVdB9L+YaGk7hFl2Pt1F BQ/Suq2/XgZ5RsPOmHubu27h0iY7ADY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 2608b290; 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:23 +0100 Message-ID: <20231211014429.1841681-23-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 22/35] avcodec/proresenc_anatoliy: remove IS_NEGATIVE() macro 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: 3U1ntXnc4xHS This makes the function closer to encode_acs() in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 4ea3d89126..43dee7f79b 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 TO_GOLOMB(val) (((val) * 2) ^ GET_SIGN(val)) -#define IS_NEGATIVE(val) ((GET_SIGN(val) ^ -1) + 1) #define TO_GOLOMB2(val,sign) ((val)==0 ? 0 : ((val) << 1) + (sign)) static av_always_inline int get_level(int val) @@ -318,7 +317,7 @@ static void encode_ac_coeffs(PutBitContext *pb, prev_level = level; - put_bits(pb, 1, IS_NEGATIVE(val)); + put_sbits(pb, 1, GET_SIGN(val)); } else { ++run; } From patchwork Mon Dec 11 01:35:24 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: 45048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652411pzf; Sun, 10 Dec 2023 17:47:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEi0NOlxn+FO6tp9UleM/TtBu52FMfYhJJ1f7pCUD6RWRT5MM6UHmX6BNJeHenmsEXkXyBv X-Received: by 2002:a05:6000:1755:b0:332:cea3:ac7d with SMTP id m21-20020a056000175500b00332cea3ac7dmr874608wrf.2.1702259268265; Sun, 10 Dec 2023 17:47:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259268; cv=none; d=google.com; s=arc-20160816; b=hkxFJORNHMhI3WOa9V/dyUohTYhs7PqiSrW/PIPQV0c1HdcAJzioZuRWCzn+JVm5iI NraE3v90vLIWJdpKRG8l1/9MGy5C2zDp4StSIGwUlfH0JIY/A9E/no4uudVbOyn2CooB 2ArSkmm3cP6b563f0A8vAYZyJ3dMnM/sR5kt1rL9otyxt+jI6NvsoaR/hRRFhYkA4OWK TEP8FAzS41kfPxPmy8NBW4GuVLk7zWnh9qmM1B+xp4ff8wvf1akePYrH4Lsrt04fIuj8 GtjdYyG9sp2vA/oss/BdJuLP9OUmf7NEytiQdzO3y0D7xYYwh5JV7RkBS8RkvvbnZAtP mJhg== 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=1AEr06aHZ2A6MlfLYPNk2DmpgBj+cQfBV3mRx5kLrGg=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=u9khCAOGGoWKHdMDtzshvT3unxV3DYPCX4J2Iep6sLeByyvwrlyg2XdJ25bFF7a83w DzAOn5cWYYEKFU0xoYEDyUY7lfYSB8D3k8IM8dxkx3z1G6gpoplGoDiQ3rsZK7Cuyutj 0reBVoK6oymDsGCzHatxwBfa/vN7i4gsSV9de02I4uD6ZFe5mjnJ/csAb7+YFOqDoKVV vBVlsbFje+uATw6yy3fhHbYXfpnewXtYdMggb1o6d9OpDfhQmZgdCKRFO4P42gDwEwK2 7Vrx814q1Gq7P9eQf+QgR3EQ/7gD75E4nZyjUflWKc9laBAfcLfAhKTGfy42VrP2rGNz H4DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=KVkJRvoH; 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 ci3-20020a170906c34300b00a1e1afc4590si3272086ejb.646.2023.12.10.17.47.47; Sun, 10 Dec 2023 17:47:48 -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=KVkJRvoH; 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 DB6C568D1E8; Mon, 11 Dec 2023 03:45:13 +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 7504668D170 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=LXW9BUg5Oz4C/PX5FvAz6NYLPyFyW7bSzVRZDZ3ZFBE=; b=KVkJRvoH+NpTmiy2XP6EvefoOjnDhP7SwlgfVn2bMnakyileQOAfPTmiCf48vLpE2mL8a9 St7HKXCDFmA/f06vZzp99Nk/me5yl1hv1LbaILaOCvoom0iBMUKfDoLNIvNfiO+ooAnDNm vSUvCKu5/jb87o/dDb8d15auWb1kqfQ= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 1ce7447c; 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:24 +0100 Message-ID: <20231211014429.1841681-24-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 23/35] avcodec/proresenc_kostya: add Anatoliy copyright 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: w5DrH7qy8GSa Both encoders share a lot of code from both authors. --- libavcodec/proresenc_kostya.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index e0aa7cf47a..c6c045be73 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1,6 +1,7 @@ /* * Apple ProRes encoder * + * Copyright (c) 2011 Anatoliy Wasserman * Copyright (c) 2012 Konstantin Shishkov * * This encoder appears to be based on Anatoliy Wassermans considering From patchwork Mon Dec 11 01:35:25 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: 45050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652491pzf; Sun, 10 Dec 2023 17:48:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFmMkX65wsi3FPcvoACTathbxwf9iHRwWP/juarRZ3KR/nuWw1N24VwWh6N/TJ0sEAqaWnL X-Received: by 2002:a17:906:d6:b0:a1f:aca1:6bc with SMTP id 22-20020a17090600d600b00a1faca106bcmr108729eji.100.1702259284452; Sun, 10 Dec 2023 17:48:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259284; cv=none; d=google.com; s=arc-20160816; b=mcbi2gB2Acvn+LD7NrywvuztY18RjNhuX+KRY8JjlQOLbiiWNOifMVN/qUl7l8fNa3 s/+aEiE+MsLSTCpIT874v0W7kELtUHcNM+a++fjKy8qumC9j++AE0wdJijNX4tkBUYzw KOawpSpKlWrhm5ZeCBSxgVWg4FXvKaJ/IkvoRpv47xcr55EQEA7jeZzs4TntDHevf6za Tsfdnnr9teOCO0MRu1omkUBIHb7RY9za1B0UjzRMn54UqPSjOes9R2Id3T4xJtaaSLOn C3fPJcrbJz++YCEsxkjENYme8/H0xMhgnO7wveqiDpeZAI3mcwasp0+oqPi8HuyIU1/p VfOw== 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=qKeLKNFvFdXdLkSGqwkVLnH0pylzZamv9iuyRbLB7Qc=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=TbtVz/sLyGSQmKj/VJk5bAh3UY9E+qrJFY7Pymf/69YlUtxaIvEBLIiVi0BFV3fSnY nL5RQD0marJYNMOQ6pJKlP1/ddshm+pA/TpuPKdnMv70OkLj2NeOt104TXctr6Rx60VV jrd44a3kp2pkrLeOR8kRValcyoIXGgewi/TSOlfndLdeizSXR5WfMCGiJlDu6P3SZ4cM Ug/QzK9BZN00blBQKYCDpkKbE6FSXFIeB0sbl45glb1ghviz9xwxKfRgbBTvh/ingKPA hJ+gxnnsxgHW6hx+n0Mq/tTWoIjwu95rE7MA84PwcDfqBdhVRfBqUeo4ainCg7iU7buH VDLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=Hw43YmvA; 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 cb11-20020a170906a44b00b00a1cc1be1150si3120367ejb.650.2023.12.10.17.48.03; Sun, 10 Dec 2023 17:48:04 -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=Hw43YmvA; 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 3093068D1E9; Mon, 11 Dec 2023 03:45:16 +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 9E3B968D15D 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=FGQOV1YCxupRiNVZG0dnHYCZjujP22XjL+tdSKSEBo4=; b=Hw43YmvABAuNB/R7nzl056ofYH+s9M8lolED7NoWznv6BZYcSDpaflARY5MPJr8MRMsD7e Ap6PdFLXGBgOkcIOrFz5UvvBJTPQrHXxGEKYy6G0dPR93bCUGujIjuQhtTUNYbPYugxcOk PoS1Nfz/IHnvVjyJFXHJo6NuEBV7oWs= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id db284abc; 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:25 +0100 Message-ID: <20231211014429.1841681-25-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 24/35] avcodec/proresenc_anatoliy: rename TO_GOLOMB() to MAKE_CODE() 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: Cor712zfiNfs This matches the name in proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 43dee7f79b..4b72798689 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -256,7 +256,7 @@ static void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int val) } #define GET_SIGN(x) ((x) >> 31) -#define TO_GOLOMB(val) (((val) * 2) ^ GET_SIGN(val)) +#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) @@ -274,7 +274,7 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, int dc, delta, diff_sign, code; prev_dc = (blocks[0] - 0x4000) / qmat[0]; - codebook = TO_GOLOMB(prev_dc); + codebook = MAKE_CODE(prev_dc); encode_vlc_codeword(pb, FIRST_DC_CB, codebook); blocks += 64; 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; From patchwork Mon Dec 11 01:35:27 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: 45052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652593pzf; Sun, 10 Dec 2023 17:48:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IFg9wIFZ9R47vA0igxFyko3mPR0DDdnRW1QgwdkrUQY0gDY1NmNpqhYMjomkaeyh3eqf0ja X-Received: by 2002:aa7:de97:0:b0:54c:76bf:eaff with SMTP id j23-20020aa7de97000000b0054c76bfeaffmr2275406edv.58.1702259300746; Sun, 10 Dec 2023 17:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259300; cv=none; d=google.com; s=arc-20160816; b=J9GOwOMpUMaytfd5rN0Ar/HFqNr+E6hR1hu1F0jKnw0kptDAcp7h42HZynoYCZqCm9 iTjht5BcT71YhZYWIRNcXptH5mlBXEQlObusSosxZy0bUn8w/BKssnE6Jfe6cM7oL3+5 Bt/0vOGoh45xCywkzXHcBE2o3d8mutjwDU1xwis3+lfQyhZQZFXpSfuu2VADZL1xvh2t ZOvVB3ApjjIcZ5QPdiT8Ahe74c4QBCEdBMuBuAGYTrZOWm2XXdhA0I7IhYYKTiEXe03O rX947lvA7TWZrN2LTBZ+q7/yo2ezOZ9Y6IaeHexWtJ/bB5K/JviDW6DtVVbNlKqU2L56 1MPg== 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=vBzz+KwPv68wHEj9if+omjoseQ3R3lbBMWk+6FU2KwI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=A4wyjz3g/T8YKQ6QS0g+ZfDmY2EMVBBAmLrk6AA69Tcrqj5tTE9tDEXC4cM8J+qDN6 1My181CacEa/TF3P+eNv7KYZ++h6dVlvXGKVdqq0svoEPbsT1RWMFqNdosNG+qAMHwxR zcNAakUJa2JUTvbnWdGhRHSsfhCPNj9zy2650Cwxm4JEevVJzGgK4Ky5kV/qrB9HvvJG IN+/oBw5Q7Gs9FTuS8Zm+Z72qlqPgunuye93PR8JxnSe3RjQb4+cJ+oS6VzNxtJS8+DL +NQwSdhqFDWiDboKNJwHfsKIYDJ1Vwdxn8IT6jkj9OlLmOLyhhAg5IVpdu4gyCa6E0Gd OIQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="dAlX0/JC"; 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 x16-20020a05640226d000b0054be3ba6dabsi3129279edd.96.2023.12.10.17.48.20; Sun, 10 Dec 2023 17:48:20 -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="dAlX0/JC"; 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 3B85568D202; Mon, 11 Dec 2023 03:45:18 +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 A662D68D168 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=4tbAWMRhwpF1yUsSMkY07bQQXRn8fjQjOjca8zOUXQM=; b=dAlX0/JCB/q7lnAv6LT5ipgChNS/sSNz0Es+zd7jeHmc5zjLnwwGDMVoIrxNVdQW/v25uM 9AQjfh9YmYaplP3BRGTzrxzCOtr1dFFrE64Dl4sdX3TgbkFOVQOs74xR/P6KvstuEqIST3 GWS0EkpJmsi7V7LVai4puUuiazf4nw8= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id c97dd7d7; 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:27 +0100 Message-ID: <20231211014429.1841681-27-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 26/35] avcodec/proresenc_anatoliy: only pass down the first scale to 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: arL0CjjF9YrR This matches encode_dcs() prototype from proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 56baeb9956..bdf7bface4 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -267,19 +267,19 @@ 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 blocks_per_slice, int scale) { int i; int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; int diff_sign; - prev_dc = (blocks[0] - 0x4000) / qmat[0]; + prev_dc = (blocks[0] - 0x4000) / scale; encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); sign = 0; blocks += 64; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { - dc = (blocks[0] - 0x4000) / qmat[0]; + dc = (blocks[0] - 0x4000) / scale; delta = dc - prev_dc; new_sign = GET_SIGN(delta); diff_sign = new_sign ^ 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_dcs(&pb, blocks, blocks_per_slice, qmat); + encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]); encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); flush_put_bits(&pb); 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); From patchwork Mon Dec 11 01:35:29 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: 45054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652652pzf; Sun, 10 Dec 2023 17:48:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEojhY3CsBrmGjvzJoq91/CF0Q05pYVSyo/yZfmUi0GyfbeAm8rs2QvKKu6UCnqYlyzdeBG X-Received: by 2002:ac2:505b:0:b0:50c:e98:1de9 with SMTP id a27-20020ac2505b000000b0050c0e981de9mr1430158lfm.132.1702259317763; Sun, 10 Dec 2023 17:48:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259317; cv=none; d=google.com; s=arc-20160816; b=HYiVydbwbF502jXoTekp9vmiecdBth18wObQT4dlVoVx6ugegdGf0HdnFpmruD1tlc jI6vgp1kTJBo6TQbykgB657xGs3q6aa6TpPxoJtV5J+O7vHGOO22Dlc/e29bcQfL4RMs 55dMvO1uoxN0RHAA1iRjvc9yoHE08wnFfziYje81iPtYXDFzsPlPnzEAe1/1txJd+Org 3u0/IMtb9qmGnWjyw92x+7TMU0kMkLkvyVlo3o2BeqxJfiu9I2ir2zUn6Gu6JoKGTEXC zBB7hJA5sVrcfIx9D3uNLJl1wLOgzj6QIeVuvxAL+Yg5izNmj+uF07Pzkb4izWcmJlYF 3PWQ== 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=2CFNyOS/IK6FO68Jfckg6+wvnNKjzrH+L/PY8dZb1uU=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=YaZe35WOMxR+1iPTp2gUa+td+OtjId2RGYUpfhI/GZ//O9CT2EF7rui/27M9qZeZ7x WOO5MTbLlfoCMbqY01z7u/hL0TwuPzJZCfjskKz6gUUHW/JUvCKCWRFjmBI3PVSATLTi gyR+hU2S6FJiCUqiSV7xGc9Q1bar6xkvucOMrD96U4gEr10b+5qJU77ixJJSeziQzxJd +AL7aeTomHEfDUHL8cLqDKHCSbi7sjiP8ovmXJ8O3iuA4NZREDcuwpexuPKH15zJF17N IkLXOfY599x2e2ZNcQIUaG+46vUHI6e6AQ0ngGTjSPuS7rxO2E4S+EkJYrYVXEj+Xifn DLYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=YUFlzqyP; 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 x8-20020a05640226c800b0054f564b2fc6si2757831edd.19.2023.12.10.17.48.37; Sun, 10 Dec 2023 17:48:37 -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=YUFlzqyP; 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 4311368D20E; Mon, 11 Dec 2023 03:45:20 +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 D66E868D17B 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=4TRo3FsCrQsgX76bQVbmsDQuH6bTBu5vuQVzDWU9AYM=; b=YUFlzqyPiFtJdeu60x6pUhNkq5E86YNkjal601iu4wKRxfXpsebinxiPivzteUvAt+Lp6F GF/b2JFsKYy/DimtCuDUnEHtg3GHRMwnIBXOos8qeQkRnSnGxbncBluQA2yHQgrGymbuEs FWrYuKFTT8K/kmuTHyPoxMy1+LPho+I= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id c069186e; 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:29 +0100 Message-ID: <20231211014429.1841681-29-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 28/35] avcodec/proresenc_anatoliy: cosmetics to make encode_dcs() identical to the one in 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: Ej+II3hWhKe/ --- libavcodec/proresenc_anatoliy.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index aed5c68b1b..0318379461 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -277,17 +277,15 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, blocks += 64; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { - dc = (blocks[0] - 0x4000) / scale; - delta = dc - prev_dc; - new_sign = GET_SIGN(delta); - delta = (delta ^ sign) - sign; - code = MAKE_CODE(delta); - + dc = (blocks[0] - 0x4000) / scale; + delta = dc - prev_dc; + new_sign = GET_SIGN(delta); + delta = (delta ^ sign) - sign; + code = MAKE_CODE(delta); encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); - - codebook = FFMIN(code, 6); - sign = new_sign; - prev_dc = dc; + codebook = FFMIN(code, 6); + sign = new_sign; + prev_dc = dc; } } From patchwork Mon Dec 11 01:35:30 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: 45055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652688pzf; Sun, 10 Dec 2023 17:48:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHv5cvmObR9qYYafFJEShs+9E3wESyYeBbFxWBNRa5HuRCaYiiIs0UF8amy4VZLglw26PMu X-Received: by 2002:a17:907:9486:b0:a1d:c376:216b with SMTP id dm6-20020a170907948600b00a1dc376216bmr4436007ejc.45.1702259325954; Sun, 10 Dec 2023 17:48:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259325; cv=none; d=google.com; s=arc-20160816; b=aWEvuWPkb1Hk1habnmhEeili72NtQaBfCSOfC5MOyV2+qQogGIl+yYuXkHxhs2/Ppy N3YuIIDPVHOPuBJd/hVOIAvFSBWNS459pG+UF6xDY5pqhHpDk5otjeGFMrE+byhgKm9v hcfNPUzVtV1dEoJkMo+EllORgr0kjwRZrBmC7jtMJQF4IgGbG/PhRPmNGknkj346PqtY XGVNzCfaWpZF/0W1faeLQqiy81jHMDHKvQRkerdtfXEBeAipIQqcIEo0wveIpHi+uFRP GkxAEmE3ZsGXtyxDlyQAmrz3EekMoxq6H8wIgnLfosNcKorFUvKrVTWS3YItWZDmdJR1 Tefg== 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=NQF2TP+UQxoCG/QmC781+pUiRXMRXus0TP3T0Kv2bmM=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=yAIn865WaOBQH2VZz9XF0PsFKa6VU7UxIMP6vaSr4FBiyRyZC1yVrGWbMjOdx55Q1N DhOtCzyDBAuOdS+aj7Ncn/c3LIUFcKBvqvxdgSNidIYiOnlWdyCdedK2SEyf9SV6htay pfgVt/lCl55mkGwrotjPS+b808OIsHF6Q0pO1cfGorymLUOKEKHovaEWknIP+H/uNc9b x1qa9X3HJCsl3dhTqjt+T0SCtcq2z87KGTuPB4LR0ubMN4kjtoABeBNS/E3UALzZ0I0h fHKSY9bcgIRdCgpLgnWjBHk/6GkAr7xxXmjaBtf/NugkXjEJPR0RWw4j8AKNHGNf/y/k ElHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=U8q0TUao; 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 gt20-20020a170906f21400b00a1db9a99ae9si3209719ejb.854.2023.12.10.17.48.45; Sun, 10 Dec 2023 17:48:45 -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=U8q0TUao; 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 412F368D214; Mon, 11 Dec 2023 03:45:21 +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 D689768D17E 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=TGHCzCQ94hicvOziMSjO14joTgfRM5H8/NtMlOi6ayw=; b=U8q0TUaoV7u+5FoGK3mTlZQEIB9pGWZZ+mTJge4YprpmTARTgejYd32ke+LQaqhgVyMxDd XvpBW7lu2BER5BxEFVMAUAP+dUcUo8DsCxF/wvo1Cp4g0j6RHqDHwbFA2um/Vh6SxniKzf bLjKOz4uWaX/M60xfjslNv2mvrZkHZU= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id f6f82f3c; 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:30 +0100 Message-ID: <20231211014429.1841681-30-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 29/35] avcodec/proresenc_anatoliy: replace get_level() with FFABS() 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: llL43E+hNkQ+ This matches the code from proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 0318379461..88c6d47ab7 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -258,13 +258,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)) -static av_always_inline int get_level(int val) -{ - int sign = (val >> 31); - return (val ^ sign) - sign; -} - - static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) { @@ -305,7 +298,7 @@ static void encode_ac_coeffs(PutBitContext *pb, prev_run = run; run = 0; - level = get_level(val); + level = FFABS(val); code = level - 1; encode_vlc_codeword(pb, ff_prores_lev_to_cb[FFMIN(prev_level, 9)], code); 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; From patchwork Mon Dec 11 01:35:32 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: 45057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652760pzf; Sun, 10 Dec 2023 17:49:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IHaSbHdXVn0SOI+2jh8wLC7pnyTl7/pXZWRpo6zWEZ9YhxmQuCPeZgCiCy+b4ap2FfzkJ6M X-Received: by 2002:a17:907:2cc6:b0:a19:a19b:c713 with SMTP id hg6-20020a1709072cc600b00a19a19bc713mr3022135ejc.99.1702259342016; Sun, 10 Dec 2023 17:49:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259342; cv=none; d=google.com; s=arc-20160816; b=XOuu61iO+8M/PvUo3o2YikpHmzHhGQhAEm5KqMJvJsSncXLnn6Acqfpswl7BGSAHBz k9CQ/DlXXejP3dO8F9BbST0f4Kx1D+yOvRPeuOg5woytDjfXxYWhBAK8fVZBFc1D7fYJ HZfNpMRk4BcoWbLoNx9/Dcske3yOQuXwmHfawGEb93GQwhq/YWYJxZlbN4adCl1X3Yyi dNeQU5cAFcZIqiqtmq69BRCoZXitPDrtFyLnngF4q9XUPTN9M88pUF3RCpe7B5da/+ms HZaHa8aOJcWv3whSpSyxRE+zGTMJ4lmkmOjlPLNo/xpkurtGXVCA++ziC6VDplVsoxXR jeKQ== 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=dEQE0V4WZXHKJ4SSFGXO/SvvXB8jvkboyjWWTNoO63Q=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=dd4HCKM8ix5/qdimG5dfoJxww5hLREC4p3rDDYwpeqyA/RbgnLNDXYmlfAKQGsjCKY 40GWbP0D8nWAEiXMHi/95XqQl0pLaTndGOTQ4rHfeuS/FPpSil4ymWLQE3wmluTOzK3/ Y/DedKgI0TAEPQ9LWHUH1BpmhC0SDW+3jEmL6N1b9MpM3prsnsD21aMbUjQNJBLVLv48 cQG1RakxTmrgCeYaikKz3zPcj2naTvRgWOx9rUo/GONBjeOWOx/i8YGMo5nTBXzm2JoE WuqOp1KNzw6CXElRLI499gwEBIYVW0LNmsCqaTbTheki2zbuQg+DJfY5fHipIdqvrSaT QvwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=eNZvARDB; 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 q10-20020a170906b28a00b00a1b8262090dsi3155402ejz.259.2023.12.10.17.49.01; Sun, 10 Dec 2023 17:49:02 -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=eNZvARDB; 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 3B74068D220; Mon, 11 Dec 2023 03:45:23 +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 1A45668D185 for ; Mon, 11 Dec 2023 03:44:57 +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=ZXLpMQcvi9qAWlevq0QdQhVGFjvht0QspbzxI1nr58Y=; b=eNZvARDB/XKUP8xx9NOe7hmc/ieBJ6qKHJXvnY1GefhNednZpn5uiAsQQP7AkJ6/Mtx+o1 8NxZ/Op7FPzM9Vra6UBaifS+JBXm7oZsKGVX0bF8il188PaeScfFyzuxMHRhw6aEsqWouH 3Zc/732GIPMYBfSbXROH3ZHsnnjNinQ= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 9bce589f; 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:32 +0100 Message-ID: <20231211014429.1841681-32-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 31/35] avcodec/proresenc_anatoliy: avoid using ff_ prefix in function arguments 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: 3ZLE5SnUyYez --- libavcodec/proresenc_anatoliy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 57324a3b27..816c27e481 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -284,14 +284,14 @@ static void encode_dcs(PutBitContext *pb, int16_t *blocks, static void encode_acs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, - int *qmat, const uint8_t ff_prores_scan[64]) + int *qmat, const uint8_t *scan) { int prev_run = 4; int prev_level = 2; int run = 0, level, code, i, j; for (i = 1; i < 64; i++) { - int indp = ff_prores_scan[i]; + int indp = scan[i]; for (j = 0; j < blocks_per_slice; j++) { int val = (blocks[(j << 6) + indp]) / qmat[indp]; if (val) { @@ -370,7 +370,7 @@ static void calc_plane_dct(FDCTDSPContext *fdsp, const uint8_t *src, int16_t * b } static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsigned buf_size, int *qmat, int sub_sample_chroma, - const uint8_t ff_prores_scan[64]) + const uint8_t *scan) { int blocks_per_slice; PutBitContext pb; @@ -379,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_acs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); + encode_acs(&pb, blocks, blocks_per_slice, qmat, scan); flush_put_bits(&pb); return put_bits_ptr(&pb) - pb.buf;