generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Committing a file that was part of CL 175002, but for wome reason weren't uploaded correctly.

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@882 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org
2011-11-03 17:54:27 +00:00
parent fb389e3b02
commit 2475a1953a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio_coding/main/source/acm_codec_database.cc
View File

@@ -112,9 +112,9 @@ const int kDynamicPayloadtypes[ACMCodecDB::kMaxNumCodecs] = {
static int count_database = 0; static int count_database = 0;
const CodecInst ACMCodecDB::database_[] = { const CodecInst ACMCodecDB::database_[] = {
#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
{103, "ISAC", 16000, ISACWB_PAC_SIZE, 1, ISACWB_DEFAULT_RATE}, {103, "ISAC", 16000, kIsacPacSize480, 1, kIsacWbDefaultRate},
# if (defined(WEBRTC_CODEC_ISAC)) # if (defined(WEBRTC_CODEC_ISAC))
{104, "ISAC", 32000, ISACSWB_PAC_SIZE, 1, ISACSWB_DEFAULT_RATE}, {104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate},
# endif # endif
#endif #endif
#ifdef WEBRTC_CODEC_PCM16 #ifdef WEBRTC_CODEC_PCM16
@@ -180,9 +180,9 @@ const CodecInst ACMCodecDB::database_[] = {
// Basic block samples, max number of channels that are supported. // Basic block samples, max number of channels that are supported.
const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = { const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
{2, {ISACWB_PAC_SIZE, ISACWB_PAC_SIZE*2}, 0, 1}, {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1},
# if (defined(WEBRTC_CODEC_ISAC)) # if (defined(WEBRTC_CODEC_ISAC))
{1, {ISACSWB_PAC_SIZE}, 0, 1}, {1, {kIsacPacSize960}, 0, 1},
# endif # endif
#endif #endif
#ifdef WEBRTC_CODEC_PCM16 #ifdef WEBRTC_CODEC_PCM16