From patchwork Sun Sep 8 22:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1393877vqu; Sun, 8 Sep 2024 20:14:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqhzRKRGVNDeKwxkdxb47Mk9pjbHPehm7oFtwJUOtWd9vfhY6oIThslAQdc71izF5dPJnUHkk72O8VAeiluqjD@gmail.com X-Google-Smtp-Source: AGHT+IFzYZgVFQc6b0pXxvORxLTrkl+CTYeDjGt9bCljAuQ39bdTw5rX0dD8vpy1UGYpnkQIReD7 X-Received: by 2002:a17:907:3d8b:b0:a80:a193:a509 with SMTP id a640c23a62f3a-a8a885bdde7mr300846666b.2.1725851654532; Sun, 08 Sep 2024 20:14:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725851654; cv=none; d=google.com; s=arc-20240605; b=cckxW+8/UcK0ReAa+rEv9affMUJDRSPfmX1sCtfVvByvdCw8B/xwhBER/mIm5ftJtn 6q5Phq71s9JCs6NBJL55HhojzQJ3eR54RW8+7jnyMeFs5K+JCYX9BjgaxEcRu/aN+6V0 4NBwn+jN3OxDRipH5F9V4r9qp+hdG9OU2S1eOnYPcncSQWJtpptIGcrtb2zfP7omvNvT UHnGitQcXPaPUAZpj0y/BkCGdOt2HL1305b5rF9RoSc05CoLTo9C+aETrylrH/WycQS8 YGia63LhYGiNRdnLgagT9KQ4geS+JVICUy8NBBB/aesjg0ChlgAHCa/Kugx8PO3dvGwj LeGg== 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=HRIfwdgYp7F2oDLFMVJ7JsoNVxq3DXvx0R/6HOajWrk=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=S9GD55oIZBP7EpyddFL8gWvo9dE3NGcc0lGODyK0jOeLENv6UlENfQXe4fHQIl5LgI o6PBFj1xlkYe4Fi/aTr4uNYDkqTCWMlu/Ou+KnT0A7JjIC6ysDte3YAs3DOvLFo0kR7y CNHlS9WMJkmDnzdI2CMOiCaXJDXxCLZPLfVMe6t8El0yrZfq5me50n2l23LfvRo+4ykm jr8rdk2ABW7xALlItB9AxGzL3o1DnPc9wCURe2dlwEr/3SCSGCNkVLgvQ8nkEkltC4TL zBkz9MV/hBHZkatryAHOEf+yE5PUIz5BJuTYQ+IdUO93AJ2RBCL5Xzdq+9wGJ2AGnV0P xHrg==; 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=Fs+Q7gMk; 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 a640c23a62f3a-a8d25cf60c3si296779066b.584.2024.09.08.20.14.14; Sun, 08 Sep 2024 20:14:14 -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=Fs+Q7gMk; 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 E493A68DDAD; Mon, 9 Sep 2024 03:55:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DD0668DC9A for ; Mon, 9 Sep 2024 03:55:35 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-375e5c12042so2063031f8f.3 for ; Sun, 08 Sep 2024 17:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843335; x=1726448135; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=3qPLpWXpmJbVFb+qW3ctyvCxuEoow/VVn0fWn2VF8E4=; b=Fs+Q7gMkzHqQXqcQSqNFBOft5VGKjw9KUwHY63k45oNoILkmg87xd47BL5P3iKejkf R01WM4wOsjOSdY1kQ1K7fAyyc2xPeHySALm3SHFLv6Q13GrPVwlRmpwRNli45fD4ydO1 FCpnIA2oyJhVzsn/xnL2WLs7tTPcG60qc8Ry9i31rF//g/4jE5gEcwxnz6M4nXxPzVIX ZucqPsfF4mglxQS5OZAG5U5y+NVaUl3eUXr1FgW1PZp4fTtI3ab3lSkEqoGOlLMpDB2m KGEqcVZbaOI128fMghnNnKy/6cP+VheNlTerRa5royTV+W9jntRrHmNvnqIKwTI9hNDt +6aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843335; x=1726448135; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3qPLpWXpmJbVFb+qW3ctyvCxuEoow/VVn0fWn2VF8E4=; b=CNWLQDWZd8R5ZqpxddF8G/ENQvzmvP5yzdWJaA283EuWYm7nf8P5ijXee891EV79K4 yJgpAy0gSsx2I2mGqWNGxJcyJ3tTOMJIRNk8ekqDFXFLePzZM0iGTmkj37h1W7RQge2L kskEXMuD8WuprWCScS+dTjmXMbCcRKj4KoLRpUsSNq0iQwiIAFjXm5euFf1UKuEVj5gJ MF/xZAr7EOZOJGAa746fFwXj42biSE3p2FvwxxuDjqOlteZTjXxiXxhzxTv/sPLXje2Z uKgiFKeFBrQAXWsGACA7bJCoqMNX8G91Ro04Kj25EDD9DOzOzfSGyg0/djMD5Hry4ZYc gzkQ== X-Gm-Message-State: AOJu0YySSQcYhwiYCiFCKkVCUxIJ5mGIhC9GR0244FI8ZTjmf9K0zDpt wvdhWuNz9qCZiHAJ9QhfZxqU+vEAvXPOwVS+OMFbaoqvJU/zmeJzT2OTPA== X-Received: by 2002:adf:e6ce:0:b0:374:c50e:377b with SMTP id ffacd0b85a97d-378896c81edmr6913520f8f.57.1725843334878; Sun, 08 Sep 2024 17:55:34 -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.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:34 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 00:42:19 +0200 Subject: [FFmpeg-devel] [PATCH 36/60] avcodec/eatgq: narrow variable scopes 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: 28Q6ek8mqTC6 --- libavcodec/eatgq.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index b760f29243..f17802f5e8 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -59,9 +59,9 @@ static av_cold int tgq_decode_init(AVCodecContext *avctx) static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb) { const uint8_t *scantable = ff_zigzag_direct; - int i, j, value; + int value; block[0] = get_sbits(gb, 8) * s->qtable[0]; - for (i = 1; i < 64;) { + for (int i = 1; i < 64;) { switch (show_bits(gb, 3)) { case 4: if (i >= 63) @@ -77,7 +77,7 @@ static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb) value = get_bits(gb, 6); if (value > 64 - i) return AVERROR_INVALIDDATA; - for (j = 0; j < value; j++) + for (int j = 0; j < value; j++) block[scantable[i++]] = 0; break; case 6: @@ -129,8 +129,7 @@ static inline void tgq_dconly(TgqContext *s, unsigned char *dst, ptrdiff_t dst_stride, int dc) { int level = av_clip_uint8((dc*s->qtable[0] + 2056) >> 4); - int j; - for (j = 0; j < 8; j++) + for (int j = 0; j < 8; j++) memset(dst + j * dst_stride, level, 8); } @@ -155,7 +154,6 @@ static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, AVFrame *frame, int mb_y, int mb_x) { int ret, mode; - int i; int8_t dc[6]; mode = bytestream2_get_byte(gbyte); @@ -165,7 +163,7 @@ static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, if (ret < 0) return ret; - for (i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { ret = tgq_decode_block(s, s->block[i], &gb); if (ret < 0) return ret; @@ -180,7 +178,7 @@ static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, } else if (mode == 6) { bytestream2_get_buffer(gbyte, dc, 6); } else if (mode == 12) { - for (i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { dc[i] = bytestream2_get_byte(gbyte); bytestream2_skip(gbyte, 1); } @@ -195,11 +193,10 @@ static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, static void tgq_calculate_qtable(TgqContext *s, int quant) { - int i, j; const int a = (14 * (100 - quant)) / 100 + 1; const int b = (11 * (100 - quant)) / 100 + 4; - for (j = 0; j < 8; j++) - for (i = 0; i < 8; i++) + for (int j = 0; j < 8; j++) + for (int i = 0; i < 8; i++) s->qtable[j * 8 + i] = ((a * (j + i) / (7 + 7) + b) * ff_inv_aanscales[j * 8 + i]) >> (14 - 4); } @@ -211,7 +208,7 @@ static int tgq_decode_frame(AVCodecContext *avctx, AVFrame *frame, int buf_size = avpkt->size; TgqContext *s = avctx->priv_data; GetByteContext gbyte; - int x, y, ret; + int ret; int big_endian; if (buf_size < 16) { @@ -238,8 +235,8 @@ static int tgq_decode_frame(AVCodecContext *avctx, AVFrame *frame, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - for (y = 0; y < FFALIGN(avctx->height, 16) >> 4; y++) - for (x = 0; x < FFALIGN(avctx->width, 16) >> 4; x++) + for (int y = 0; y < FFALIGN(avctx->height, 16) >> 4; y++) + for (int x = 0; x < FFALIGN(avctx->width, 16) >> 4; x++) if (tgq_decode_mb(s, &gbyte, frame, y, x) < 0) return AVERROR_INVALIDDATA;