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

Side by Side Diff: webrtc/video/end_to_end_tests.cc

Issue 1855433002: Replace NULL with nullptr in webrtc/video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: replace x == nullptr with !x Created 4 years, 8 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
« no previous file with comments | « webrtc/video/encoded_frame_callback_adapter.cc ('k') | webrtc/video/overuse_frame_detector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <algorithm> 10 #include <algorithm>
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 }; 1521 };
1522 1522
1523 class TransportSequenceNumberTester : public MultiStreamTest { 1523 class TransportSequenceNumberTester : public MultiStreamTest {
1524 public: 1524 public:
1525 TransportSequenceNumberTester() 1525 TransportSequenceNumberTester()
1526 : first_media_ssrc_(0), observer_(nullptr) {} 1526 : first_media_ssrc_(0), observer_(nullptr) {}
1527 virtual ~TransportSequenceNumberTester() {} 1527 virtual ~TransportSequenceNumberTester() {}
1528 1528
1529 protected: 1529 protected:
1530 void Wait() override { 1530 void Wait() override {
1531 RTC_DCHECK(observer_ != nullptr); 1531 RTC_DCHECK(observer_);
1532 EXPECT_TRUE(observer_->Wait()); 1532 EXPECT_TRUE(observer_->Wait());
1533 } 1533 }
1534 1534
1535 void UpdateSendConfig( 1535 void UpdateSendConfig(
1536 size_t stream_index, 1536 size_t stream_index,
1537 VideoSendStream::Config* send_config, 1537 VideoSendStream::Config* send_config,
1538 VideoEncoderConfig* encoder_config, 1538 VideoEncoderConfig* encoder_config,
1539 test::FrameGeneratorCapturer** frame_generator) override { 1539 test::FrameGeneratorCapturer** frame_generator) override {
1540 send_config->rtp.extensions.clear(); 1540 send_config->rtp.extensions.clear();
1541 send_config->rtp.extensions.push_back( 1541 send_config->rtp.extensions.push_back(
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2663 assert(stats.current_payload_type == -1 || 2663 assert(stats.current_payload_type == -1 ||
2664 stats.current_payload_type == kFakeVideoSendPayloadType); 2664 stats.current_payload_type == kFakeVideoSendPayloadType);
2665 receive_stats_filled_["IncomingPayloadType"] |= 2665 receive_stats_filled_["IncomingPayloadType"] |=
2666 stats.current_payload_type == kFakeVideoSendPayloadType; 2666 stats.current_payload_type == kFakeVideoSendPayloadType;
2667 } 2667 }
2668 2668
2669 return AllStatsFilled(receive_stats_filled_); 2669 return AllStatsFilled(receive_stats_filled_);
2670 } 2670 }
2671 2671
2672 bool CheckSendStats() { 2672 bool CheckSendStats() {
2673 RTC_DCHECK(send_stream_ != nullptr); 2673 RTC_DCHECK(send_stream_);
2674 VideoSendStream::Stats stats = send_stream_->GetStats(); 2674 VideoSendStream::Stats stats = send_stream_->GetStats();
2675 2675
2676 send_stats_filled_["NumStreams"] |= 2676 send_stats_filled_["NumStreams"] |=
2677 stats.substreams.size() == expected_send_ssrcs_.size(); 2677 stats.substreams.size() == expected_send_ssrcs_.size();
2678 2678
2679 send_stats_filled_["CpuOveruseMetrics"] |= 2679 send_stats_filled_["CpuOveruseMetrics"] |=
2680 stats.avg_encode_time_ms != 0 && stats.encode_usage_percent != 0; 2680 stats.avg_encode_time_ms != 0 && stats.encode_usage_percent != 0;
2681 2681
2682 send_stats_filled_["EncoderImplementationName"] |= 2682 send_stats_filled_["EncoderImplementationName"] |=
2683 stats.encoder_implementation_name == 2683 stats.encoder_implementation_name ==
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
3608 private: 3608 private:
3609 bool video_observed_; 3609 bool video_observed_;
3610 bool audio_observed_; 3610 bool audio_observed_;
3611 SequenceNumberUnwrapper unwrapper_; 3611 SequenceNumberUnwrapper unwrapper_;
3612 std::set<int64_t> received_packet_ids_; 3612 std::set<int64_t> received_packet_ids_;
3613 } test; 3613 } test;
3614 3614
3615 RunBaseTest(&test); 3615 RunBaseTest(&test);
3616 } 3616 }
3617 } // namespace webrtc 3617 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/encoded_frame_callback_adapter.cc ('k') | webrtc/video/overuse_frame_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698