From patchwork Sun Sep 8 23:11:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1441650vqu; Sun, 8 Sep 2024 23:24:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUa+TjpaLpgex7y78w9ADyiFKAcIQfLKQnY0tm43MFzmKQ/cRX0YsxTdcDYzY+23xn3rEDZ6tcM6V2Pf2Zmnxqh@gmail.com X-Google-Smtp-Source: AGHT+IG6HBnDwVskE+UgWdg84jptOR6K8JAvp07ySzjLRCKaTKeqP9OpK16B/7k/CI8eONr6LI3d X-Received: by 2002:a05:6402:2692:b0:5c3:eb29:50c4 with SMTP id 4fb4d7f45d1cf-5c3eb2950e6mr1612968a12.8.1725863050624; Sun, 08 Sep 2024 23:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725863050; cv=none; d=google.com; s=arc-20240605; b=CaqxJs6BHNUOFbC7SJ5iAUAcMVcyYAOiwE9YPjwEtQWAM1CHk0AtxE7uge9pfgm86T LICtfgNdSCFmWucNaEUELLgkjfC8/joUWeUmJF+mRNifhqETj43zT9Lswm0pQiudKlnL e7mj88c2CPLBaSyzfA3oS3nOBks/57p09935LW7jU20CUnyVS7DQpai7wHLOkOZh2HHL +VIIo8mKi9ElbpH9AnlsleqICAJVY5cUmUCqwXxGOPZ6YXBTa22aykk1L1m6uU7wFTjd diRGSgZlI0gCPNnvNT9/NOk85NbVNH/NBUmME8esrI1265F0Rxk7izgzagUI8QBK9brd jJ9g== 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=bfsGSc4Sc+zNJ5v0LaxmO+6W+nD1JpKv1N0g0ddgYgg=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=J5yzdrA8iqs0daDFPOT0Eod/ihcobV6eqr5FzInpg2yaP5mMhOx5t32idfO9u5pBQi Cjn9fWkw8eJTD/wfdAg6HYjLuv9hxkCMePPAccLUh/6D8/u8uF7JV83j//4RdtG6xyMV GUK9psX8pO1c8Z4UEG+98TeEiWAmwoM29XTnx9VYhzk48LXpxzRuU6TY2YKwXKuWf3uy fZ6KcpJjcfrLi3LAjyAPJqNwvjHoFiIujVXES3f3uvNzhus/ZtHM6L+c13G6q0ea5qcT fk7BZEoAT6RyyLSkZykbdr7ia7JGFa40WI8zUS/obSciS4LczC7z8u5C2UqZumrehitr bjeg==; 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=asdUCBWj; 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 4fb4d7f45d1cf-5c3ebd98406si3332074a12.373.2024.09.08.23.24.09; Sun, 08 Sep 2024 23:24:10 -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=asdUCBWj; 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 754B368DDDF; Mon, 9 Sep 2024 03:56:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E551A68DD1B for ; Mon, 9 Sep 2024 03:55:39 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-374c4c6cb29so3383197f8f.3 for ; Sun, 08 Sep 2024 17:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843339; x=1726448139; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=2DbKZ0xlQ+M3Xq/ccicTowZDJLpMXxSjeSfCh2F+W6M=; b=asdUCBWjKNtzTZVf2i07hfBq7kgVr8kbC7QsxIfmWrOEuecyAjdjrgHZCdEaxpS6uW Y8Y8bW2kxIqIQIJMW6LZ6fMfP+KJxNWSwJpAyBjXnK0KoGCzzHTf9n22FotXt9SiBzS3 V6tRNpWlaaFyTDuL52GkjkjJ2LKNnxQG5WqOrYgOsWD8rBGr+9z+Q0MpPH35SnhXdX85 1Ft6Ppu0Mol+krNs3/+XlAR8XUDGOlKuieGvYaKk7BeDRGY3UiZmuDmGLrR8cC5rs5nW ZLRwIAAmuaa3ENsBSz/Fvz8uhtKYLbD9AmSQzpHLk1TaA+ikzq1cFA7geAM1iQ9kbdTX vVww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843339; x=1726448139; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2DbKZ0xlQ+M3Xq/ccicTowZDJLpMXxSjeSfCh2F+W6M=; b=eLCSTGSRS+BC1hhi7AoiaO6owrpFPj9iPXlsUMITYlXmjAVx0Sk0gR9EavKwk5ieuP aMA6PgfpIGbl6GBAyWuclzNbvmgVKcOCU27str3o4+jkckaE3RBf6teswYWW3ld7e660 YNONdeP8G2sjTSwZiqLjauyqvbL7pHTZznlwhwqOdnyDfgbsefYDPmAlPaBbisqmaIKt MXYXrwScLHFP446gPTVzpCjraWN/Hz4gSyp6bC4BUNSEiCZTc5v+NEXmb5pNyD/lK98v GJInfI5pEQjkTPrTL45ArGKAvIfK3k1r3EF8LJQ45ijT+ecEi1xkwX1vORUVCGOwSj7H UYdg== X-Gm-Message-State: AOJu0YzFpBOjIvyU9FRJnsJ0z78TPx/2j0/oWhUUR7lL9jxa1wzP6uDm ruChzTJpWiRJ4VgtRr823QpFI6D2IBpHpDFMtbKx36/c59yA68FnpBcsAw== X-Received: by 2002:adf:f701:0:b0:374:c1de:5511 with SMTP id ffacd0b85a97d-3789229d6a0mr4522033f8f.3.1725843339117; Sun, 08 Sep 2024 17:55:39 -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.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:38 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:11:08 +0200 Subject: [FFmpeg-devel] [PATCH 41/60] avcodec/ac3dec: 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: B+ox2+VzsVZp --- libavcodec/ac3dec.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 0a4d3375ee..5cc47a6b1d 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1492,7 +1492,7 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, int buf_size, full_buf_size = avpkt->size; AC3DecodeContext *s = avctx->priv_data; int blk, ch, err, offset, ret; - int i; + int sync_offset; int skip = 0, got_independent_frame = 0; const uint8_t *channel_map; uint8_t extended_channel_map[EAC3_MAX_CHANNELS]; @@ -1504,11 +1504,11 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame, s->superframe_size = 0; buf_size = full_buf_size; - i = ff_ac3_find_syncword(buf, buf_size); - if (i < 0 || i > 10) - return i; - buf += i; - buf_size -= i; + sync_offset = ff_ac3_find_syncword(buf, buf_size); + if (sync_offset < 0 || sync_offset > 10) + return sync_offset; + buf += sync_offset; + buf_size -= sync_offset; /* copy input buffer to decoder context to avoid reading past the end of the buffer, which can be caused by a damaged input stream. */ @@ -1670,7 +1670,6 @@ dependent_frame: /* check if there is dependent frame */ if (buf_size > s->frame_size) { AC3HeaderInfo hdr; - int err; if (buf_size - s->frame_size <= 16) { skip = buf_size - s->frame_size; @@ -1680,8 +1679,7 @@ dependent_frame: if ((ret = init_get_bits8(&s->gbc, buf + s->frame_size, buf_size - s->frame_size)) < 0) return ret; - err = ff_ac3_parse_header(&s->gbc, &hdr); - if (err) + if ((err = ff_ac3_parse_header(&s->gbc, &hdr))) return err; if (hdr.frame_type == EAC3_FRAME_TYPE_DEPENDENT) { @@ -1752,9 +1750,7 @@ skip: extended_channel_map[index] = offset + channel_map[extend++]; } else { - int i; - - for (i = 0; i < 64; i++) { + for (int i = 0; i < 64; i++) { if ((1ULL << i) & ff_eac3_custom_channel_map_locations[ch][1]) { int index = av_channel_layout_index_from_channel(&avctx->ch_layout, i); if (index < 0)