From patchwork Thu Jul 6 18:28:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4236 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2526121vsb; Thu, 6 Jul 2017 11:30:23 -0700 (PDT) X-Received: by 10.28.191.134 with SMTP id o6mr377231wmi.11.1499365823656; Thu, 06 Jul 2017 11:30:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499365823; cv=none; d=google.com; s=arc-20160816; b=IEeVNQVvxDQwwB6/8jd/9lecjM8qpqH28RzVuYJKjPVl8dcyO9w8S3j+68a+PRUi9/ n+3XZRuG8A4LKmvHXU4l0tuJ8kpqzvi1P5Fcgj3SVjsKlR944cs6N0wPZKHYUveccGYp K1VcyhQXIoeOiihOTT6kiaUYpQo8OXaW4LL5pwAk+QoZoOLtXGOZZu+zq8v2B/3H7ADP 3MZg//a9E74rWL4Yz7BbCl7G5S1TgwMyxQ1zHNNn+T1DZCh81Gzucvc5p02sXkgI9hf9 lPJYuNg5Rs6NMLmW0/aEthKpxcEvBav5OSADv9WOHrFffHTM51D5qqFHvwH5bKeAztIm 3qHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=0oCQ2WdEDUf9xrIeDO/+/VbZRkITrMlS3zwI0HU+dW8=; b=lx+siRujpfuz8UAXfbc4KznEgut6OejYyhbumJ+TNiwKzGTDDYxBH+K52pD1QH0MQ/ +o4hojKWajGR2ND4e9eVthyaT2N0X5mu9i7gZHIGMdSiQHmKIo1wwlkbKg2UuLVtyO// DgeKIYwQ+K+7G8I3mz6pHNt7DJMKTrjvDReOmwh4Np/oicXcW6C7olCIQ9pJsKCU+IUr iQA/rA5+ds6WKkluQAljov8oO1/snqzShCKpe5gxDpMBfjWtwWprrwv6KCj/PhTAaXB2 9zyeZ6LhvCticpb8dVNea7HHvPGHXyYY+DthIgRkgCEFGfiNzfIZDm4YHduDegxh8CHD jAsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=jvRCZ25N; 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=NONE 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 f184si874542wma.85.2017.07.06.11.30.23; Thu, 06 Jul 2017 11:30:23 -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.b=jvRCZ25N; 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=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 AEB8968992F; Thu, 6 Jul 2017 21:29:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78A106898C0 for ; Thu, 6 Jul 2017 21:29:35 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id t72so1498312lff.0 for ; Thu, 06 Jul 2017 11:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=6g6Y18ikvDY01X4z4IsNtDLMOhZURkcqKasE6wFOxrU=; b=jvRCZ25N7ZoPp0qL36lPAUQbFlqWX6wA24mQd4ftqzrx14eA+1GXWkinV5YjcU393D pPXHecNt1VKUYEDaqNqsM3GIWU4quPelQXuaod1JzqQBfhES5udcKxu+7bBtMLlvxwvl 8YBi1IleuCd/kVyER+w8JW8cvWp4oKqKpWR1Kzpwthq95VNMltedHNrRKYAKGoT4nMgX 9QIzrj6K53eJyaU9GPRqSFcbKwXcbKYajmN07v5HcxQa2q3Rxrc783Ty2O5Wq29hp3vj mhFx9C49cpHGGid+ngzB4IChe2XHG3M8rpZChJvooJYZ0/odWzlg7CgUa9w+LpQ99SLb TJWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=6g6Y18ikvDY01X4z4IsNtDLMOhZURkcqKasE6wFOxrU=; b=s978KiBVaW80ZeQsGeA1rnvgKToga1BFGRu/CDkZaLwPP2wdUPoIDOH3cnw+/xJ3Of 3/VZrA3eht85jWSSktzUGUROKpVUjze45Sj6ZrBlaFXrCxHAQ3jVCnqb9Hhp+1/4Uhj3 9nVmxcLIuTwnJ77Km2bzirp+MbDc741vtjx6vJ81xC53w+dKZlBTqv1qcXCOhT3rrifW g4h8g5APAhpmReAVJaBLtOc23EDHv2L0RnDB/TwXiqGc+9ob5xi3ijvBGDz5K6cobTqb I/AfNwqAzZrA2kUPdvQc+y/llUj8IEofgdXiJHGUIFWLPydH/XODgPoa8xJOeR3R8wSZ YdUQ== X-Gm-Message-State: AIVw112mFfViDvMcDD/iLjLE+mNhFVtidVGoKlsQVBVd4IOkOjtfIG/s vAkv2a8QvXxjL+K/jhM= X-Received: by 10.80.174.99 with SMTP id c90mr368964edd.2.1499365777506; Thu, 06 Jul 2017 11:29:37 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id k49sm1371108eda.45.2017.07.06.11.29.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 11:29:36 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:28:35 +0100 Message-Id: <20170706182842.7785-6-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706182842.7785-1-derek.buitenhuis@gmail.com> References: <20170706182842.7785-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/12] opusdec: Remove dead code 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavcodec/opusdec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index 1110302f9c..5a7ba9dbb4 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -152,14 +152,7 @@ static int opus_init_resample(OpusStreamContext *s) static int opus_decode_redundancy(OpusStreamContext *s, const uint8_t *data, int size) { - int ret; - enum OpusBandwidth bw = s->packet.bandwidth; - - if (s->packet.mode == OPUS_MODE_SILK && - bw == OPUS_BANDWIDTH_MEDIUMBAND) - bw = OPUS_BANDWIDTH_WIDEBAND; - - ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size); + int ret = ff_opus_rc_dec_init(&s->redundancy_rc, data, size); if (ret < 0) goto fail; ff_opus_rc_dec_raw_init(&s->redundancy_rc, data + size, size);