zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move fft4g to proper third_party directory

Browse Source 
Bug: webrtc:8366
Change-Id: I98d3ae56a1d14b3ecacd85a4b3d234e215c8bc58
Reviewed-on: https://webrtc-review.googlesource.com/85642
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24103}
This commit is contained in:
Artem Titov
2018-07-25 16:56:18 +02:00
committed by Commit Bot
parent b4731ff9cb
commit 333a50562c
15 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LICENSE_THIRD_PARTY
View File

@ -2,7 +2,6 @@ This source tree contains third party source code which is governed by third
party licenses. Paths to the files and associated licenses are collected here.
Files governed by third party licenses:
common_audio/fft4g.c
common_audio/signal_processing/spl_sqrt_floor.c
common_audio/signal_processing/spl_sqrt_floor_arm.S
@ -41,15 +40,3 @@ License:
* Kevin
*/
-------------------------------------------------------------------------------
Files:
common_audio/fft4g.c
License:
/*
* http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
* Copyright Takuya OOURA, 1996-2001
*
* You may use, copy, modify and distribute this code for any purpose (include
* commercial use) and without fee. Please refer to this package when you modify
* this code.
*/

12
common_audio/BUILD.gn
View File

@ -52,7 +52,6 @@ rtc_static_library("common_audio") {
deps = [
":common_audio_c",
":fft4g",
":sinc_resampler",
"..:webrtc_common",
"../rtc_base:checks",
@ -63,6 +62,7 @@ rtc_static_library("common_audio") {
"../rtc_base/system:arch",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
"third_party/fft4g:fft4g",
"//third_party/abseil-cpp/absl/types:optional",
]
@ -190,7 +190,6 @@ rtc_source_set("common_audio_c") {
deps = [
":common_audio_c_arm_asm",
":common_audio_cc",
":fft4g",
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:compile_assert_c",
@ -199,14 +198,7 @@ rtc_source_set("common_audio_c") {
"../rtc_base/system:arch",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
]
}
rtc_source_set("fft4g") {
visibility += webrtc_default_visibility
sources = [
"fft4g.c",
"fft4g.h",
"third_party/fft4g:fft4g",
]
}

2
common_audio/real_fourier_ooura.cc
View File

@ -13,7 +13,7 @@
#include <algorithm>
#include <cmath>
#include "common_audio/fft4g.h"
#include "common_audio/third_party/fft4g/fft4g.h"
#include "rtc_base/checks.h"
namespace webrtc {

16
common_audio/third_party/fft4g/BUILD.gn vendored Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
import("../../../webrtc.gni")
rtc_source_set("fft4g") {
sources = [
"fft4g.c",
"fft4g.h",
]
}

8
common_audio/third_party/fft4g/LICENSE vendored Normal file
View File

@ -0,0 +1,8 @@
/*
* http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
* Copyright Takuya OOURA, 1996-2001
*
* You may use, copy, modify and distribute this code for any purpose (include
* commercial use) and without fee. Please refer to this package when you modify
* this code.
*/

13
common_audio/third_party/fft4g/README.chromium vendored Normal file
View File

@ -0,0 +1,13 @@
Name: General Purpose FFT (Fast Fourier/Cosine/Sine Transform) Package
Short Name: fft4g
URL: http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
Version: 0
Date: 2018-06-19
License: Custome license
License File: LICENSE
Security Critical: yes
Description:
This is a package to calculate Discrete Fourier/Cosine/Sine Transforms of
1-dimensional sequences of length 2^N. This package contains C and Fortran
FFT codes.

0
common_audio/fft4g.c → common_audio/third_party/fft4g/fft4g.c vendored
View File

0
common_audio/fft4g.h → common_audio/third_party/fft4g/fft4g.h vendored
View File

4
modules/audio_processing/BUILD.gn
View File

@ -108,7 +108,7 @@ rtc_static_library("audio_processing") {
"../../api/audio:echo_control",
"../../audio/utility:audio_frame_operations",
"../../common_audio:common_audio_c",
"../../common_audio:fft4g",
"../../common_audio/third_party/fft4g:fft4g",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
"../../rtc_base:gtest_prod",
@ -260,7 +260,7 @@ rtc_source_set("audio_processing_c") {
"../..:webrtc_common",
"../../common_audio",
"../../common_audio:common_audio_c",
"../../common_audio:fft4g",
"../../common_audio/third_party/fft4g:fft4g",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",

2
modules/audio_processing/agc/BUILD.gn
View File

@ -67,7 +67,7 @@ rtc_source_set("agc_legacy_c") {
"../../..:webrtc_common",
"../../../common_audio",
"../../../common_audio:common_audio_c",
"../../../common_audio:fft4g",
"../../../common_audio/third_party/fft4g",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../system_wrappers:cpu_features_api",

2
modules/audio_processing/ns/ns_core.c
View File

@ -13,8 +13,8 @@
#include <stdlib.h>
#include "rtc_base/checks.h"
#include "common_audio/fft4g.h"
#include "common_audio/signal_processing/include/signal_processing_library.h"
#include "common_audio/third_party/fft4g/fft4g.h"
#include "modules/audio_processing/ns/noise_suppression.h"
#include "modules/audio_processing/ns/ns_core.h"
#include "modules/audio_processing/ns/windows_private.h"

2
modules/audio_processing/transient/transient_suppressor.cc
View File

@ -17,9 +17,9 @@
#include <deque>
#include <set>
#include "common_audio/fft4g.h"
#include "common_audio/include/audio_util.h"
#include "common_audio/signal_processing/include/signal_processing_library.h"
#include "common_audio/third_party/fft4g/fft4g.h"
#include "modules/audio_processing/ns/windows_private.h"
#include "modules/audio_processing/transient/common.h"
#include "modules/audio_processing/transient/transient_detector.h"

2
modules/audio_processing/vad/BUILD.gn
View File

@ -38,7 +38,7 @@ rtc_static_library("vad") {
"../../../audio/utility:audio_frame_operations",
"../../../common_audio",
"../../../common_audio:common_audio_c",
"../../../common_audio:fft4g",
"../../../common_audio/third_party/fft4g:fft4g",
"../../../rtc_base:checks",
"../../audio_coding:isac_vad",
]

2
modules/audio_processing/vad/vad_audio_proc.cc
View File

@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
#include "common_audio/fft4g.h"
#include "common_audio/third_party/fft4g/fft4g.h"
#include "modules/audio_processing/vad/pitch_internal.h"
#include "modules/audio_processing/vad/pole_zero_filter.h"
#include "modules/audio_processing/vad/vad_audio_proc_internal.h"

1
tools_webrtc/libs/generate_licenses.py
View File

@ -53,6 +53,7 @@ LIB_TO_LICENSES_DICT = {
'fft': ['modules/third_party/fft/LICENSE'],
'g711': ['modules/third_party/g711/LICENSE'],
'g722': ['modules/third_party/g722/LICENSE'],
'fft4g': ['common_audio/third_party/fft4g/LICENSE'],
# Compile time dependencies, no license needed:
'yasm': [],