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

Delete unused method AudioCodingModuleImpl::SetOpusApplication.

Browse Source 
Bug: None
Change-Id: I8fc1b4b9a4521444867c8b34ee54187c86dd6027
Reviewed-on: https://webrtc-review.googlesource.com/c/102040
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24993}
This commit is contained in:
Niels Möller
2018-09-26 10:33:35 +02:00
committed by Commit Bot
parent 530ead4974
commit eddd3665a2
3 changed files with 3 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/audio_coding/acm2/audio_coding_module.cc
View File

@ -167,8 +167,6 @@ class AudioCodingModuleImpl final : public AudioCodingModule {
int GetNetworkStatistics(NetworkStatistics* statistics) override;
int SetOpusApplication(OpusApplicationMode application) override;
// If current send codec is Opus, informs it about the maximum playback rate
// the receiver will render.
int SetOpusMaxPlaybackRate(int frequency_hz) override;
@ -1097,26 +1095,6 @@ int AudioCodingModuleImpl::RegisterVADCallback(ACMVADCallback* vad_callback) {
return 0;
}
int AudioCodingModuleImpl::SetOpusApplication(OpusApplicationMode application) {
rtc::CritScope lock(&acm_crit_sect_);
if (!HaveValidEncoder("SetOpusApplication")) {
return -1;
}
AudioEncoder::Application app;
switch (application) {
case kVoip:
app = AudioEncoder::Application::kSpeech;
break;
case kAudio:
app = AudioEncoder::Application::kAudio;
break;
default:
FATAL();
return 0;
}
return encoder_stack_->SetApplication(app) ? 0 : -1;
}
// Informs Opus encoder of the maximum playback rate the receiver will render.
int AudioCodingModuleImpl::SetOpusMaxPlaybackRate(int frequency_hz) {
rtc::CritScope lock(&acm_crit_sect_);

25
modules/audio_coding/acm2/audio_coding_module_unittest.cc
View File

@ -1475,32 +1475,13 @@ TEST_F(AcmSenderBitExactnessNewApi, MAYBE_OpusFromFormat_stereo_20ms) {
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms_voip) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960));
// If not set, default will be kAudio in case of stereo.
EXPECT_EQ(0, send_test_->acm()->SetOpusApplication(kVoip));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
"b0325df4e8104f04e03af23c0b75800e",
"b0325df4e8104f04e03af23c0b75800e",
"1c81121f5d9286a5a865d01dbab22ce8",
"11d547f89142e9ef03f37d7ca7f32379",
"11d547f89142e9ef03f37d7ca7f32379"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
"4eab2259b6fe24c22dd242a113e0b3d9",
"4eab2259b6fe24c22dd242a113e0b3d9",
"839ea60399447268ee0f0262a50b75fd",
"1815fd5589cad0c6f6cf946c76b81aeb",
"1815fd5589cad0c6f6cf946c76b81aeb"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
TEST_F(AcmSenderBitExactnessNewApi, OpusFromFormat_stereo_20ms_voip) {
const auto config = AudioEncoderOpus::SdpToConfig(
auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
// If not set, default will be kAudio in case of stereo.
config->application = AudioEncoderOpusConfig::ApplicationMode::kVoip;
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
// If not set, default will be kAudio in case of stereo.
EXPECT_EQ(0, send_test_->acm()->SetOpusApplication(kVoip));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
"b0325df4e8104f04e03af23c0b75800e",
"b0325df4e8104f04e03af23c0b75800e",

16
modules/audio_coding/include/audio_coding_module.h
View File

@ -625,22 +625,6 @@ class AudioCodingModule {
// Codec specific
//
///////////////////////////////////////////////////////////////////////////
// int SetOpusApplication()
// Sets the intended application if current send codec is Opus. Opus uses this
// to optimize the encoding for applications like VOIP and music. Currently,
// two modes are supported: kVoip and kAudio.
//
// Input:
// - application : intended application.
//
// Return value:
// -1 if current send codec is not Opus or error occurred in setting the
// Opus application mode.
// 0 if the Opus application mode is successfully set.
//
virtual int SetOpusApplication(OpusApplicationMode application) = 0;
///////////////////////////////////////////////////////////////////////////
// int SetOpusMaxPlaybackRate()
// If current send codec is Opus, informs it about maximum playback rate the