From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9276C4AAAA for ; Sun, 12 May 2024 08:54:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1188A68D5D3; Sun, 12 May 2024 11:54:10 +0300 (EEST) 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 C822068D303 for ; Sun, 12 May 2024 11:54:03 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-34de61b7ca4so2362711f8f.2 for ; Sun, 12 May 2024 01:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715504042; x=1716108842; 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=xES1FmE/fAX2HrhzMa187qjEn0nZhIrUmzJ9B6JVrEA=; b=JfY01oRI+gN+AJZIQEH1Y97qxLdiCX+CqStViRhg4tDbrE1QPshlGvzzmSqkn8vDRB Q8XEg60FV5msVKs4wDHut8Flm5iw2ONdlKi/3nFhn4E7zaPewotCJV6KPtM5OZ2USmJV jsOvB4oZ3rSItvmSpW0ufgu7sgaWsX/Pe0Ddo9r48tjbfyk1ILPeb61UDF+uIN/KTQKP k2IaOOWhG/nWBLozEOb2TgQkIZC19ahVXHVvsOj5MrOVEYODibgR4VIFhI0t9wMsUhOB kJMjBSeIAExuRShFNYBu41GnZWyVkoU0qbKGeZmu7iwbKLDLfyMliRQ9glhAtbAwxWH3 I2bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715504042; x=1716108842; 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=xES1FmE/fAX2HrhzMa187qjEn0nZhIrUmzJ9B6JVrEA=; b=YdcVZad87zB7zVFvGvif/vo0U2X9h42537CDseV/pA02xBlCEsr2hqCi46KUAWhpRC 8DR2X8ZFWkF+BIwMuICIII8AI3f3nC7ErZCLYFYnmLMu/8h6c50NmrqWYP31hUUhzSSH GdKDvgPLdzivCwrUzem1vPx4cWAhAK7H7rZuTo3yrFdnJDs5w1lBY/MNVRY8+UYedjvQ wei7ZYw0zmDwhf1I6fdM7eGTpatqHDAfq5YkMQfQWHnYl5F7FyuFb5sfmmg7gSR/cBre KgN9nK6sqczk8qUYOptX4kI693tQoiLORHxW4p/7cM6oTs+b4FMno2ymu80umz5bVSA2 IKvA== X-Gm-Message-State: AOJu0Yz1Q0jYGxMGJA5xKrUMZahn644eJDsXLeD+dXk9Lk+r+trwjmZQ lAUGrjynfMvJw7WcGjfypA9AdhsrLFlZgxm5g2zoOFAB6XzdR1owcNo4rw== X-Google-Smtp-Source: AGHT+IE6TfIj8h3+vxn28YiCHFbUzRwDgUDJUjhv4Ob9NCfz23L4xNn+60zGoaP/qNF9RTV2DKgj+w== X-Received: by 2002:a05:6000:c91:b0:34e:2363:2c59 with SMTP id ffacd0b85a97d-3504a632bf0mr7931941f8f.26.1715504042197; Sun, 12 May 2024 01:54:02 -0700 (PDT) Received: from taklit-vm.home ([2a0d:6fc2:4610:1600:215:5dff:fe00:606]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baacfd3sm8509141f8f.84.2024.05.12.01.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 May 2024 01:54:01 -0700 (PDT) From: Yotam Ofek To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 08:53:41 +0000 Message-Id: <20240512085340.1473198-1-yotam.ofek@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/aacenc_tns: remove unreachable code branch 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: the condition being tested was the same as the stop condition for the containing loop, so inside the loop it would always test positive --- libavcodec/aacenc_tns.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index 60888fece7..fa3cd2af39 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -181,7 +181,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) for (w = 0; w < sce->ics.num_windows; w++) { float en[2] = {0.0f, 0.0f}; - int oc_start = 0, os_start = 0; + int oc_start = 0; int coef_start = sce->ics.swb_offset[sfb_start]; for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { @@ -202,12 +202,11 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) tns->n_filt[w] = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; for (g = 0; g < tns->n_filt[w]; g++) { tns->direction[w][g] = slant != 2 ? slant : en[g] < en[!g]; - tns->order[w][g] = g < tns->n_filt[w] ? order/tns->n_filt[w] : order - oc_start; - tns->length[w][g] = g < tns->n_filt[w] ? sfb_len/tns->n_filt[w] : sfb_len - os_start; + tns->order[w][g] = order/tns->n_filt[w]; + tns->length[w][g] = sfb_len/tns->n_filt[w]; quantize_coefs(&coefs[oc_start], tns->coef_idx[w][g], tns->coef[w][g], tns->order[w][g], c_bits); oc_start += tns->order[w][g]; - os_start += tns->length[w][g]; } count++; } -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".