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

Side by Side Diff: webrtc/modules/video_coding/timing.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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 19 matching lines...) Expand all
30 min_playout_delay_ms_(0), 30 min_playout_delay_ms_(0),
31 max_playout_delay_ms_(10000), 31 max_playout_delay_ms_(10000),
32 jitter_delay_ms_(0), 32 jitter_delay_ms_(0),
33 current_delay_ms_(0), 33 current_delay_ms_(0),
34 last_decode_ms_(0), 34 last_decode_ms_(0),
35 prev_frame_timestamp_(0), 35 prev_frame_timestamp_(0),
36 num_decoded_frames_(0), 36 num_decoded_frames_(0),
37 num_delayed_decoded_frames_(0), 37 num_delayed_decoded_frames_(0),
38 first_decoded_frame_ms_(-1), 38 first_decoded_frame_ms_(-1),
39 sum_missed_render_deadline_ms_(0) { 39 sum_missed_render_deadline_ms_(0) {
40 if (master_timing == NULL) { 40 if (master_timing == nullptr) {
41 master_ = true; 41 master_ = true;
42 ts_extrapolator_ = new TimestampExtrapolator(clock_->TimeInMilliseconds()); 42 ts_extrapolator_ = new TimestampExtrapolator(clock_->TimeInMilliseconds());
43 } else { 43 } else {
44 ts_extrapolator_ = master_timing->ts_extrapolator_; 44 ts_extrapolator_ = master_timing->ts_extrapolator_;
45 } 45 }
46 } 46 }
47 47
48 VCMTiming::~VCMTiming() { 48 VCMTiming::~VCMTiming() {
49 UpdateHistograms(); 49 UpdateHistograms();
50 if (master_) { 50 if (master_) {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 *max_decode_ms = RequiredDecodeTimeMs(); 300 *max_decode_ms = RequiredDecodeTimeMs();
301 *current_delay_ms = current_delay_ms_; 301 *current_delay_ms = current_delay_ms_;
302 *target_delay_ms = TargetDelayInternal(); 302 *target_delay_ms = TargetDelayInternal();
303 *jitter_buffer_ms = jitter_delay_ms_; 303 *jitter_buffer_ms = jitter_delay_ms_;
304 *min_playout_delay_ms = min_playout_delay_ms_; 304 *min_playout_delay_ms = min_playout_delay_ms_;
305 *render_delay_ms = render_delay_ms_; 305 *render_delay_ms = render_delay_ms_;
306 return (num_decoded_frames_ > 0); 306 return (num_decoded_frames_ > 0);
307 } 307 }
308 308
309 } // namespace webrtc 309 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698