From patchwork Sun Apr 28 09:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yotam Ofek X-Patchwork-Id: 48339 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1372412pzb; Sun, 28 Apr 2024 02:37:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUr/hQ/hiW+jqLejVasB48PDBouSwHE+S+zdO1dQiu/I7E3Y9YurMagoWxGgoMx/8zXhu9adIkAEuCq7qvRAsHeA5osgydDX3DPQ== X-Google-Smtp-Source: AGHT+IHne6HdJrEqNSdKgBK7nCbpAdnFeIQ2+KRR0YxWUD8QJQYI56rBQISUnkfSW7nErPzLStkB X-Received: by 2002:a05:6512:280b:b0:51a:d7a5:ca9a with SMTP id cf11-20020a056512280b00b0051ad7a5ca9amr5774345lfb.39.1714297066583; Sun, 28 Apr 2024 02:37:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714297066; cv=none; d=google.com; s=arc-20160816; b=s/jrkyXJOCt2w7Inbl58A9LG9+EGHeBsI8xskDG+il/QfH8aV5vpPehV6NooUuzP3V slTnbTOBpCkGskNaWtZScsPtgiZnyi1wHGqo9+0+fWMGA40UP8yhUCm04OCRckR2g9hs WY+WWH1x4R+kmhVfwYKQXZ+3WEWV3GPNTdnU4+gTDgDPJdWRlstB0pukwWg1LLqDqMpr Oq482euBFfr1BvwAwfSOjw59795QxJrh3upuOEEFn6dtUOtARf2mZTXYIgIKDEM995lr MmAiBdqA6k9iKnfvM00+6U7DxjjpvdtJjMevJmMQzwnLVdA3UGzJnLhKiLlh+OG/SleQ Wv5w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=irx/kFB5Xbb8lDoXvQ7TP1Tyi+fEpc5zl1mdSOpTU3w=; fh=uKWYdal21X5kRQKBfGQ0EAPEpj3uE0rrqDGI75eivrM=; b=ES/ZSLKZBiiAYsfiQ6sWktl3yk9tMArqyvg5xh4hLD0kGabWgNbyDT+htK2N5/pSAR Px5pdliGrJJPbTiPgjgDhB6FXHE6H9fTQk2k17P7s+NXtXbd7wbffN3KZD3mUTyzoyMC jddr6zku5GqrqewTZqA96WpQEQTY9IQPxci7Dpds0X/KlWZW9slBiYbtQfbzHjHZbUX+ jqj4SeK77X/rwdggXTxr6b0e1i87G2QaG4LiXUgcHDXqBQNgzMQVwRyYp8Ed5XPXG70U C9ReDZmov2o2El2S6Crr3ZXyXt2hhmNYmP7DheEaB9vNRxwK2F4vbx99iahNLbqXK0p9 DZTA==; 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=mgEkG74c; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d26-20020a19385a000000b00514ba4f2899si7730382lfj.408.2024.04.28.02.37.46; Sun, 28 Apr 2024 02:37:46 -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=mgEkG74c; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBB6B68D0E8; Sun, 28 Apr 2024 12:37:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E40768C15F for ; Sun, 28 Apr 2024 12:37:35 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-343d7ff2350so2750474f8f.0 for ; Sun, 28 Apr 2024 02:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714297054; x=1714901854; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jYNZusaGRPoqo82gWDpnLEDgCpSmsRDyFM61+r5XQv4=; b=mgEkG74cRX1KkT5u4l6/uj5EgzTJqk1nNuMOc5zSlcuet0LZ3+D8QgoqGUMqTWKzAU GYjF+GQLUxDCr7mi6M4Hp1hjrmHot5bKnWxbHNMpzge0O1Zso+n5FywAyJCdl2n3wnji KVm+ycHRUMIxELDs6pZG3VlWT1hd1VsE5pbzREMJPebmsC+Zhr2zD2drkNrfrli1iA0Y gqqCel3uq7jPztEJyynhPS8lPQlaJzhmDbuIEs10USMKPiwQ6xVVXN3XzVewR//3KTEc e16YmwZHKRA/qIdL+DFKHL3O3NlAbZnF0UfivJAXteZLy+hr0DzGYF52Pt6X2IrKsn10 LX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714297054; x=1714901854; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jYNZusaGRPoqo82gWDpnLEDgCpSmsRDyFM61+r5XQv4=; b=THMylcJvr7sSNQfHFhz0y8TgneWIc1NvtdlpPEnLvttfVIF5lie7CO6CNCaBbCLiTv 22vhLzA+4G3c62yrjlHKL80O4M6MYC/cNjTgQ750E4NVigWFws6NH4Wwljo3QIKlFLB7 tLyeYtKyxZG7xTduwKNV6Z4GXZH0mmBBEw416jAlDpnui+HoP5FsOKv1hS6Qwg5fBHET qyWOMl9C14WFRImhLqEkOBnx8LuVeLOkQ/U1alDfANtIBkIXsmAEbHy+XBO2zm+WNYP9 R+umhbwvSjskSvrXoEu4flH+t4YMsCccEOlfvKDNeyxPQ2nvhskBVf5tnFw5aGKSgqV3 cEvw== X-Gm-Message-State: AOJu0YxNxx/SeG/X5HftpEc4QiZvnvIBpc7Jo7HFtn2S5KGwSO2g6g3q 3I5L8/VLT/sYsvGejElsX+yG2ueNhAoLjVyCgilh8U15F5NdG/wAzk+8Kw== X-Received: by 2002:adf:ee0c:0:b0:34a:2a90:c45 with SMTP id y12-20020adfee0c000000b0034a2a900c45mr5500828wrn.31.1714297053566; Sun, 28 Apr 2024 02:37:33 -0700 (PDT) Received: from taklit-vm.home ([2a0d:6fc2:4612:a600:215:5dff:fe00:606]) by smtp.gmail.com with ESMTPSA id g2-20020a5d5542000000b0034720354152sm26713317wrw.117.2024.04.28.02.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Apr 2024 02:37:33 -0700 (PDT) From: Yotam Ofek To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Apr 2024 09:37:11 +0000 Message-Id: <20240428093711.3126293-1-yotam.ofek@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/aacenc: don't redundantly re-compute max sfb 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: Yotam Ofek Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x0PqGXASm9fT Remove an unneeded inner loop in adjust_frame_information that had no effect, the loop body can be run only once and will compute the same max sfb. --- libavcodec/aacenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 7feb723289..163598e938 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -538,11 +538,9 @@ static void adjust_frame_information(ChannelElement *cpe, int chans) maxsfb = 0; cpe->ch[ch].pulse.num_pulse = 0; for (w = 0; w < ics->num_windows; w += ics->group_len[w]) { - for (w2 = 0; w2 < ics->group_len[w]; w2++) { - for (cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w*16+cmaxsfb-1]; cmaxsfb--) - ; - maxsfb = FFMAX(maxsfb, cmaxsfb); - } + for (cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w*16+cmaxsfb-1]; cmaxsfb--) + ; + maxsfb = FFMAX(maxsfb, cmaxsfb); } ics->max_sfb = maxsfb;