From patchwork Sun Sep 8 21:03:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1365311vqu; Sun, 8 Sep 2024 18:24:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWsYc3GoQSfiBTk8z9szXZ9xGZCQXS2Vr4f3vdRseeBqrTIRsbMuruRfFDuAuN9/Au2BO77nScGjLxLnHSewe3e@gmail.com X-Google-Smtp-Source: AGHT+IFfpBQybA841o0mqk2tVXQLmpt324TBlrdD1XLFMmOMzSgIuWsJGal3tnecHpXmKSJrwsXS X-Received: by 2002:a05:6512:ba2:b0:52e:eacd:bc05 with SMTP id 2adb3069b0e04-5365881b1cfmr3887905e87.61.1725845049368; Sun, 08 Sep 2024 18:24:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845049; cv=none; d=google.com; s=arc-20240605; b=WcnXHtHcqTS1ANGQJ5JXfA1wZY9VTVRjaIPfNFLhDxIcGK+JZ+6wXKQTRptAqRcD4s KceKIF6jWxBonFwFoGQQx95xidlT6OdKAfjzP2bk2B2NlVZItCERSF7W79hiSUrKu5JU kBPUpNvZ0UHFWarCx0dprvaD6aLsSnI/sTEdbXYlZVieI7cjIkzT7sAXIYDBPGVJpn5M 39K0Pw3t2Ue9iUCKzT5i3HBxxuM0BiijfqFJ5PrJ3atOuvkiWdvCOKZ/tbvcT2m1q/y3 guvImmIV7QvD6fYY9FePdrvMz3T0lMuW2HOrxw1noHPzudif76XjtO8yIalgY3ya/tQe vqFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=c4bSNv5uEB3rptMTdP7NkyHI6exwcg+ZS6ABcP2TV1s=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=B0EjK/9DAl5f6edRUuwOtG1YckVj2SF8e5tleq4crqdkDkfahcsLXy4+Tw2wHsz+lU Y+mDw+Xtn77sW3Fxz4d1Cyxlu5Hl2QhYdHArYKUZMEv47ritHFJqFpYhovmXHJ3s88Kj yzQ+7/au5MEqFLo5X+r1mP7m4dLy0u1Wf/DyxxVr9N3ynQM4jOjj6RMxudM+OwkSEhic TBjGVJgZf5EQeGqLnsE7YVw/UC4sGc0KX216RSI5XpYmnv5KbyH1dYLdAmqvkzBvdqu6 WOvFhNtChoSkCUdD65T15SMuozFQb4dTg+FKlqe8fyqiArSB19A7hmqgLZMoV5Bn4rjf bTxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Hylixo+Z; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-5365f8c12e6si1309636e87.244.2024.09.08.18.24.08; Sun, 08 Sep 2024 18:24:09 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=Hylixo+Z; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DE9768DD14; Mon, 9 Sep 2024 03:55:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60A0F68DBBD for ; Mon, 9 Sep 2024 03:55:25 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-374c1120a32so2167697f8f.1 for ; Sun, 08 Sep 2024 17:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843325; x=1726448125; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=+gTrODdLBL/onxDnx/GBcnRbSW+pbjddjcdHXyTfh6o=; b=Hylixo+ZsSnWpY1EjigWfR8zyZq2OLLGmKbfeB+xHBtj7R13ojrx6ZRmQoXJi6mg13 zTw38D07Vc11u2cBxwrkhkBnP7DPCuNVV2FIIHk5dqe0q80zEfqIX7RJyb36+bHd2zcg qDULQk57dV3EdPvmrfwZiQjD5CjfB/7Iblen581zUd8vsc7BR2N8k3cj6KPfdPq9B24T M2DTOTbCnQNDUoK6xsEP+hjkZm5DgM8dJ7oKTXXA6hMFFEXNWlwWyOGIgEkpTBvBcFkP M2RaFXAMWQsv+uLbrgrxrJPqPzwIJLZrggmSikpyet+1XQDyQOoAkx7LhQ+aEiFuAeDE lDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843325; x=1726448125; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+gTrODdLBL/onxDnx/GBcnRbSW+pbjddjcdHXyTfh6o=; b=pFHmMm98qnxhKYE/FlyCBx0A9pqn3WK6VN9YOk6JfV2fYlKtbroyyFCshif58nDXqF a8fsBO+KKdMhBHJ8AC9js5csJd4Gj+SwBzpMtOIOIyo0IIXeHCrpgOCDEpeY4aHVraq5 mjywya6FOV3Az0WDZqpQBoHVYuA4281z8eTVyN8ky/HSXTu6d011ZAbzWXWbDQGz0adg cDlTZMZiOcb8e6QS1ukFe1Qag6Cb52agKt/9TmgRtlY/1dy4IfDwc6twWHRJgzV772yy U6Bxboip6NWJxZbAeDxhbZDAJvwviPbAnVwNgUqDZAXkueqzonMQMCfWcOZRY1WiBhwj YZJw== X-Gm-Message-State: AOJu0Yzkly2ayWtG3UYZ4xDKR8UyOB9JoFwhSuj1TJxvj3YAn8TOFtmg HgtjBFwWs9aEsHDw9JicTGhRXIRNRAcSeC70s+yg2Ava5VB9rjz6gXjyFA== X-Received: by 2002:a5d:42c2:0:b0:374:ba2c:3028 with SMTP id ffacd0b85a97d-37889682e7fmr6342712f8f.36.1725843324543; Sun, 08 Sep 2024 17:55:24 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:24 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Sun, 8 Sep 2024 23:03:35 +0200 Subject: [FFmpeg-devel] [PATCH 25/60] avcodec/mjpegdec: fix variable shadowing 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N4wiVoEK0lwf --- libavcodec/mjpegdec.c | 15 +++++++-------- libavcodec/mjpegenc_common.c | 13 ++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7daec649bc..86ec58713c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2377,7 +2377,7 @@ int ff_mjpeg_decode_frame_from_buf(AVCodecContext *avctx, AVFrame *frame, int hshift, vshift; int unescaped_buf_size; int start_code; - int i, index; + int index; int ret = 0; int is16bit; AVDictionaryEntry *e = NULL; @@ -2657,7 +2657,7 @@ the_end: if (s->upscale_v[p] == 1) h = (h+1)>>1; av_assert0(w > 0); - for (i = 0; i < h; i++) { + for (int i = 0; i < h; i++) { if (s->upscale_h[p] == 1) { if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2]; else line[w - 1] = line[(w - 1) / 2]; @@ -2735,7 +2735,7 @@ the_end: h = AV_CEIL_RSHIFT(h, vshift); } dst = &((uint8_t *)s->picture_ptr->data[p])[(h - 1) * s->linesize[p]]; - for (i = h - 1; i; i--) { + for (int i = h - 1; i; i--) { uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) * s->upscale_v[p] / (s->upscale_v[p] + 1) * s->linesize[p]]; if (s->upscale_v[p] != 2 && (src1 == src2 || i == h - 1)) { @@ -2777,7 +2777,7 @@ the_end: int w = s->picture_ptr->width; int h = s->picture_ptr->height; av_assert0(s->nb_components == 4); - for (i=0; ipicture_ptr->width; int h = s->picture_ptr->height; av_assert0(s->nb_components == 4); - for (i=0; iiccnum; i++) + for (int i = 0; i < s->iccnum; i++) total_size += s->iccentries[i].length; ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE, total_size, &sd); @@ -2847,7 +2846,7 @@ the_end: if (sd) { /* Reassemble the parts, which are now in-order. */ - for (i = 0; i < s->iccnum; i++) { + for (int i = 0; i < s->iccnum; i++) { memcpy(sd->data + offset, s->iccentries[i].data, s->iccentries[i].length); offset += s->iccentries[i].length; } diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 049ae3d929..751e43fd3b 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -39,18 +39,17 @@ static int put_huffman_table(PutBitContext *p, int table_class, int table_id, const uint8_t *bits_table, const uint8_t *value_table) { - int n, i; + int n = 0; put_bits(p, 4, table_class); put_bits(p, 4, table_id); - n = 0; - for(i=1;i<=16;i++) { + for (int i = 1; i <= 16; i++) { n += bits_table[i]; put_bits(p, 8, bits_table[i]); } - for(i=0;i 1) { put_bits(p, 4, 0); /* 8 bit precision */ put_bits(p, 4, 1); /* table 1 */ - for(i=0;i<64;i++) { - j = intra_matrix_permutation[i]; + for (int i = 0; i < 64; i++) { + uint8_t j = intra_matrix_permutation[i]; put_bits(p, 8, chroma_intra_matrix[j]); } }