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

Remove various IDs:

Browse Source 
- AudioFrame
- AudioCodingModule

BUG=webrtc:4690
TBR=kwiberg@webrtc.org

Review-Url: https://codereview.webrtc.org/3019543002
Cr-Commit-Position: refs/heads/master@{#20005}
This commit is contained in:
solenberg
2017-09-27 10:33:57 -07:00
committed by Commit Bot
parent 94286cb25c
commit 2d0f77585d
25 changed files with 52 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,8 +157,7 @@ class PacketizationCallbackStubOldApi : public AudioPacketizationCallback {
class AudioCodingModuleTestOldApi : public ::testing::Test {
protected:
AudioCodingModuleTestOldApi()
: id_(1),
rtp_utility_(new RtpUtility(kFrameSizeSamples, kPayloadType)),
: rtp_utility_(new RtpUtility(kFrameSizeSamples, kPayloadType)),
clock_(Clock::GetRealTimeClock()) {}
~AudioCodingModuleTestOldApi() {}
@ -166,7 +165,7 @@ class AudioCodingModuleTestOldApi : public ::testing::Test {
void TearDown() {}
void SetUp() {
acm_.reset(AudioCodingModule::Create(id_, clock_));
acm_.reset(AudioCodingModule::Create(clock_));
rtp_utility_->Populate(&rtp_header_);
@ -230,7 +229,6 @@ class AudioCodingModuleTestOldApi : public ::testing::Test {
VerifyEncoding();
}
const int id_;
std::unique_ptr<RtpUtility> rtp_utility_;
std::unique_ptr<AudioCodingModule> acm_;
PacketizationCallbackStubOldApi packet_cb_;
@ -314,7 +312,6 @@ TEST_F(AudioCodingModuleTestOldApi, VerifyOutputFrame) {
bool muted;
EXPECT_EQ(0, acm_->PlayoutData10Ms(kSampleRateHz, &audio_frame, &muted));
ASSERT_FALSE(muted);
EXPECT_EQ(id_, audio_frame.id_);
EXPECT_EQ(0u, audio_frame.timestamp_);
EXPECT_GT(audio_frame.num_channels_, 0u);
EXPECT_EQ(static_cast<size_t>(kSampleRateHz / 100),