Move g722 to proper third_party directory
Bug: webrtc:8366 Change-Id: I81b051dd25da2d7eaa2902af284d8b669ad8e3c9 Reviewed-on: https://webrtc-review.googlesource.com/85620 Commit-Queue: Artem Titov <titovartem@webrtc.org> Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24096}
This commit is contained in:
parent
e095b81940
commit
52b9000380
@ -7,12 +7,6 @@ rtc_base/sigslot.h
|
||||
common_audio/fft4g.c
|
||||
common_audio/signal_processing/spl_sqrt_floor.c
|
||||
common_audio/signal_processing/spl_sqrt_floor_arm.S
|
||||
modules/audio_coding/codecs/g711/main/source/g711.c
|
||||
modules/audio_coding/codecs/g711/main/source/g711.h
|
||||
modules/audio_coding/codecs/g722/main/source/g722_decode.c
|
||||
modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
|
||||
modules/audio_coding/codecs/g722/main/source/g722_encode.c
|
||||
modules/audio_coding/codecs/isac/main/source/fft.c
|
||||
|
||||
Individual licenses for each file:
|
||||
-------------------------------------------------------------------------------
|
||||
@ -63,33 +57,6 @@ License:
|
||||
*/
|
||||
-------------------------------------------------------------------------------
|
||||
Files:
|
||||
modules/audio_coding/codecs/g722/main/source/g722_decode.c
|
||||
modules/audio_coding/codecs/g722/main/source/g722_enc_dec.h
|
||||
modules/audio_coding/codecs/g722/main/source/g722_encode.c
|
||||
|
||||
License:
|
||||
/*
|
||||
* SpanDSP - a series of DSP components for telephony
|
||||
*
|
||||
* g722_decode.c - The ITU G.722 codec, decode part.
|
||||
*
|
||||
* Written by Steve Underwood <steveu@coppice.org>
|
||||
*
|
||||
* Copyright (C) 2005 Steve Underwood
|
||||
*
|
||||
* Despite my general liking of the GPL, I place my own contributions
|
||||
* to this code in the public domain for the benefit of all mankind -
|
||||
* even the slimy ones who might try to proprietize my work and use it
|
||||
* to my detriment.
|
||||
*
|
||||
* Based in part on a single channel G.722 codec which is:
|
||||
*
|
||||
* Copyright (c) CMU 1993
|
||||
* Computer Science, Speech Group
|
||||
* Chengxiang Lu and Alex Hauptmann
|
||||
*/
|
||||
-------------------------------------------------------------------------------
|
||||
Files:
|
||||
common_audio/fft4g.c
|
||||
|
||||
License:
|
||||
|
||||
@ -251,18 +251,9 @@ rtc_source_set("g722_c") {
|
||||
"codecs/g722/g722_interface.h",
|
||||
]
|
||||
deps = [
|
||||
":g722_3p",
|
||||
"../..:typedefs",
|
||||
"../..:webrtc_common",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_source_set("g722_3p") {
|
||||
poisonous = [ "audio_codecs" ]
|
||||
sources = [
|
||||
"codecs/g722/g722_decode.c",
|
||||
"codecs/g722/g722_enc_dec.h",
|
||||
"codecs/g722/g722_encode.c",
|
||||
"../third_party/g722:g722_3p",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "modules/audio_coding/codecs/g722/g722_enc_dec.h"
|
||||
#include "modules/audio_coding/codecs/g722/g722_interface.h"
|
||||
#include "modules/third_party/g722/g722_enc_dec.h"
|
||||
#include "typedefs.h" // NOLINT(build/include)
|
||||
|
||||
int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
|
||||
|
||||
18
modules/third_party/g722/BUILD.gn
vendored
Normal file
18
modules/third_party/g722/BUILD.gn
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
# 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("g722_3p") {
|
||||
poisonous = [ "audio_codecs" ]
|
||||
sources = [
|
||||
"g722_decode.c",
|
||||
"g722_enc_dec.h",
|
||||
"g722_encode.c",
|
||||
]
|
||||
}
|
||||
20
modules/third_party/g722/LICENSE
vendored
Normal file
20
modules/third_party/g722/LICENSE
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
/*
|
||||
* SpanDSP - a series of DSP components for telephony
|
||||
*
|
||||
* g722_decode.c - The ITU G.722 codec, decode part.
|
||||
*
|
||||
* Written by Steve Underwood <steveu@coppice.org>
|
||||
*
|
||||
* Copyright (C) 2005 Steve Underwood
|
||||
*
|
||||
* Despite my general liking of the GPL, I place my own contributions
|
||||
* to this code in the public domain for the benefit of all mankind -
|
||||
* even the slimy ones who might try to proprietize my work and use it
|
||||
* to my detriment.
|
||||
*
|
||||
* Based in part on a single channel G.722 codec which is:
|
||||
*
|
||||
* Copyright (c) CMU 1993
|
||||
* Computer Science, Speech Group
|
||||
* Chengxiang Lu and Alex Hauptmann
|
||||
*/
|
||||
11
modules/third_party/g722/README.chromium
vendored
Normal file
11
modules/third_party/g722/README.chromium
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
Name: The ITU G.722 codec, encode and decode part.
|
||||
Short Name: g722
|
||||
URL:
|
||||
Version: 0
|
||||
Date: 2018-06-25
|
||||
License: Custom license
|
||||
License File: LICENSE
|
||||
Security Critical: yes
|
||||
|
||||
Description:
|
||||
The ITU G.722 codec, encode and decode part.
|
||||
@ -34,7 +34,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "modules/audio_coding/codecs/g722/g722_enc_dec.h"
|
||||
#include "modules/third_party/g722/g722_enc_dec.h"
|
||||
|
||||
#if !defined(FALSE)
|
||||
#define FALSE 0
|
||||
@ -34,7 +34,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "modules/audio_coding/codecs/g722/g722_enc_dec.h"
|
||||
#include "modules/third_party/g722/g722_enc_dec.h"
|
||||
|
||||
#if !defined(FALSE)
|
||||
#define FALSE 0
|
||||
@ -51,6 +51,7 @@ LIB_TO_LICENSES_DICT = {
|
||||
'portaudio': ['modules/third_party/portaudio/LICENSE'],
|
||||
'fft': ['modules/third_party/fft/LICENSE'],
|
||||
'g711': ['modules/third_party/g711/LICENSE'],
|
||||
'g722': ['modules/third_party/g722/LICENSE'],
|
||||
|
||||
# Compile time dependencies, no license needed:
|
||||
'yasm': [],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user