webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc - Issue 2685783014: Replace NULL with nullptr in all C++ files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_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 side-by-side diff with in-line comments

Download patch

« webrtc/base/event.cc ('K') | « webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc ('k') | webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc

diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc

index 2b1035fca1cc42ba35c2da43fb8f49f9a1d1bc93..adae23d354db1ef645dfa1e82af7bc83d77eb698 100644

--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc

+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc

@@ -150,7 +150,7 @@ class MockVideoEncoder : public VideoEncoder {

image._encodedHeight = height;

CodecSpecificInfo codec_specific_info;

memset(&codec_specific_info, 0, sizeof(codec_specific_info));

- callback_->OnEncodedImage(image, &codec_specific_info, NULL);

+ callback_->OnEncodedImage(image, &codec_specific_info, nullptr);

}

void set_supports_native_handle(bool enabled) {

@@ -537,7 +537,7 @@ TEST_F(TestSimulcastEncoderAdapterFake,

for (MockVideoEncoder* encoder : helper_->factory()->encoders())

EXPECT_CALL(*encoder, Encode(::testing::Ref(input_frame), _, _)).Times(1);

std::vector<FrameType> frame_types(3, kVideoFrameKey);

- EXPECT_EQ(0, adapter_->Encode(input_frame, NULL, &frame_types));

+ EXPECT_EQ(0, adapter_->Encode(input_frame, nullptr, &frame_types));

}

TEST_F(TestSimulcastEncoderAdapterFake, TestFailureReturnCodesFromEncodeCalls) {