From patchwork Sun Jun 30 23:12:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462573vqv; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIKfROJk5zVyLdfZtDFXEFiHvVnhmfIQVujapAziEwhWP7rviht2cTlZcF9QUjsrn3ZwNIpf5YJVFrvDoRaAAB3cRBm1jm45/YTg== X-Google-Smtp-Source: AGHT+IFtYSe4/3InLusvxllJqZ/mL6c5aR0Tvjb7bQEiAskOObPFo9L9BePDhxMPdOtxC3r8OE2F X-Received: by 2002:a05:6512:3054:b0:52b:8c88:2d6b with SMTP id 2adb3069b0e04-52e8264416bmr2694318e87.11.1719789773322; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789773; cv=none; d=google.com; s=arc-20160816; b=r9/4wF/X0R1xYVWREFhFNA1sZ6O2v7Ue8pw1zydGIK1x+89bOha6ZcvhcCVr84X0ex 1SP7vWk+YPJyEJbWZOjEfovBQcBEcq3QYFwPhtPqTkRlOLk/K46F7VIM1IUM8bjCKqzG /4zuhZwb2Er2WxdbMrjzrFLeMFuNxZLoeDbhN7egaEYHDxGqCyVrZ5Lf3uifXnn0W/1b K3neLz4p5zpVYWodJgRxo+2NHSUGd7IntPvbIDuuS1alyScLLLjwHenLxuj0jkcMmFi6 oilYzh2cFDKZliyA+r6kmNf0Uj+/BEr1fa7oDdr6CkSB/O3pk0JrZaiPkCH5iaZ4pZZX awBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=z+qGKKOttZaRxaw9GCu2lwxgRQPRsLILLtvz6h5h/RI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Hy8fCcrdSbvf+AYPDUxOgbl7AcjC5cJp3QMpXldP3n6trj0Z+/UJ5o2si1qUBGA3pZ Cy6D2fYllhRKr9/8o42P4GOE9DD/TbI9KaXpqV2lw5y9z4nJPmpvJymt3HzMxi0Ghah2 bTXA08goQYpwN6B1qCSgOYGXg5NAVtfgd0dN01nbXr8WVWzwgWh1GgefJ4+fcL46nb9b YJ8vs2n7FNsfzYal9pdJ5ECd7j7SHmHcQJUD6iLL6cOmiqeUi7uzkxoTLA+YyvI7b+Qq 9ru+g8/wIKBxrQOi5+Zr8U6SXJLnGbM7CIAOKC6uQw+B/V3VUCCige0Tl2OKGvFWYpoC nZCQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=PImGaZE6; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52e7ab3c710si1929059e87.603.2024.06.30.16.22.52; Sun, 30 Jun 2024 16:22:53 -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=@niedermayer.cc header.s=gm1 header.b=PImGaZE6; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB6B868D739; Mon, 1 Jul 2024 02:13:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06B3D68D6C5 for ; Mon, 1 Jul 2024 02:13:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5EEC540003 for ; Sun, 30 Jun 2024 23:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toYahLZ9OpdG+PiHHx6UEegh0SBHaBjc4wNyIUkm8N8=; b=PImGaZE6n89P7zA382eIWfE16S/hqHIqI+yriszBjmLmanZDoJV+2u+jPsR/Duk/OGEVLV uH0tIFylVgAXibql9kOawkgx/UTJI/YODqSYstdIfnjcfz7lMceCcEGNBubnjVAPd6hZjN e5eZSxakVY5l+TdUNCl6kwNd3a7d24+CZ5vOTOYhHig5okNoUFs+3wsn4BO6CghwRxOj/z U/6OfPsq2XRj9qbU9kFbx1/kDurzvyMbiT3q62udJustwP3Xo/XROJNQMBiMmZukuzllc9 jbqPrp/Rl1HUSux2Zpj0fT5/bVoMI5cY25mMu5N6i9K021LbK0SsvPvd22kmNQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:48 +0200 Message-ID: <20240630231306.3779027-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/aac/aacdec_lpd: Remove dead code 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5obBQwTitGjT I dont intend to apply this, this patch is just to show there is dead code that needs more work in case it has been forgotten I will mark this as intentional in coverity because obviously its work in progress code (CID1603198 Logically dead code) Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_lpd.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c index 91a32688895..1faaab852f9 100644 --- a/libavcodec/aac/aacdec_lpd.c +++ b/libavcodec/aac/aacdec_lpd.c @@ -142,7 +142,6 @@ int ff_aac_parse_fac_data(AACUsacElemData *ce, GetBitContext *gb, int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, AACUsacElemData *ce, GetBitContext *gb) { - int k; const uint8_t *mod; int first_ldp_flag; @@ -159,26 +158,7 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, if (first_ldp_flag) ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */ - k = 0; - while (k < 0) { - if (!k) { - if (ce->ldp.core_mode_last && ce->ldp.fac_data_present) - ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8); - } else { - if (!ce->ldp.last_lpd_mode && mod[k] > 0 || - ce->ldp.last_lpd_mode && !mod[k]) - ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8); - } - if (!mod[k]) { -// parse_acelp_coding(); - ce->ldp.last_lpd_mode = 0; - k++; - } else { -// parse_tcx_coding(); - ce->ldp.last_lpd_mode = mod[k]; - k += (1 << (mod[k] - 1)); - } - } + // parse_lpc_data(first_lpd_flag);