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

Side by Side Diff: webrtc/modules/video_coding/video_receiver_unittest.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const int kMaxPacketAgeToNack = 450; 42 const int kMaxPacketAgeToNack = 450;
43 receiver_->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0); 43 receiver_->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
44 44
45 VideoCodingModule::Codec(kVideoCodecVP8, &settings_); 45 VideoCodingModule::Codec(kVideoCodecVP8, &settings_);
46 settings_.plType = kUnusedPayloadType; // Use the mocked encoder. 46 settings_.plType = kUnusedPayloadType; // Use the mocked encoder.
47 EXPECT_EQ(0, receiver_->RegisterReceiveCodec(&settings_, 1, true)); 47 EXPECT_EQ(0, receiver_->RegisterReceiveCodec(&settings_, 1, true));
48 } 48 }
49 49
50 void InsertAndVerifyPaddingFrame(const uint8_t* payload, 50 void InsertAndVerifyPaddingFrame(const uint8_t* payload,
51 WebRtcRTPHeader* header) { 51 WebRtcRTPHeader* header) {
52 ASSERT_TRUE(header != NULL); 52 ASSERT_TRUE(header != nullptr);
53 for (int j = 0; j < 5; ++j) { 53 for (int j = 0; j < 5; ++j) {
54 // Padding only packets are passed to the VCM with payload size 0. 54 // Padding only packets are passed to the VCM with payload size 0.
55 EXPECT_EQ(0, receiver_->IncomingPacket(payload, 0, *header)); 55 EXPECT_EQ(0, receiver_->IncomingPacket(payload, 0, *header));
56 ++header->header.sequenceNumber; 56 ++header->header.sequenceNumber;
57 } 57 }
58 receiver_->Process(); 58 receiver_->Process();
59 EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(0); 59 EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(0);
60 EXPECT_EQ(VCM_FRAME_NOT_READY, receiver_->Decode(100)); 60 EXPECT_EQ(VCM_FRAME_NOT_READY, receiver_->Decode(100));
61 } 61 }
62 62
63 void InsertAndVerifyDecodableFrame(const uint8_t* payload, 63 void InsertAndVerifyDecodableFrame(const uint8_t* payload,
64 size_t length, 64 size_t length,
65 WebRtcRTPHeader* header) { 65 WebRtcRTPHeader* header) {
66 ASSERT_TRUE(header != NULL); 66 ASSERT_TRUE(header != nullptr);
67 EXPECT_EQ(0, receiver_->IncomingPacket(payload, length, *header)); 67 EXPECT_EQ(0, receiver_->IncomingPacket(payload, length, *header));
68 ++header->header.sequenceNumber; 68 ++header->header.sequenceNumber;
69 EXPECT_CALL(packet_request_callback_, ResendPackets(_, _)).Times(0); 69 EXPECT_CALL(packet_request_callback_, ResendPackets(_, _)).Times(0);
70 receiver_->Process();; 70 receiver_->Process();;
71 EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(1); 71 EXPECT_CALL(decoder_, Decode(_, _, _, _, _)).Times(1);
72 EXPECT_EQ(0, receiver_->Decode(100)); 72 EXPECT_EQ(0, receiver_->Decode(100));
73 } 73 }
74 74
75 SimulatedClock clock_; 75 SimulatedClock clock_;
76 NullEventFactory event_factory_; 76 NullEventFactory event_factory_;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 TEST_F(TestVideoReceiver, ReceiverDelay) { 204 TEST_F(TestVideoReceiver, ReceiverDelay) {
205 EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0)); 205 EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0));
206 EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000)); 206 EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000));
207 EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100)); 207 EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100));
208 EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010)); 208 EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010));
209 } 209 }
210 210
211 } // namespace 211 } // namespace
212 } // namespace vcm 212 } // namespace vcm
213 } // namespace webrtc 213 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698