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

CodecManager::RegisterEncoder: Call SetFec on new encoder, not old

Browse Source 
BUG=webrtc:5028

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

Cr-Commit-Position: refs/heads/master@{#10604}
This commit is contained in:
kwiberg
2015-11-11 08:34:21 -08:00
committed by Commit bot
parent 718b6c72ae
commit 4dc941128f
4 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1647,6 +1647,9 @@ TEST_F(AcmSenderBitExactnessOldApi, External_Pcmu_20ms) {
EXPECT_CALL(mock_encoder, EncodeInternal(_, _, _, _))
.Times(AtLeast(1))
.WillRepeatedly(Invoke(&encoder, &AudioEncoderPcmU::EncodeInternal));
EXPECT_CALL(mock_encoder, SetFec(_))
.Times(AtLeast(1))
.WillRepeatedly(Invoke(&encoder, &AudioEncoderPcmU::SetFec));
ASSERT_NO_FATAL_FAILURE(
SetUpTestExternalEncoder(&mock_encoder, codec_inst.pltype));
Run("81a9d4c0bb72e9becc43aef124c981e9", "8f9b8750bd80fe26b6cbf6659b89f0f9",

11
webrtc/modules/audio_coding/main/acm2/codec_manager.cc
View File

@ -319,8 +319,15 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
if (send_codec_inst_.channels != 1)
dtx_enabled_ = false;
codec_fec_enabled_ =
codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
if (codec_fec_enabled_) {
// Switch FEC on. On failure, remember that FEC is off.
if (!external_speech_encoder->SetFec(true))
codec_fec_enabled_ = false;
} else {
// Switch FEC off. This shouldn't fail.
const bool success = external_speech_encoder->SetFec(false);
RTC_DCHECK(success);
}
int cng_pt = dtx_enabled_
? CngPayloadType(external_speech_encoder->SampleRateHz())
: -1;

66
webrtc/modules/audio_coding/main/acm2/codec_manager_unittest.cc Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright (c) 2015 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.
*/
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/main/acm2/codec_manager.h"
namespace webrtc {
namespace acm2 {
using ::testing::Return;
namespace {
// Create a MockAudioEncoder with some reasonable default behavior.
rtc::scoped_ptr<MockAudioEncoder> CreateMockEncoder() {
auto enc = rtc_make_scoped_ptr(new MockAudioEncoder);
EXPECT_CALL(*enc, SampleRateHz()).WillRepeatedly(Return(8000));
EXPECT_CALL(*enc, NumChannels()).WillRepeatedly(Return(1));
EXPECT_CALL(*enc, Max10MsFramesInAPacket()).WillRepeatedly(Return(1));
EXPECT_CALL(*enc, Die());
return enc;
}
} // namespace
TEST(CodecManagerTest, ExternalEncoderFec) {
auto enc0 = CreateMockEncoder();
auto enc1 = CreateMockEncoder();
{
::testing::InSequence s;
EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
EXPECT_CALL(*enc0, Mark("A"));
EXPECT_CALL(*enc0, SetFec(true)).WillOnce(Return(true));
EXPECT_CALL(*enc1, SetFec(true)).WillOnce(Return(true));
EXPECT_CALL(*enc1, SetFec(false)).WillOnce(Return(true));
EXPECT_CALL(*enc0, Mark("B"));
EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
}
CodecManager cm;
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
enc0->Mark("A");
EXPECT_EQ(0, cm.SetCodecFEC(true));
EXPECT_TRUE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc1.get());
EXPECT_TRUE(cm.codec_fec_enabled());
EXPECT_EQ(0, cm.SetCodecFEC(false));
enc0->Mark("B");
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
}
} // namespace acm2
} // namespace webrtc