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

Delete iSAC-fb from AudioCodingModule

Browse Source 
This is no longer used. Related code in NetEq and the iSAC codec itself
will be deleted in follow-up CLs.

BUG=4210

Review URL: https://codereview.webrtc.org/1404623002

Cr-Commit-Position: refs/heads/master@{#10264}
This commit is contained in:
henrik.lundin
2015-10-13 06:27:57 -07:00
committed by Commit bot
parent ec93628e75
commit 9ea2147e5c
8 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
View File

@ -68,7 +68,6 @@ const CodecInst ACMCodecDB::database_[] = {
{103, "ISAC", 16000, kIsacPacSize480, 1, kIsacWbDefaultRate},
# if (defined(WEBRTC_CODEC_ISAC))
{104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate},
{105, "ISAC", 48000, kIsacPacSize1440, 1, kIsacSwbDefaultRate},
# endif
#endif
// Mono
@ -124,7 +123,6 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
{2, {kIsacPacSize480, kIsacPacSize960}, 0, 1},
# if (defined(WEBRTC_CODEC_ISAC))
{1, {kIsacPacSize960}, 0, 1},
{1, {kIsacPacSize1440}, 0, 1},
# endif
#endif
// Mono
@ -178,7 +176,6 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
kDecoderISAC,
# if (defined(WEBRTC_CODEC_ISAC))
kDecoderISACswb,
kDecoderISACfb,
# endif
#endif
// Mono

2
webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
View File

@ -35,7 +35,6 @@ class ACMCodecDB {
, kISAC
# if (defined(WEBRTC_CODEC_ISAC))
, kISACSWB
, kISACFB
# endif
#endif
// Mono
@ -81,7 +80,6 @@ class ACMCodecDB {
// Set unsupported codecs to -1
#ifndef WEBRTC_CODEC_ISAC
enum {kISACSWB = -1};
enum {kISACFB = -1};
# ifndef WEBRTC_CODEC_ISACFX
enum {kISAC = -1};
# endif

1
webrtc/modules/audio_coding/main/acm2/acm_common_defs.h
View File

@ -26,7 +26,6 @@ const int kIsacWbDefaultRate = 32000;
const int kIsacSwbDefaultRate = 56000;
const int kIsacPacSize480 = 480;
const int kIsacPacSize960 = 960;
const int kIsacPacSize1440 = 1440;
} // namespace webrtc

2
webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc
View File

@ -46,7 +46,6 @@ void AcmReceiveTest::RegisterDefaultCodecs() {
#endif
#ifdef WEBRTC_CODEC_ISAC
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACSWB, 104));
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACFB, 105));
#endif
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16B, 107));
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16Bwb, 108));
@ -79,7 +78,6 @@ void AcmReceiveTest::RegisterNetEqTestCodecs() {
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISAC, 103));
#ifndef WEBRTC_ANDROID
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACSWB, 104));
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACFB, 124));
#endif
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16B, 93));
ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16Bwb, 94));

3
webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.cc
View File

@ -47,7 +47,6 @@ bool ModifyAndUseThisCodec(CodecInst* codec_param) {
// iLBC = 102
// iSAC wideband = 103
// iSAC super-wideband = 104
// iSAC fullband = 124
// AVT/DTMF = 106
// RED = 117
// PCM16b 8 kHz = 93
@ -78,8 +77,6 @@ bool RemapPltypeAndUseThisCodec(const char* plname,
*pltype = 103;
} else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) {
*pltype = 104;
} else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 48000) {
*pltype = 124;
} else if (STR_CASE_CMP(plname, "telephone-event") == 0) {
*pltype = 106;
} else if (STR_CASE_CMP(plname, "red") == 0) {

2
webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
View File

@ -244,7 +244,7 @@ TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) {
TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(SampleRate)) {
const int kCodecId[] = {
ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, ACMCodecDB::kISACFB,
ACMCodecDB::kISAC, ACMCodecDB::kISACSWB,
-1 // Terminator.
};
AddSetOfCodecs(kCodecId);

2
webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc
View File

@ -243,7 +243,7 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) {
TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(SampleRate)) {
const int kCodecId[] = {
ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, ACMCodecDB::kISACFB,
ACMCodecDB::kISAC, ACMCodecDB::kISACSWB,
-1 // Terminator.
};
AddSetOfCodecs(kCodecId);

5
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
View File

@ -1008,11 +1008,6 @@ bool AudioCodingImpl::MapCodecTypeToParameters(int codec_type,
*sample_rate_hz = 32000;
*channels = 1;
break;
case acm2::ACMCodecDB::kISACFB:
*codec_name = "ISAC";
*sample_rate_hz = 48000;
*channels = 1;
break;
#endif
#ifdef WEBRTC_CODEC_ILBC
case acm2::ACMCodecDB::kILBC: