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

Move Rent-A-Codec out of CodecManager

Browse Source 
So that the two of them sit next to each other at the top level of
AudioCodingModuleImpl. CodecManager now manages the specifications for
Rent-A-Codec, rather than managing encoders directly.

BUG=webrtc:5028

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

Cr-Commit-Position: refs/heads/master@{#11048}
This commit is contained in:
kwiberg
2015-12-16 04:19:08 -08:00
committed by Commit bot
parent a29386c26d
commit a6db4958c9
6 changed files with 167 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc
View File

@ -11,6 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
namespace webrtc {
namespace acm2 {
@ -46,20 +47,26 @@ TEST(CodecManagerTest, ExternalEncoderFec) {
}
CodecManager cm;
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
RentACodec rac;
EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
cm.GetStackParams()->speech_encoder = enc0.get();
EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
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(true, cm.SetCodecFEC(true));
EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
EXPECT_TRUE(cm.GetStackParams()->use_codec_fec);
cm.GetStackParams()->speech_encoder = enc1.get();
EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
EXPECT_TRUE(cm.GetStackParams()->use_codec_fec);
EXPECT_EQ(0, cm.SetCodecFEC(false));
EXPECT_EQ(true, cm.SetCodecFEC(false));
EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
enc0->Mark("B");
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
cm.GetStackParams()->speech_encoder = enc0.get();
EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
}
} // namespace acm2