From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4432F4BBBA for ; Tue, 30 Sep 2025 01:35:09 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'OxDKBXgpYvMWa8CCWgMxPBxXmEa/uLT/7kz7j40o2VE=', expected b'axUL6/pvjgSwZe1Aj7PnP17vd71I9j2GVfNswfxpvho=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759196098; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=OxDKBXgpYvMWa8CCWgMxPBxXmEa/uLT/7kz7j40o2VE=; b=K6yIU8Yt23IwrAf5zICp5Dlbh2EyKX35iDmscmsIUooRKb2vbeY0PbdYIs3AkZqX1V17+ SsS+P0uUkuHZL9D1B7dZzUNYtcL0RL/kLvtiXD1vpoTKCPD+/mnPhsswRfkwofZSRFhI5dB 9zEGhYt3Itdr6l8b00Yh0zfPmiT8Y5oQV9iU2tl9B103oN+3+np2Zypu4jzgxEFVnAIOxba 2ih7vNdVqJaQ+PVZSyZH8Oe7aJSGfn3/1Mxy7cBegYkAB8g4CrYm+HG8Sd38n654MzepB/u nmHxlqnkX4rM5GriyTSJ+jcxBULwF7Bq1XZD2j7UmYcaghdBN0dWp8rsG0Fg== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6461668ECD1; Tue, 30 Sep 2025 04:34:58 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1759196095; b=hE7o8kR3kUZkqa8RP9OuCRHss8yR2W3HqBPgC6gvT4/lo9SWmgg5A+ZuTByb1LT3wFSrJ g7e5u95+4CnT44QyZxCmRti2H2nSbCGRwEbnp7p9zcB60FfRx6oDUuJ3gaMh86UFfIUFOyL Aunew2Vh3iw3refaizVOxldIo9xIrZo5k9EhdThlcheV27Xk9tLrQ/Jky7Y41NUQCn1K7c/ ED+zjdosSVdCZB3RLgEBK/iqH9t4gjcU2SWXaabM0fXvMu0aAPKk2KDCKPUBfuHZrerG1/Z Xp9jm0xz0dzZ2g+d5Hqvv88NnIb8DiXc3oTLnCVvplXeBFio4O3DXta8BJPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1759196095; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=X+DSNl2c24D0GhJH9B+IJ8xdCZpqViyblstE6fqck8g=; b=F0p/5dRzIQ8WfWzzfskdKoEzXnpyGkjG0qIA/l4icVE9Yyu3vr3/uCe/Jw43+mqwsBCnf h0qmJXuUogzuxVxf/3q1dWxLC1x591rXgLXSL2kEiZpPfp+D0k803kDwfwbSXaxSEme/Oxw 9iIVU1et/QSCiiC6dUZeoRbZFNWfdOAIbltEE6tzzhRwVbJe0SqlLHp9kg2LHOnNdlEHvza tGHLxw2GEck/sT6lo4fpSUGrhDl2n7Zy0Y7eZDjLuu+PRVTMAMpM0R+pz2AeSvWSjyzBRtY JKbXdpE/I27z2KiVvEYxGmFRzfDZ8gBB3CF/lqcw89NFzZgwri6NenHDJueA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759196085; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=axUL6/pvjgSwZe1Aj7PnP17vd71I9j2GVfNswfxpvho=; b=h1WYqN7Z9jjnjEHE14WRpjyD7PctSAK5reEXPZ2l7aNXCAxC92CQm5THy0p0fPPxx0oiD kvpoFRmvAWo9GNi91keGeh+eClldiEdxE8XbOH9NzhL/9bnegywhtMWXa2DYaTH0scgzYzC HdNLHJ+Cc5MSto9epdEcU+kNMteh9185ZTxXX+toSyZ+dgGUYkWSSnWu/7XkcovEFTOLicj Dz0xSwynH3FnWKazOPT/gwZzMuQeZ16+58GkPLe5NV/33ogJgByMTiHbwFm9mtQ+4pnabC4 3EDImbPTeipR93FZoS3zIdSHB6IIyGs5SJ6xxDhU6PnEvgxhtTp3DrjlV1Xw== Received: from 13289e625de8 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C876768EABD for ; Tue, 30 Sep 2025 04:34:45 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Sep 2025 01:34:45 -0000 Message-ID: <175919608594.25.10918798300863642343@bf249f23a2c8> Message-ID-Hash: NSKZZWWV3R53R7PU2HWMWDP4BPTRWDVT X-Message-ID-Hash: NSKZZWWV3R53R7PU2HWMWDP4BPTRWDVT X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec: make use of av_zero_extend() in a few modules (PR #20628) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20628 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20628 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20628.patch >>From 45b30fa2363d77b0741f9d334ef659299bb420b9 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Sep 2025 22:33:27 -0300 Subject: [PATCH 1/3] avcodec/aom_film_grain: use av_zero_extend() Signed-off-by: James Almer --- libavcodec/aom_film_grain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c index bd9647afe9..a5b692562d 100644 --- a/libavcodec/aom_film_grain.c +++ b/libavcodec/aom_film_grain.c @@ -39,7 +39,7 @@ static inline int get_random_number(const int bits, unsigned *const state) { unsigned bit = ((r >> 0) ^ (r >> 1) ^ (r >> 3) ^ (r >> 12)) & 1; *state = (r >> 1) | (bit << 15); - return (*state >> (16 - bits)) & ((1 << bits) - 1); + return av_zero_extend(*state >> (16 - bits), bits); } static inline int round2(const int x, const uint64_t shift) { -- 2.49.1 >>From 96e0fa186b7c2f9b3b85029c5f87d78e681c3a05 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Sep 2025 22:33:38 -0300 Subject: [PATCH 2/3] avcodec/apv_entropy: use av_zero_extend() Signed-off-by: James Almer --- libavcodec/apv_entropy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/apv_entropy.c b/libavcodec/apv_entropy.c index 1cab88d547..30f31a14ff 100644 --- a/libavcodec/apv_entropy.c +++ b/libavcodec/apv_entropy.c @@ -288,7 +288,7 @@ int ff_apv_entropy_decode_block(int16_t *restrict coeff, // Extract the low bits. low_bit_count = leading_zeroes; low_bit_shift = 16 - (1 + 2 * leading_zeroes); - low_bits = (bits >> low_bit_shift) & ((1 << low_bit_count) - 1); + low_bits = av_zero_extend(bits >> low_bit_shift, low_bit_count); // Construct run code. run = 2 + ((1 << leading_zeroes) - 1) + low_bits; // Skip over the bits just used. @@ -460,7 +460,7 @@ int ff_apv_entropy_decode_block(int16_t *restrict coeff, // Extract the low bits. low_bit_count = leading_zeroes + k_run; low_bit_shift = 16 - (1 + 2 * leading_zeroes + k_run); - low_bits = (bits >> low_bit_shift) & ((1 << low_bit_count) - 1); + low_bits = av_zero_extend(bits >> low_bit_shift, low_bit_count); // Construct run code. run = (2 << k_run) + ((1 << leading_zeroes) - 1) * (1 << k_run) + -- 2.49.1 >>From 03dd856fe1f74365b1b8d7a098a2884da9162de0 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Sep 2025 22:33:49 -0300 Subject: [PATCH 3/3] avcodec/atrac9dec: use av_zero_extend() Signed-off-by: James Almer --- libavcodec/atrac9dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 0748d671f1..3c18ae8b42 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -285,7 +285,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, for (int i = 1; i < b->band_ext_q_unit; i++) { int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); - c->scalefactors[i] = val & ((1 << len) - 1); + c->scalefactors[i] = av_zero_extend(val, len); } for (int i = 0; i < b->band_ext_q_unit; i++) @@ -339,7 +339,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, for (int i = 1; i < unit_cnt; i++) { int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); - c->scalefactors[i] = val & ((1 << len) - 1); + c->scalefactors[i] = av_zero_extend(val, len); } for (int i = 0; i < unit_cnt; i++) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org