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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h

Issue 1965063003: Revert of Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/system_wrappers/include/rtp_to_ntp.h" 18 #include "webrtc/system_wrappers/include/rtp_to_ntp.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class Clock; 22 class Clock;
22 class TimestampExtrapolator; 23 class TimestampExtrapolator;
23 24
24 // RemoteNtpTimeEstimator can be used to estimate a given RTP timestamp's NTP 25 // RemoteNtpTimeEstimator can be used to estimate a given RTP timestamp's NTP
25 // time in local timebase. 26 // time in local timebase.
26 // Note that it needs to be trained with at least 2 RTCP SR (by calling 27 // Note that it needs to be trained with at least 2 RTCP SR (by calling
(...skipping 17 matching lines...) Expand all
44 Clock* clock_; 45 Clock* clock_;
45 std::unique_ptr<TimestampExtrapolator> ts_extrapolator_; 46 std::unique_ptr<TimestampExtrapolator> ts_extrapolator_;
46 RtcpList rtcp_list_; 47 RtcpList rtcp_list_;
47 int64_t last_timing_log_ms_; 48 int64_t last_timing_log_ms_;
48 RTC_DISALLOW_COPY_AND_ASSIGN(RemoteNtpTimeEstimator); 49 RTC_DISALLOW_COPY_AND_ASSIGN(RemoteNtpTimeEstimator);
49 }; 50 };
50 51
51 } // namespace webrtc 52 } // namespace webrtc
52 53
53 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_ 54 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_REMOTE_NTP_TIME_ESTIMATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698