Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

Issue 2326003002: Moved codec-specific audio packet splitting into decoders. (Closed)
Patch Set: Fixed types in packet splitting (size_t vs. uint32_t) Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 EXPECT_CALL(*mock_delay_manager_, last_pack_cng_or_dtmf()) 323 EXPECT_CALL(*mock_delay_manager_, last_pack_cng_or_dtmf())
324 .WillOnce(Return(0)); 324 .WillOnce(Return(0));
325 EXPECT_CALL(*mock_delay_manager_, SetPacketAudioLength(30)) 325 EXPECT_CALL(*mock_delay_manager_, SetPacketAudioLength(30))
326 .WillOnce(Return(0)); 326 .WillOnce(Return(0));
327 } 327 }
328 328
329 // Expectations for payload splitter. 329 // Expectations for payload splitter.
330 EXPECT_CALL(*mock_payload_splitter_, SplitFec(_, _)) 330 EXPECT_CALL(*mock_payload_splitter_, SplitFec(_, _))
331 .Times(2) 331 .Times(2)
332 .WillRepeatedly(Return(PayloadSplitter::kOK)); 332 .WillRepeatedly(Return(PayloadSplitter::kOK));
333 EXPECT_CALL(*mock_payload_splitter_, SplitAudio(_, _))
334 .Times(2)
335 .WillRepeatedly(Return(PayloadSplitter::kOK));
336 333
337 // Insert first packet. 334 // Insert first packet.
338 neteq_->InsertPacket(rtp_header, payload, kFirstReceiveTime); 335 neteq_->InsertPacket(rtp_header, payload, kFirstReceiveTime);
339 336
340 // Insert second packet. 337 // Insert second packet.
341 rtp_header.header.timestamp += 160; 338 rtp_header.header.timestamp += 160;
342 rtp_header.header.sequenceNumber += 1; 339 rtp_header.header.sequenceNumber += 1;
343 neteq_->InsertPacket(rtp_header, payload, kFirstReceiveTime + 155); 340 neteq_->InsertPacket(rtp_header, payload, kFirstReceiveTime + 155);
344 } 341 }
345 342
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 EXPECT_CALL(*mock_delay_manager_, BufferLimits(_, _)) 1421 EXPECT_CALL(*mock_delay_manager_, BufferLimits(_, _))
1425 .Times(1) 1422 .Times(1)
1426 .WillOnce(DoAll(SetArgPointee<0>(1), SetArgPointee<1>(2))); 1423 .WillOnce(DoAll(SetArgPointee<0>(1), SetArgPointee<1>(2)));
1427 1424
1428 bool muted; 1425 bool muted;
1429 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted)); 1426 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output_, &muted));
1430 EXPECT_EQ(kAccelerate, neteq_->last_operation_for_test()); 1427 EXPECT_EQ(kAccelerate, neteq_->last_operation_for_test());
1431 } 1428 }
1432 1429
1433 }// namespace webrtc 1430 }// namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_impl.cc ('k') | webrtc/modules/audio_coding/neteq/payload_splitter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698