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

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

Issue 2235373004: Probing: Add support for exponential startup probing (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@fix_probing2
Patch Set: lint fix Created 4 years, 3 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) 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
11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ 11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_
12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ 12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_annotations.h" 18 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
20 #include "webrtc/modules/include/module_common_types.h" 19 #include "webrtc/modules/include/module_common_types.h"
21 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 20 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
22 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" 21 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class ProcessThread; 25 class ProcessThread;
27 class RemoteBitrateEstimator;
28 26
29 class TransportFeedbackAdapter : public TransportFeedbackObserver, 27 class TransportFeedbackAdapter : public TransportFeedbackObserver,
30 public CallStatsObserver, 28 public CallStatsObserver {
31 public RemoteBitrateObserver {
32 public: 29 public:
33 TransportFeedbackAdapter(BitrateController* bitrate_controller, Clock* clock); 30 explicit TransportFeedbackAdapter(Clock* clock);
34 virtual ~TransportFeedbackAdapter(); 31 virtual ~TransportFeedbackAdapter();
35 32
36 void SetBitrateEstimator(RemoteBitrateEstimator* rbe); 33 void SetBitrateEstimator(RemoteBitrateEstimator* rbe);
37 RemoteBitrateEstimator* GetBitrateEstimator() const { 34 RemoteBitrateEstimator* GetBitrateEstimator() const {
38 return bitrate_estimator_.get(); 35 return bitrate_estimator_.get();
39 } 36 }
40 37
41 // Implements TransportFeedbackObserver. 38 // Implements TransportFeedbackObserver.
42 void AddPacket(uint16_t sequence_number, 39 void AddPacket(uint16_t sequence_number,
43 size_t length, 40 size_t length,
44 int probe_cluster_id) override; 41 int probe_cluster_id) override;
45 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); 42 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
46 43
47 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; 44 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
48 std::vector<PacketInfo> GetTransportFeedbackVector() const override; 45 std::vector<PacketInfo> GetTransportFeedbackVector() const override;
49 46
50 // Implements CallStatsObserver. 47 // Implements CallStatsObserver.
51 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; 48 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
52 49
53 private: 50 private:
54 // Implements RemoteBitrateObserver.
55 void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
56 uint32_t bitrate) override;
57
58 void OnProbeBitrate(uint32_t bitrate) override;
59
60 std::vector<PacketInfo> GetPacketFeedbackVector( 51 std::vector<PacketInfo> GetPacketFeedbackVector(
61 const rtcp::TransportFeedback& feedback); 52 const rtcp::TransportFeedback& feedback);
62 53
63 rtc::CriticalSection lock_; 54 rtc::CriticalSection lock_;
64 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 55 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
65 BitrateController* bitrate_controller_;
66 std::unique_ptr<RemoteBitrateEstimator> bitrate_estimator_; 56 std::unique_ptr<RemoteBitrateEstimator> bitrate_estimator_;
67 Clock* const clock_; 57 Clock* const clock_;
68 int64_t current_offset_ms_; 58 int64_t current_offset_ms_;
69 int64_t last_timestamp_us_; 59 int64_t last_timestamp_us_;
70 std::vector<PacketInfo> last_packet_feedback_vector_; 60 std::vector<PacketInfo> last_packet_feedback_vector_;
71 }; 61 };
72 62
73 } // namespace webrtc 63 } // namespace webrtc
74 64
75 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ 65 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698