From patchwork Mon Jun 4 14:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9246 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp779136jad; Mon, 4 Jun 2018 07:19:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJZ6Na02/wJzgDlUFDKDZ2GbS/8V4Uodcy1CeVgU0/iHZQdYHvxnv5oyE1dtyMp4IShZ0VH X-Received: by 2002:adf:a148:: with SMTP id r8-v6mr8801868wrr.104.1528121950671; Mon, 04 Jun 2018 07:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528121950; cv=none; d=google.com; s=arc-20160816; b=OaojnAOx9cZH8Wyg+NNHxzYGpfTMSq44n18SX7D7SHmrfX6RCLy0gVmIYzd8luGdbI bwaJhKdTNR0KxfI8gmIC51mLf3Vg3h4jxihOW499ApCUWwn4034RlbqFpVWVN0NGlHHr OZDAN78jcpOblnbWZAGnEzvPlA1PzkyD1BTa0d8wo4yurXz7nVjJrwpNI5SAKtDDKCo5 G6xpGp1jOL8ix14J2GyPZ4B0i2t7ApEqXwAN+B5waRMQTW7UUmdT0y0J6OTrgl+ii8Ac MJMN1O2RRFBR535r8fUBJLtwcHjyWmXnXDna0W+Yki6p5oGksY/gg6gX7/C57bFwkwVM 5ZvA== 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:cc: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=2mKNRXxkoooD+n4+xXMcjFCHNIQm5TwnEbafdBeBYLQ=; b=BxBVToujHlxBjPocXswlkNHsjUQss0pflQvKPqS/op0iuYPNEb3y2RbL29BZ6gqP+M 7znkgn7k2p3xpxxlf3XhYuN7WWXdfLU1RcMeNMvOVc2Np82eUcT3JAvtB8dQPEwsi2EO lhysB029ljFcmQk4/VaTv8KUW704/1zlhrqtbvvy4vslNrcBGu5PKKLZAN+TSVfV+kLm gJw5xabqfgXhJfZE5RTV9bW1JbH4B5PuvqqwW9TrYsW8risD6NfgawjP0vs55XJ6jEjr UH+Pj60CfL2F62P1Mkxg+HFSZTfDQ7Ugedx+CNQpw9jmDSXlf0WwqnDwcqsXop9/0XrA qafg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jOD6OP3j; 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 g145-v6si220785wme.77.2018.06.04.07.18.47; Mon, 04 Jun 2018 07:19:10 -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=20161025 header.b=jOD6OP3j; 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 CACFF68A3E0; Mon, 4 Jun 2018 17:17:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6571968A2C7 for ; Mon, 4 Jun 2018 17:17:53 +0300 (EEST) Received: by mail-pf0-f171.google.com with SMTP id z24-v6so1865345pfe.7 for ; Mon, 04 Jun 2018 07:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lqpAWq9gmhKdI0tUUGpGzLRSJ24OCtA/IAIx5bAha5E=; b=jOD6OP3jmREFKMjNXj9GOYVoWgbtKEboxn04t/XXEuZ7fKmasPXRU9rPGyFDFrGdh1 GgRMPlk1oGf9tTSQSb/FZ7onPIPpvjK+yRMbuIQO4llC5KY0YYDWmcDgVVTyPeXTOjFr gkW12YENtqhMuAWCF8RUit1MQ57vW1KSkmjq9LmiDMjDdA2i+HXMSPIxHyR/1/LQbQJY blp/VYhZ2Ifns/sJOctyHLpZ++L4zB4n5tUjkonk9zLPEjqbMLKxiwqFtiJtWQzpqTW5 k3oQb2/49ia3wIn1S0vBrJqbLAjBcfNNWFz0HMsx0LsqBCAuOeq7ecdvcBRbU2Sr4XAO lboQ== 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:in-reply-to :references; bh=lqpAWq9gmhKdI0tUUGpGzLRSJ24OCtA/IAIx5bAha5E=; b=AuXv6GHBeD6YsgUa9VABhvINyQzKaJ7qoNFR6l+lZ9NMe3u34b8Rn9vswhH+nTsEKg gDuJTS7PNrsBgjGgP8/8AtuBqu7leUpm77RojlkbszQBB6tLKhJntjGRYaii5zrEmj0b 1IVHye0RxwCi4/Qf9vwbpaQQ+WKj9/nLwOd28DLR95CYQz5VA0ALSYZcw5YbyTZEugb9 a9jbbR17x3GYB5gxVvzoouborilyc/VE/0h+pKawB9kd7t4DbReEzPqHMYiwuvXuUaKZ OXT1X3YD4ngauDkn9tfRDNxs+ETuCRv3sJOrxbQqhUTLgt5gmZzrcNRwjSs1kD+uZ6p1 ThMA== X-Gm-Message-State: ALKqPwf/peY6IcDTzy3iOv992gSPZm2dmORnidbqrrdLSiAX6T3XR9QP 71QgexWryMqDV9cm0AlwDE+vLQ== X-Received: by 2002:a63:755d:: with SMTP id f29-v6mr17271365pgn.278.1528121918426; Mon, 04 Jun 2018 07:18:38 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id u19-v6sm60946508pgv.25.2018.06.04.07.18.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 07:18:38 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jun 2018 22:18:14 +0800 Message-Id: <1528121894-29944-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528121894-29944-1-git-send-email-mypopydev@gmail.com> References: <1528121894-29944-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/aacsbr: fix make checkheaders 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" move the the function aacsbr_tableinit definition from header file to .c file to fix make checkheaders Signed-off-by: Jun Zhao --- libavcodec/aacsbr_tablegen_common.h | 12 ------------ libavcodec/aacsbr_template.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/aacsbr_tablegen_common.h b/libavcodec/aacsbr_tablegen_common.h index 8c8f6ef..8e0dd9e 100644 --- a/libavcodec/aacsbr_tablegen_common.h +++ b/libavcodec/aacsbr_tablegen_common.h @@ -111,16 +111,4 @@ static DECLARE_ALIGNED(32, INTFLOAT, sbr_qmf_window_us)[640] = { Q31( 0.8537385600f), }; -static av_cold void aacsbr_tableinit(void) -{ - int n; - for (n = 1; n < 320; n++) - sbr_qmf_window_us[320 + n] = sbr_qmf_window_us[320 - n]; - sbr_qmf_window_us[384] = -sbr_qmf_window_us[384]; - sbr_qmf_window_us[512] = -sbr_qmf_window_us[512]; - - for (n = 0; n < 320; n++) - sbr_qmf_window_ds[n] = sbr_qmf_window_us[2*n]; -} - #endif /* AVCODEC_AACSBR_TABLEGEN_COMMON_H */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 3fe78d5..821615f 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -34,6 +34,18 @@ #include "libavutil/qsort.h" +static av_cold void aacsbr_tableinit(void) +{ + int n; + for (n = 1; n < 320; n++) + sbr_qmf_window_us[320 + n] = sbr_qmf_window_us[320 - n]; + sbr_qmf_window_us[384] = -sbr_qmf_window_us[384]; + sbr_qmf_window_us[512] = -sbr_qmf_window_us[512]; + + for (n = 0; n < 320; n++) + sbr_qmf_window_ds[n] = sbr_qmf_window_us[2*n]; +} + av_cold void AAC_RENAME(ff_aac_sbr_init)(void) { static const struct {