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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

Issue 2444923002: Revert of Fix some chromium style warnings in remote_bitrate_estimator.h (Closed)
Patch Set: Created 4 years, 1 month 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 11 matching lines...) Expand all
22 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 22 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator { 26 class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {
27 public: 27 public:
28 RemoteBitrateEstimatorSingleStream(RemoteBitrateObserver* observer, 28 RemoteBitrateEstimatorSingleStream(RemoteBitrateObserver* observer,
29 Clock* clock); 29 Clock* clock);
30 virtual ~RemoteBitrateEstimatorSingleStream(); 30 virtual ~RemoteBitrateEstimatorSingleStream();
31 31
32 void IncomingPacketFeedbackVector(
33 const std::vector<PacketInfo>& packet_feedback_vector) override;
34 void IncomingPacket(int64_t arrival_time_ms, 32 void IncomingPacket(int64_t arrival_time_ms,
35 size_t payload_size, 33 size_t payload_size,
36 const RTPHeader& header) override; 34 const RTPHeader& header) override;
37 void Process() override; 35 void Process() override;
38 int64_t TimeUntilNextProcess() override; 36 int64_t TimeUntilNextProcess() override;
39 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; 37 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
40 void RemoveStream(uint32_t ssrc) override; 38 void RemoveStream(uint32_t ssrc) override;
41 bool LatestEstimate(std::vector<uint32_t>* ssrcs, 39 bool LatestEstimate(std::vector<uint32_t>* ssrcs,
42 uint32_t* bitrate_bps) const override; 40 uint32_t* bitrate_bps) const override;
43 void SetMinBitrate(int min_bitrate_bps) override; 41 void SetMinBitrate(int min_bitrate_bps) override;
(...skipping 20 matching lines...) Expand all
64 int64_t last_process_time_; 62 int64_t last_process_time_;
65 int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get()); 63 int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get());
66 bool uma_recorded_; 64 bool uma_recorded_;
67 65
68 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream); 66 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream);
69 }; 67 };
70 68
71 } // namespace webrtc 69 } // namespace webrtc
72 70
73 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SING LE_STREAM_H_ 71 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_BITRATE_ESTIMATOR_SING LE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698