admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-land "NetEq: Silence a few unexpected mock calls in NetEqImplTest"

Browse Source 
The change made in https://codereview.webrtc.org/1918193002 was
accidentally reverted in https://codereview.webrtc.org/1921243002, but
is now reinstalled.

TBR=kwiberg@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#12529}
This commit is contained in:
henrik.lundin 2016-04-27 06:11:50 -07:00 committed by Commit bot
parent 0415a56020
commit 034154b46a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc
View File

@ -327,6 +327,9 @@ TEST_F(NetEqImplTest, InsertPacket) {
} }
// Expectations for payload splitter. // Expectations for payload splitter.
EXPECT_CALL(*mock_payload_splitter_, SplitFec(_, _))
.Times(2)
.WillRepeatedly(Return(PayloadSplitter::kOK));
EXPECT_CALL(*mock_payload_splitter_, SplitAudio(_, _)) EXPECT_CALL(*mock_payload_splitter_, SplitAudio(_, _))
.Times(2) .Times(2)
.WillRepeatedly(Return(PayloadSplitter::kOK)); .WillRepeatedly(Return(PayloadSplitter::kOK));
@ -492,6 +495,8 @@ TEST_F(NetEqImplTest, ReorderedPacket) {
EXPECT_CALL(mock_decoder, Channels()).WillRepeatedly(Return(1)); EXPECT_CALL(mock_decoder, Channels()).WillRepeatedly(Return(1));
EXPECT_CALL(mock_decoder, IncomingPacket(_, kPayloadLengthBytes, _, _, _)) EXPECT_CALL(mock_decoder, IncomingPacket(_, kPayloadLengthBytes, _, _, _))
.WillRepeatedly(Return(0)); .WillRepeatedly(Return(0));
EXPECT_CALL(mock_decoder, PacketDuration(_, kPayloadLengthBytes))
.WillRepeatedly(Return(kPayloadLengthSamples));
int16_t dummy_output[kPayloadLengthSamples] = {0}; int16_t dummy_output[kPayloadLengthSamples] = {0};
// The below expectation will make the mock decoder write // The below expectation will make the mock decoder write
// |kPayloadLengthSamples| zeros to the output array, and mark it as speech. // |kPayloadLengthSamples| zeros to the output array, and mark it as speech.