Reland rev 7041 with BUILD.gn files.
Original description: Audio codecs to include webrtc/typedefs.h Will easy merge of webrtc/typedefs.h and webrtc/base/basictypes.h CL Generated with: $ git grep -l \"typedefs.h\" | xargs sed -i "s/typedefs.h/webrtc\/typedefs.h/g" BUG=3777 R=henrik.lundin@webrtc.org, tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7061 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
3cbd6c26c8
commit
262e676a08
@ -110,7 +110,7 @@ source_set("audio_coding") {
|
|||||||
|
|
||||||
config("cng_config") {
|
config("cng_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/cng/include",
|
"codecs/cng/include",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -130,7 +130,7 @@ source_set("cng") {
|
|||||||
|
|
||||||
config("g711_config") {
|
config("g711_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/g711/include",
|
"codecs/g711/include",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -148,7 +148,7 @@ source_set("g711") {
|
|||||||
|
|
||||||
config("g722_config") {
|
config("g722_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/g722/include",
|
"codecs/g722/include",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -167,7 +167,7 @@ source_set("g722") {
|
|||||||
|
|
||||||
config("ilbc_config") {
|
config("ilbc_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/ilbc/interface",
|
"codecs/ilbc/interface",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -322,7 +322,7 @@ source_set("ilbc") {
|
|||||||
|
|
||||||
config("isac_config") {
|
config("isac_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/isac/main/interface",
|
"codecs/isac/main/interface",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -393,7 +393,7 @@ source_set("isac") {
|
|||||||
|
|
||||||
config("isac_fix_config") {
|
config("isac_fix_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/isac/fix/interface",
|
"codecs/isac/fix/interface",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -517,7 +517,7 @@ if (build_armv7_neon) {
|
|||||||
]
|
]
|
||||||
|
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Disable LTO in audio_processing_neon target due to compiler bug.
|
# Disable LTO in audio_processing_neon target due to compiler bug.
|
||||||
@ -546,7 +546,7 @@ if (build_armv7_neon) {
|
|||||||
|
|
||||||
config("pcm16b_config") {
|
config("pcm16b_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"../..",
|
"../../..",
|
||||||
"codecs/pcm16b/include",
|
"codecs/pcm16b/include",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -561,7 +561,7 @@ source_set("pcm16b") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
config("opus_config") {
|
config("opus_config") {
|
||||||
include_dirs = [ "../.." ]
|
include_dirs = [ "../../.." ]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("webrtc_opus") {
|
source_set("webrtc_opus") {
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include "cng_helpfuns.h"
|
#include "cng_helpfuns.h"
|
||||||
|
|
||||||
#include "signal_processing_library.h"
|
#include "signal_processing_library.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
#include "webrtc_cng.h"
|
#include "webrtc_cng.h"
|
||||||
|
|
||||||
/* Values in |k| are Q15, and |a| Q12. */
|
/* Values in |k| are Q15, and |a| Q12. */
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "g711.h"
|
#include "g711.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* Copied from the CCITT G.711 specification */
|
/* Copied from the CCITT G.711 specification */
|
||||||
static const uint8_t ulaw_to_alaw_table[256] = {
|
static const uint8_t ulaw_to_alaw_table[256] = {
|
||||||
|
@ -49,7 +49,7 @@ specification by other means.
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if defined(__i386__)
|
#if defined(__i386__)
|
||||||
/*! \brief Find the bit position of the highest set bit in a word
|
/*! \brief Find the bit position of the highest set bit in a word
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "g711.h"
|
#include "g711.h"
|
||||||
#include "g711_interface.h"
|
#include "g711_interface.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
int16_t WebRtcG711_EncodeA(void* state,
|
int16_t WebRtcG711_EncodeA(void* state,
|
||||||
int16_t* speechIn,
|
int16_t* speechIn,
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#ifndef MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
|
#ifndef MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
|
||||||
#define MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
|
#define MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
// Comfort noise constants
|
// Comfort noise constants
|
||||||
#define G711_WEBRTC_SPEECH 1
|
#define G711_WEBRTC_SPEECH 1
|
||||||
|
@ -34,13 +34,12 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "g722_enc_dec.h"
|
#include "g722_enc_dec.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if !defined(FALSE)
|
#if !defined(FALSE)
|
||||||
#define FALSE 0
|
#define FALSE 0
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#if !defined(_G722_ENC_DEC_H_)
|
#if !defined(_G722_ENC_DEC_H_)
|
||||||
#define _G722_ENC_DEC_H_
|
#define _G722_ENC_DEC_H_
|
||||||
|
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*! \page g722_page G.722 encoding and decoding
|
/*! \page g722_page G.722 encoding and decoding
|
||||||
\section g722_page_sec_1 What does it do?
|
\section g722_page_sec_1 What does it do?
|
||||||
The G.722 module is a bit exact implementation of the ITU G.722 specification for all three
|
The G.722 module is a bit exact implementation of the ITU G.722 specification for all three
|
||||||
|
@ -34,12 +34,12 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "g722_enc_dec.h"
|
#include "g722_enc_dec.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if !defined(FALSE)
|
#if !defined(FALSE)
|
||||||
#define FALSE 0
|
#define FALSE 0
|
||||||
|
@ -12,10 +12,9 @@
|
|||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "g722_interface.h"
|
|
||||||
#include "g722_enc_dec.h"
|
#include "g722_enc_dec.h"
|
||||||
#include "typedefs.h"
|
#include "g722_interface.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
|
int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
|
||||||
{
|
{
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#ifndef MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
|
#ifndef MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
|
||||||
#define MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
|
#define MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Solution to support multiple instances
|
* Solution to support multiple instances
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* include API */
|
/* include API */
|
||||||
#include "g722_interface.h"
|
#include "g722_interface.h"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_
|
||||||
|
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* high pass filters */
|
/* high pass filters */
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "signal_processing_library.h"
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "signal_processing_library.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* general codec settings */
|
/* general codec settings */
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
* Define the fixpoint numeric formats
|
* Define the fixpoint numeric formats
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Solution to support multiple instances
|
* Solution to support multiple instances
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*----------------------------------------------------------------*
|
/*----------------------------------------------------------------*
|
||||||
* Vector quantization of order 3 (based on MSE)
|
* Vector quantization of order 3 (based on MSE)
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*----------------------------------------------------------------*
|
/*----------------------------------------------------------------*
|
||||||
* Vector quantization of order 4 (based on MSE)
|
* Vector quantization of order 4 (based on MSE)
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
/*
|
/*
|
||||||
* Define the fixpoint numeric formats
|
* Define the fixpoint numeric formats
|
||||||
*/
|
*/
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
void *dummy;
|
void *dummy;
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
|
||||||
|
|
||||||
// MIPS optimization of the function WebRtcIsacfix_MatrixProduct1.
|
// MIPS optimization of the function WebRtcIsacfix_MatrixProduct1.
|
||||||
// Bit-exact with the function WebRtcIsacfix_MatrixProduct1C from
|
// Bit-exact with the function WebRtcIsacfix_MatrixProduct1C from
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if defined(__cplusplus) || defined(c_plusplus)
|
#if defined(__cplusplus) || defined(c_plusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if defined(__cplusplus) || defined(c_plusplus)
|
#if defined(__cplusplus) || defined(c_plusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -15,17 +15,17 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/codec.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/structs.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h"
|
||||||
#include "system_wrappers/interface/cpu_features_wrapper.h"
|
#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
|
||||||
|
|
||||||
// Declare function pointers.
|
// Declare function pointers.
|
||||||
FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix;
|
FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix;
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "signal_processing_library.h"
|
#include "signal_processing_library.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients
|
/* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients
|
||||||
* cth_Q15[] and sth_Q15[].
|
* cth_Q15[] and sth_Q15[].
|
||||||
|
@ -18,8 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
|
|
||||||
/* indices of KLT coefficients used */
|
/* indices of KLT coefficients used */
|
||||||
extern const uint16_t WebRtcIsacfix_kSelIndGain[12];
|
extern const uint16_t WebRtcIsacfix_kSelIndGain[12];
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
* be found in the AUTHORS file in the root of the source tree.
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common_audio/signal_processing/include/signal_processing_library.h"
|
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h"
|
||||||
|
|
||||||
/* Filter coefficicients in Q15. */
|
/* Filter coefficicients in Q15. */
|
||||||
static const int16_t kDampFilter[PITCH_DAMPORDER] = {
|
static const int16_t kDampFilter[PITCH_DAMPORDER] = {
|
||||||
|
@ -18,8 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
|
|
||||||
/********************* Pitch Filter Gain Coefficient Tables ************************/
|
/********************* Pitch Filter Gain Coefficient Tables ************************/
|
||||||
/* cdf for quantized pitch filter gains */
|
/* cdf for quantized pitch filter gains */
|
||||||
|
@ -18,9 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
|
||||||
|
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
#include "typedefs.h"
|
|
||||||
|
|
||||||
|
|
||||||
/********************* Pitch Filter Lag Coefficient Tables ************************/
|
/********************* Pitch Filter Lag Coefficient Tables ************************/
|
||||||
|
|
||||||
|
@ -19,9 +19,8 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/********************* AR Coefficient Tables ************************/
|
/********************* AR Coefficient Tables ************************/
|
||||||
/* cdf for quantized reflection coefficient 1 */
|
/* cdf for quantized reflection coefficient 1 */
|
||||||
|
@ -19,9 +19,9 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_
|
||||||
|
|
||||||
|
|
||||||
#include "common_audio/signal_processing/include/signal_processing_library.h"
|
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||||
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* Bitstream struct for decoder */
|
/* Bitstream struct for decoder */
|
||||||
typedef struct Bitstreamstruct_dec {
|
typedef struct Bitstreamstruct_dec {
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* WebRtcIsac_GetCrc(...)
|
* WebRtcIsac_GetCrc(...)
|
||||||
|
@ -17,16 +17,16 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "encode_lpc_swb.h"
|
#include "encode_lpc_swb.h"
|
||||||
#include "typedefs.h"
|
|
||||||
#include "settings.h"
|
|
||||||
|
|
||||||
#include "lpc_shape_swb12_tables.h"
|
|
||||||
#include "lpc_shape_swb16_tables.h"
|
|
||||||
#include "lpc_gain_swb_tables.h"
|
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
|
||||||
|
#include "lpc_gain_swb_tables.h"
|
||||||
|
#include "lpc_shape_swb12_tables.h"
|
||||||
|
#include "lpc_shape_swb16_tables.h"
|
||||||
|
#include "settings.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* WebRtcIsac_RemoveLarMean()
|
* WebRtcIsac_RemoveLarMean()
|
||||||
|
@ -19,10 +19,9 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "structs.h"
|
#include "structs.h"
|
||||||
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* WebRtcIsac_RemoveLarMean()
|
* WebRtcIsac_RemoveLarMean()
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "lpc_gain_swb_tables.h"
|
#include "lpc_gain_swb_tables.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
const double WebRtcIsac_kQSizeLpcGain = 0.100000;
|
const double WebRtcIsac_kQSizeLpcGain = 0.100000;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
|
||||||
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
extern const double WebRtcIsac_kQSizeLpcGain;
|
extern const double WebRtcIsac_kQSizeLpcGain;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "lpc_shape_swb12_tables.h"
|
#include "lpc_shape_swb12_tables.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mean value of LAR
|
* Mean value of LAR
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
|
||||||
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
|
extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "lpc_shape_swb16_tables.h"
|
#include "lpc_shape_swb16_tables.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mean value of LAR
|
* Mean value of LAR
|
||||||
|
@ -20,8 +20,7 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
|
||||||
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
|
|
||||||
extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
|
extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#if defined(WEBRTC_POSIX)
|
#if defined(WEBRTC_POSIX)
|
||||||
#define WebRtcIsac_lrint lrint
|
#define WebRtcIsac_lrint lrint
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
/* header file for coding tables for the pitch filter side-info in the entropy coder */
|
/* header file for coding tables for the pitch filter side-info in the entropy coder */
|
||||||
/********************* Pitch Filter Gain Coefficient Tables ************************/
|
/********************* Pitch Filter Gain Coefficient Tables ************************/
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
|
||||||
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
|
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
/* header file for coding tables for the pitch filter side-info in the entropy coder */
|
/* header file for coding tables for the pitch filter side-info in the entropy coder */
|
||||||
/********************* Pitch Filter Lag Coefficient Tables ************************/
|
/********************* Pitch Filter Lag Coefficient Tables ************************/
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
* Define the fixpoint numeric formats
|
* Define the fixpoint numeric formats
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#define HIGHEND 0xFF00
|
#define HIGHEND 0xFF00
|
||||||
#define LOWEND 0xFF
|
#define LOWEND 0xFF
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#ifndef TIMED_TRACE_H
|
#ifndef TIMED_TRACE_H
|
||||||
#define TIMED_TRACE_H
|
#define TIMED_TRACE_H
|
||||||
|
|
||||||
#include "typedefs.h"
|
#include "webrtc/typedefs.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user