webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h - Issue 1750533002: Replace scoped_ptr with unique_ptr in webrtc/modules/remote_bitrate_estimator/

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/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

Issue 1750533002: Replace scoped_ptr with unique_ptr in webrtc/modules/remote_bitrate_estimator/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 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

« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc ('k') | webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

index f3a208a0b7290d7ed96dd7daebe359f00c14abf7..5516ea781da425244676e37bbd49a3ea90ed45c3 100644

--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

@@ -12,6 +12,7 @@

#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SINGLE_STREAM_H_

#include <map>

+#include <memory>

#include <vector>

#include "webrtc/base/rate_statistics.h"

@@ -54,9 +55,9 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {

Clock* clock_;

SsrcOveruseEstimatorMap overuse_detectors_ GUARDED_BY(crit_sect_.get());

RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_.get());

- rtc::scoped_ptr<AimdRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());

+ std::unique_ptr<AimdRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());

RemoteBitrateObserver* observer_ GUARDED_BY(crit_sect_.get());

- rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;

+ std::unique_ptr<CriticalSectionWrapper> crit_sect_;

int64_t last_process_time_;

int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get());