From patchwork Tue Dec 27 15:04:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 1942 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1527405vsb; Tue, 27 Dec 2016 07:11:36 -0800 (PST) X-Received: by 10.194.178.170 with SMTP id cz10mr28263357wjc.224.1482851496656; Tue, 27 Dec 2016 07:11:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z8si50215632wje.72.2016.12.27.07.11.35; Tue, 27 Dec 2016 07:11:36 -0800 (PST) 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; 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 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 6448D689CF7; Tue, 27 Dec 2016 17:11:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD1968972F for ; Tue, 27 Dec 2016 17:11:24 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id p16so21301090qta.1 for ; Tue, 27 Dec 2016 07:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=zR3WJ/z1iWsbkzgR7HyIoFsiyFBYbRKga/sPYmtFE3w=; b=IWP9Fh4QDFRnve89CZd/mNJkSWC3Zs3kVbN6z9YsTDVls+gHl1OXHcWvpjhZy4Li2J HQNOvMMdd1+hgcYZyFMV4Z1B+kGyPWw+z4gAgo8u5HIr525JGeXmrKAFggIEL27z8R9w YjJsEsVYHfZIaR6UO0MbjIzsy6uzsA/BpFwCG0fxqto+VrVtgfFE+/QLPiLVzTwnttaY rdiO48A1miJ+nz0BXVX5oKKTxJf+DkJfXCQjBYp8Qx3OmpIiG+NW4SkIVzpJA75j+bRq DdhfRYWAUMoURoLirgJedEuoHNGT4n8Ln+RA3tp+xnlKCAhrbPkY4nDtGFXSGpkckkth PG8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zR3WJ/z1iWsbkzgR7HyIoFsiyFBYbRKga/sPYmtFE3w=; b=UOw0MebUwpIV59NRgqvjb0B5xCyvlNVbm3ynnM6CL8lqDwsMOCLHzURRFBIQD8Fw6a EKhzhQ9FJ5wizdGM1k9XpB6cfzNpcjnQoWTw9DWTLOPyD3S3UtpRswgLo42FehGvfSJC Eocwts6GlMds5VeVgJeNgmqjkFx9g0tONtwtk13MyLASUEDfKQTmsNfuVxo7JJ8muQXJ kO4mtLgyj+70HbG2bYfA1OQrCFUcf9Wi3/XvZTSzUzpDZ0uJp4RPP9u2Pjygx+S9qTJV u7Dt5dYyjJGuEYT9/Jz7B08etHXraR2UTm7gR94qq2NBbtooZR7hdABGk4V2CKs7GjLF bItQ== X-Gm-Message-State: AIkVDXLAIkFsIx+du7pKbv6VzEQ/txW03iTeSbKRbL1OlGkYy1IvTb+YivCr9eYh4901/Q== X-Received: by 10.200.42.106 with SMTP id l39mr29213867qtl.280.1482851052176; Tue, 27 Dec 2016 07:04:12 -0800 (PST) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id t62sm9920285qkh.26.2016.12.27.07.04.11 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 27 Dec 2016 07:04:11 -0800 (PST) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Dec 2016 10:04:09 -0500 Message-Id: <1482851049-56751-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH] wmavoice: remove unused or write-only variables. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/wmavoice.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index cd5958c..4b283e3 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -104,26 +104,24 @@ static const struct frame_type_desc { uint8_t dbl_pulses; ///< how many pulse vectors have pulse pairs ///< (rather than just one single pulse) ///< only if #fcb_type == #FCB_TYPE_EXC_PULSES - uint16_t frame_size; ///< the amount of bits that make up the block - ///< data (per frame) } frame_descs[17] = { - { 1, 0, ACB_TYPE_NONE, FCB_TYPE_SILENCE, 0, 0 }, - { 2, 1, ACB_TYPE_NONE, FCB_TYPE_HARDCODED, 0, 28 }, - { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_AW_PULSES, 0, 46 }, - { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 2, 80 }, - { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 5, 104 }, - { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 0, 108 }, - { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 2, 132 }, - { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 5, 168 }, - { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0, 64 }, - { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2, 80 }, - { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5, 104 }, - { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0, 108 }, - { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2, 132 }, - { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5, 168 }, - { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0, 176 }, - { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2, 208 }, - { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5, 256 } + { 1, 0, ACB_TYPE_NONE, FCB_TYPE_SILENCE, 0 }, + { 2, 1, ACB_TYPE_NONE, FCB_TYPE_HARDCODED, 0 }, + { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_AW_PULSES, 0 }, + { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 2 }, + { 2, 1, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 5 }, + { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 0 }, + { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 2 }, + { 4, 2, ACB_TYPE_ASYMMETRIC, FCB_TYPE_EXC_PULSES, 5 }, + { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0 }, + { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2 }, + { 2, 1, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5 }, + { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0 }, + { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2 }, + { 4, 2, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5 }, + { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 0 }, + { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 2 }, + { 8, 3, ACB_TYPE_HAMMING, FCB_TYPE_EXC_PULSES, 5 } }; /** @@ -160,10 +158,6 @@ typedef struct WMAVoiceContext { int lsp_q_mode; ///< defines quantizer defaults [0, 1] int lsp_def_mode; ///< defines different sets of LSP defaults ///< [0, 1] - int frame_lsp_bitsize; ///< size (in bits) of LSPs, when encoded - ///< per-frame (independent coding) - int sframe_lsp_bitsize; ///< size (in bits) of LSPs, when encoded - ///< per superframe (residual coding) int min_pitch_val; ///< base value for pitch parsing code int max_pitch_val; ///< max value + 1 for pitch parsing @@ -418,12 +412,8 @@ static av_cold int wmavoice_decode_init(AVCodecContext *ctx) lsp16_flag = flags & 0x1000; if (lsp16_flag) { s->lsps = 16; - s->frame_lsp_bitsize = 34; - s->sframe_lsp_bitsize = 60; } else { s->lsps = 10; - s->frame_lsp_bitsize = 24; - s->sframe_lsp_bitsize = 48; } for (n = 0; n < s->lsps; n++) s->prev_lsps[n] = M_PI * (n + 1.0) / (s->lsps + 1.0);