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

Turned AudioDecoderFactory into a RefCounted thing to use with scoped_refptr.

Browse Source 
First step of AudioDecoderFactory injection CLs. AudioDecoderFactories will be shared, and shared_ptr is currently off the table, so this CL changes the current uses of AudioDecoderFactory from std::unique_ptr to rtc::scoped_refptr.

BUG=webrtc:5805

Review-Url: https://codereview.webrtc.org/1990803004
Cr-Commit-Position: refs/heads/master@{#12815}
This commit is contained in:
ossu
2016-05-19 10:48:04 -07:00
committed by Commit bot
parent 6e8224f4ab
commit e725f7c73e
9 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc
View File

@ -25,15 +25,13 @@
namespace webrtc {
TEST(DecoderDatabase, CreateAndDestroy) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
EXPECT_EQ(0, db.Size());
EXPECT_TRUE(db.Empty());
}
TEST(DecoderDatabase, InsertAndRemove) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
const uint8_t kPayloadType = 0;
const std::string kCodecName = "Robert\'); DROP TABLE Students;";
EXPECT_EQ(
@ -47,8 +45,7 @@ TEST(DecoderDatabase, InsertAndRemove) {
}
TEST(DecoderDatabase, GetDecoderInfo) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
const uint8_t kPayloadType = 0;
const std::string kCodecName = "Robert\'); DROP TABLE Students;";
EXPECT_EQ(
@ -66,8 +63,7 @@ TEST(DecoderDatabase, GetDecoderInfo) {
}
TEST(DecoderDatabase, GetRtpPayloadType) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
const uint8_t kPayloadType = 0;
const std::string kCodecName = "Robert\'); DROP TABLE Students;";
EXPECT_EQ(
@ -92,8 +88,7 @@ TEST(DecoderDatabase, GetDecoder) {
}
TEST(DecoderDatabase, TypeTests) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
const uint8_t kPayloadTypePcmU = 0;
const uint8_t kPayloadTypeCng = 13;
const uint8_t kPayloadTypeDtmf = 100;
@ -128,8 +123,7 @@ TEST(DecoderDatabase, TypeTests) {
}
TEST(DecoderDatabase, ExternalDecoder) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
const uint8_t kPayloadType = 0;
const std::string kCodecName = "Robert\'); DROP TABLE Students;";
MockAudioDecoder decoder;
@ -158,8 +152,7 @@ TEST(DecoderDatabase, ExternalDecoder) {
}
TEST(DecoderDatabase, CheckPayloadTypes) {
std::unique_ptr<MockAudioDecoderFactory> factory(new MockAudioDecoderFactory);
DecoderDatabase db(std::move(factory));
DecoderDatabase db(new rtc::RefCountedObject<MockAudioDecoderFactory>);
// Load a number of payloads into the database. Payload types are 0, 1, ...,
// while the decoder type is the same for all payload types (this does not
// matter for the test).