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/congestion_controller/transport_feedback_adapter.h

Issue 2638083002: Attach TransportFeedbackPacketLossTracker to ANA (PLR only) (Closed)
Patch Set: Fix UT Created 3 years, 9 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_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/thread_annotations.h" 17 #include "webrtc/base/thread_annotations.h"
18 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" 19 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
20 #include "webrtc/system_wrappers/include/clock.h" 20 #include "webrtc/system_wrappers/include/clock.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 class PacketFeedbackObserver;
25
24 namespace rtcp { 26 namespace rtcp {
25 class TransportFeedback; 27 class TransportFeedback;
26 } // namespace rtcp 28 } // namespace rtcp
27 29
28 class TransportFeedbackAdapter { 30 class TransportFeedbackAdapter {
29 public: 31 public:
30 explicit TransportFeedbackAdapter(const Clock* clock); 32 explicit TransportFeedbackAdapter(const Clock* clock);
31 virtual ~TransportFeedbackAdapter(); 33 virtual ~TransportFeedbackAdapter();
32 34
33 void AddPacket(uint16_t sequence_number, 35 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
36 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
37
38 void AddPacket(uint32_t ssrc,
39 uint16_t sequence_number,
34 size_t length, 40 size_t length,
35 const PacedPacketInfo& pacing_info); 41 const PacedPacketInfo& pacing_info);
36 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); 42 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
37 43
38 // TODO(holmer): This method should return DelayBasedBwe::Result so that we 44 // TODO(holmer): This method should return DelayBasedBwe::Result so that we
39 // can get rid of the dependency on BitrateController. Requires changes 45 // can get rid of the dependency on BitrateController. Requires changes
40 // to the CongestionController interface. 46 // to the CongestionController interface.
41 void OnTransportFeedback(const rtcp::TransportFeedback& feedback); 47 void OnTransportFeedback(const rtcp::TransportFeedback& feedback);
42 std::vector<PacketFeedback> GetTransportFeedbackVector() const; 48 std::vector<PacketFeedback> GetTransportFeedbackVector() const;
43 49
44 void SetTransportOverhead(int transport_overhead_bytes_per_packet); 50 void SetTransportOverhead(int transport_overhead_bytes_per_packet);
45 51
46 void SetNetworkIds(uint16_t local_id, uint16_t remote_id); 52 void SetNetworkIds(uint16_t local_id, uint16_t remote_id);
47 53
48 private: 54 private:
49 std::vector<PacketFeedback> GetPacketFeedbackVector( 55 std::vector<PacketFeedback> GetPacketFeedbackVector(
50 const rtcp::TransportFeedback& feedback); 56 const rtcp::TransportFeedback& feedback);
51 57
52 const bool send_side_bwe_with_overhead_; 58 const bool send_side_bwe_with_overhead_;
53 rtc::CriticalSection lock_; 59 rtc::CriticalSection lock_;
54 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); 60 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_);
55 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 61 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
56 const Clock* const clock_; 62 const Clock* const clock_;
57 int64_t current_offset_ms_; 63 int64_t current_offset_ms_;
58 int64_t last_timestamp_us_; 64 int64_t last_timestamp_us_;
59 std::vector<PacketFeedback> last_packet_feedback_vector_; 65 std::vector<PacketFeedback> last_packet_feedback_vector_;
60 uint16_t local_net_id_; 66 uint16_t local_net_id_ GUARDED_BY(&lock_);
61 uint16_t remote_net_id_; 67 uint16_t remote_net_id_ GUARDED_BY(&lock_);
68
69 rtc::CriticalSection observers_lock_;
70 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_);
62 }; 71 };
63 72
64 } // namespace webrtc 73 } // namespace webrtc
65 74
66 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698