Move g711 to proper third_party directory

Bug: webrtc:8366
Change-Id: Ic57bd5c5c01871aee2956b2a098a79b106f54c9e
Reviewed-on: https://webrtc-review.googlesource.com/85375
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24095}
This commit is contained in:
Artem Titov 2018-07-25 12:10:22 +02:00 committed by Commit Bot
parent b732b81e55
commit e095b81940
9 changed files with 46 additions and 31 deletions

View File

@ -63,26 +63,6 @@ License:
*/
-------------------------------------------------------------------------------
Files:
modules/audio_coding/codecs/g711/main/source/g711.c
modules/audio_coding/codecs/g711/main/source/g711.h
License:
/*
* SpanDSP - a series of DSP components for telephony
*
* g711.h - In line A-law and u-law conversion routines
*
* Written by Steve Underwood <steveu@coppice.org>
*
* Copyright (C) 2001 Steve Underwood
*
* Despite my general liking of the GPL, I place 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.
*/
-------------------------------------------------------------------------------
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

View File

@ -215,17 +215,9 @@ rtc_source_set("g711_c") {
"codecs/g711/g711_interface.h",
]
deps = [
":g711_3p",
"../..:typedefs",
"../..:webrtc_common",
]
}
rtc_source_set("g711_3p") {
poisonous = [ "audio_codecs" ]
sources = [
"codecs/g711/g711.c",
"codecs/g711/g711.h",
"../third_party/g711:g711_3p",
]
}

View File

@ -10,7 +10,7 @@
#include <string.h>
#include "modules/audio_coding/codecs/g711/g711.h"
#include "modules/third_party/g711/g711.h"
#include "modules/audio_coding/codecs/g711/g711_interface.h"
#include "typedefs.h" // NOLINT(build/include)

17
modules/third_party/g711/BUILD.gn vendored Normal file
View File

@ -0,0 +1,17 @@
# 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("g711_3p") {
poisonous = [ "audio_codecs" ]
sources = [
"g711.c",
"g711.h",
]
}

14
modules/third_party/g711/LICENSE vendored Normal file
View File

@ -0,0 +1,14 @@
/*
* SpanDSP - a series of DSP components for telephony
*
* g711.h - In line A-law and u-law conversion routines
*
* Written by Steve Underwood <steveu@coppice.org>
*
* Copyright (C) 2001 Steve Underwood
*
* Despite my general liking of the GPL, I place 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.
*/

View File

@ -0,0 +1,11 @@
Name: In line A-law and u-law conversion routines
Short Name: g711
URL:
Version: 0
Date: 2018-06-25
License: Custom license
License File: LICENSE
Security Critical: yes
Description:
In line A-law and u-law conversion routines

View File

@ -20,7 +20,7 @@
* -Added option to run encoder bitexact with ITU-T reference implementation
*/
#include "modules/audio_coding/codecs/g711/g711.h"
#include "modules/third_party/g711/g711.h"
/* Copied from the CCITT G.711 specification */
static const uint8_t ulaw_to_alaw_table[256] = {

View File

@ -50,6 +50,7 @@ LIB_TO_LICENSES_DICT = {
'base64': ['rtc_base/third_party/base64/LICENSE'],
'portaudio': ['modules/third_party/portaudio/LICENSE'],
'fft': ['modules/third_party/fft/LICENSE'],
'g711': ['modules/third_party/g711/LICENSE'],
# Compile time dependencies, no license needed:
'yasm': [],