From patchwork Tue Jun 5 14:26:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9260 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp994121jad; Tue, 5 Jun 2018 07:27:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLebEzv6tyyWH/+cS75emrgCpNVdnbjah451vuVEOHTuZLAAqeIn/tdFJ6EdTYSsowjexVP X-Received: by 2002:a1c:110a:: with SMTP id 10-v6mr5989806wmr.130.1528208834935; Tue, 05 Jun 2018 07:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528208834; cv=none; d=google.com; s=arc-20160816; b=PSJeRTDaFNP9Xlc4gNT19TOMsD5JGabuUvxQEAh3d620TXxwg9RNUjjaVDsoY8mts7 XUB3xYizWF2oTfY0mPCSU56jYlW6MhYOMOvpec0aHPoQNI8Hk+neGVxhu0RNG20Q5vaQ LvuyADC44W4c2GwHWX2BXYLLgN3Ovfk0hx1g0T7pYyBhIWuy85+2gxDPFzBvV9cO3KuR +BVT4dh533xT4eQgqEeS9Hcz3j4xw+r7vYe/PrTIV7AA2ywGCEsPRE68qXjEPoEyJzF3 2D3DgmvVczOJA9t2Bb5j3znfb8hCLQViISC2gMrzLDWwD81NjP/AImXhBQzDgMfnMAjY bi6Q== 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=ULqIWi7jm+wUQEUKobn+hiSpw1sOCPadkeB+mpPSTw0=; b=qg/kvpoSl4KMBjwtavB09/JdKQz01QgFmvIfRUyA2kq2g8uzEYXK86GsxXYLKwJUxs MLepPa/fHNaDb55+bwGV61I3IFAjN+Ufc3t5M/hxRJAPl8io/ACPx6cm0JyokvsDvZZ9 Y9x8/6ZyCNNWqNbZXNnxEULbBAXSQ084sdotqoqtVJ4naHRqiVkB/Wq6v0z261KvNVvG ecEs3B7BtS9HJOWtz1/xNyU6pw7MkfK/6iaTD3XYYv7RdsL4mkc6UVT2nb0eqj3FYdGF Y49wHjeBBjSLeDHf8CZa5Ui3gq8NZYIuVhIkFd7YMVZBelLlqiMwhct+kIC5rz2bNO6w ibDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FLE4Zra7; 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 127-v6si1369135wmu.162.2018.06.05.07.27.14; Tue, 05 Jun 2018 07:27:14 -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=FLE4Zra7; 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 DA1C268A72E; Tue, 5 Jun 2018 17:26:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C067568A696 for ; Tue, 5 Jun 2018 17:26:11 +0300 (EEST) Received: by mail-pf0-f178.google.com with SMTP id a11-v6so1392730pff.8 for ; Tue, 05 Jun 2018 07:26:58 -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=q3eBmrdoyEQw5NDMoTvZvVExTYW30nlNmfsoycC4ums=; b=FLE4Zra7puHYj43FA45gGfdWfYn8avPqgkeAu4C5lbSKekSWPM2tXG+DhV2s7yiGBT Ugd9hjuhnklWkfaq2lLmL/wij4y7KvvMigzXeUy7/7k4vSWn8U5xS/AWKoc2+0a6Ezxg TalLnloYIm42qCzLFyTIUQto0jGyHCqa0S08jBG6yK7eTZUjkv8x50PSxrHq7hohSWX6 eqdcIN41yvK6/nFn41pv5oJeJGKjChBIr4PLeca0/K8hfzIsmHQsbkKIK3pyEOfdZdZ6 eDjs6Y5qR9pcvMPumLI3qKbWg0nq4ataiyOlCdT9arZVB04z84LdkZfpaMBCBGZ7qEA5 EAkw== 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=q3eBmrdoyEQw5NDMoTvZvVExTYW30nlNmfsoycC4ums=; b=R3CwDe9cwtfrXmy6drM59f0NYnZiyK+2i6d44CQ7XlAIbkwuO4VBhtBwIBR6PpBNMJ pNxaUwQBKIjE2wmpiZjpajCpyW3XpVH1vzF0g1C8jsIKAIDCMPJihEfHceQfEQShf4XE o6U2cIpLJxHtAXekqU9ZDJdmJXtj+W9i+J9c+UaUC3H4tBbqlX/r6JAvUXhvsiQGCQq/ Ikw9r1FuvuE3/OvV24ADlhLXJgs6bL5lAi/NdLPM/ftbD9y2TX0exh9RSr8F6Kluxxok 8FoC0W7iSJ66jhpBDsxwYjKzb+hwCtSpUvbGrbYrwfcgY/ZIz58YPqsGT59iQD7QgPH8 8qlA== X-Gm-Message-State: APt69E200AlmS2Oeu8TC+sY3GhYyFfZ9WG6vvH2s1uYRI2HfWT2iy2hT izp5z1lPRm1CKw28a81vQitenw== X-Received: by 2002:aa7:864d:: with SMTP id a13-v6mr9874093pfo.247.1528208817400; Tue, 05 Jun 2018 07:26:57 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id p24-v6sm100425034pfk.58.2018.06.05.07.26.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Jun 2018 07:26:56 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jun 2018 22:26:45 +0800 Message-Id: <1528208806-2600-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528208806-2600-1-git-send-email-mypopydev@gmail.com> References: <1528208806-2600-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/dolby_e: fix make checkheaders warning 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 init_tables() definitions from header file to .c file to fix make checkheaders warning. Signed-off-by: Jun Zhao --- libavcodec/dolby_e.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/dolby_e.h | 86 --------------------------------------------------- 2 files changed, 87 insertions(+), 86 deletions(-) diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index 91a00ce..429612e 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -681,6 +681,93 @@ static av_cold int dolby_e_close(AVCodecContext *avctx) return 0; } + +static av_cold void init_tables(void) +{ + int i, j; + + for (i = 1; i < 17; i++) + mantissa_tab1[i][0] = 1.0f / (1 << i - 1); + + for (i = 2; i < 16; i++) { + mantissa_tab1[i][1] = 1.0f / ((1 << i) - 1); + mantissa_tab1[i][2] = 0.5f / ((1 << i) - 1); + mantissa_tab1[i][3] = 0.25f / ((1 << i) - 1); + } + + mantissa_tab1[i][1] = 0.5f / (1 << 15); + mantissa_tab1[i][2] = 0.75f / (1 << 15); + mantissa_tab1[i][3] = 0.875f / (1 << 15); + + for (i = 1; i < 17; i++) { + mantissa_tab2[i][1] = mantissa_tab1[i][0] * 0.5f; + mantissa_tab2[i][2] = mantissa_tab1[i][0] * 0.75f; + mantissa_tab2[i][3] = mantissa_tab1[i][0] * 0.875f; + for (j = 1; j < 4; j++) + mantissa_tab3[i][j] = 1.0f / (1 << i) + 1.0f / (1 << j) - 1.0f / (1 << i + j); + } + + mantissa_tab3[1][3] = 0.6875f; + + for (i = 0; i < 25; i++) { + exponent_tab[i * 2 ] = 1.0f / (1 << i); + exponent_tab[i * 2 + 1] = M_SQRT1_2 / (1 << i); + } + + for (i = 1; i < 1024; i++) + gain_tab[i] = exp2f((i - 960) / 64.0f); + + // short 1 + ff_kbd_window_init(window, 3.0f, 128); + for (i = 0; i < 128; i++) + window[128 + i] = window[127 - i]; + + // start + for (i = 0; i < 192; i++) + window[256 + i] = start_window[i]; + + // short 2 + for (i = 0; i < 192; i++) + window[448 + i] = short_window2[i]; + for (i = 0; i < 64; i++) + window[640 + i] = window[63 - i]; + + // short 3 + for (i = 0; i < 64; i++) + window[704 + i] = short_window3[i]; + for (i = 0; i < 192; i++) + window[768 + i] = window[64 + i]; + + // bridge + for (i = 0; i < 128; i++) + window[960 + i] = window[i]; + for (i = 0; i < 64; i++) + window[1088 + i] = 1.0f; + + // long + ff_kbd_window_init(window + 1408, 3.0f, 256); + for (i = 0; i < 640; i++) + window[1664 + i] = 1.0f; + for (i = 0; i < 256; i++) + window[2304 + i] = window[1152 + i] = window[1663 - i]; + + // reverse start + for (i = 0; i < 192; i++) + window[2560 + i] = window[447 - i]; + + // reverse short 2 + for (i = 0; i < 256; i++) + window[2752 + i] = window[703 - i]; + + // reverse short 3 + for (i = 0; i < 256; i++) + window[3008 + i] = window[959 - i]; + + // reverse bridge + for (i = 0; i < 448; i++) + window[3264 + i] = window[1407 - i]; +} + static av_cold int dolby_e_init(AVCodecContext *avctx) { static AVOnce init_once = AV_ONCE_INIT; diff --git a/libavcodec/dolby_e.h b/libavcodec/dolby_e.h index 0390233..ae04bf6 100644 --- a/libavcodec/dolby_e.h +++ b/libavcodec/dolby_e.h @@ -644,90 +644,4 @@ static float gain_tab[1024]; DECLARE_ALIGNED(32, static float, window)[3712]; -static av_cold void init_tables(void) -{ - int i, j; - - for (i = 1; i < 17; i++) - mantissa_tab1[i][0] = 1.0f / (1 << i - 1); - - for (i = 2; i < 16; i++) { - mantissa_tab1[i][1] = 1.0f / ((1 << i) - 1); - mantissa_tab1[i][2] = 0.5f / ((1 << i) - 1); - mantissa_tab1[i][3] = 0.25f / ((1 << i) - 1); - } - - mantissa_tab1[i][1] = 0.5f / (1 << 15); - mantissa_tab1[i][2] = 0.75f / (1 << 15); - mantissa_tab1[i][3] = 0.875f / (1 << 15); - - for (i = 1; i < 17; i++) { - mantissa_tab2[i][1] = mantissa_tab1[i][0] * 0.5f; - mantissa_tab2[i][2] = mantissa_tab1[i][0] * 0.75f; - mantissa_tab2[i][3] = mantissa_tab1[i][0] * 0.875f; - for (j = 1; j < 4; j++) - mantissa_tab3[i][j] = 1.0f / (1 << i) + 1.0f / (1 << j) - 1.0f / (1 << i + j); - } - - mantissa_tab3[1][3] = 0.6875f; - - for (i = 0; i < 25; i++) { - exponent_tab[i * 2 ] = 1.0f / (1 << i); - exponent_tab[i * 2 + 1] = M_SQRT1_2 / (1 << i); - } - - for (i = 1; i < 1024; i++) - gain_tab[i] = exp2f((i - 960) / 64.0f); - - // short 1 - ff_kbd_window_init(window, 3.0f, 128); - for (i = 0; i < 128; i++) - window[128 + i] = window[127 - i]; - - // start - for (i = 0; i < 192; i++) - window[256 + i] = start_window[i]; - - // short 2 - for (i = 0; i < 192; i++) - window[448 + i] = short_window2[i]; - for (i = 0; i < 64; i++) - window[640 + i] = window[63 - i]; - - // short 3 - for (i = 0; i < 64; i++) - window[704 + i] = short_window3[i]; - for (i = 0; i < 192; i++) - window[768 + i] = window[64 + i]; - - // bridge - for (i = 0; i < 128; i++) - window[960 + i] = window[i]; - for (i = 0; i < 64; i++) - window[1088 + i] = 1.0f; - - // long - ff_kbd_window_init(window + 1408, 3.0f, 256); - for (i = 0; i < 640; i++) - window[1664 + i] = 1.0f; - for (i = 0; i < 256; i++) - window[2304 + i] = window[1152 + i] = window[1663 - i]; - - // reverse start - for (i = 0; i < 192; i++) - window[2560 + i] = window[447 - i]; - - // reverse short 2 - for (i = 0; i < 256; i++) - window[2752 + i] = window[703 - i]; - - // reverse short 3 - for (i = 0; i < 256; i++) - window[3008 + i] = window[959 - i]; - - // reverse bridge - for (i = 0; i < 448; i++) - window[3264 + i] = window[1407 - i]; -} - #endif