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

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

Issue 2755553003: Ignore packets sent on old network route when receiving feedback. (Closed)
Patch Set: Comments addressed. 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
(...skipping 25 matching lines...) Expand all
36 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); 36 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
37 37
38 // TODO(holmer): This method should return DelayBasedBwe::Result so that we 38 // TODO(holmer): This method should return DelayBasedBwe::Result so that we
39 // can get rid of the dependency on BitrateController. Requires changes 39 // can get rid of the dependency on BitrateController. Requires changes
40 // to the CongestionController interface. 40 // to the CongestionController interface.
41 void OnTransportFeedback(const rtcp::TransportFeedback& feedback); 41 void OnTransportFeedback(const rtcp::TransportFeedback& feedback);
42 std::vector<PacketFeedback> GetTransportFeedbackVector() const; 42 std::vector<PacketFeedback> GetTransportFeedbackVector() const;
43 43
44 void SetTransportOverhead(int transport_overhead_bytes_per_packet); 44 void SetTransportOverhead(int transport_overhead_bytes_per_packet);
45 45
46 void ClearSendTimeHistory(); 46 void SetNetworkIds(uint16_t local_id, uint16_t remote_id);
47 47
48 private: 48 private:
49 std::vector<PacketFeedback> GetPacketFeedbackVector( 49 std::vector<PacketFeedback> GetPacketFeedbackVector(
50 const rtcp::TransportFeedback& feedback); 50 const rtcp::TransportFeedback& feedback);
51 51
52 const bool send_side_bwe_with_overhead_; 52 const bool send_side_bwe_with_overhead_;
53 rtc::CriticalSection lock_; 53 rtc::CriticalSection lock_;
54 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_); 54 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_);
55 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 55 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
56 const Clock* const clock_; 56 const Clock* const clock_;
57 int64_t current_offset_ms_; 57 int64_t current_offset_ms_;
58 int64_t last_timestamp_us_; 58 int64_t last_timestamp_us_;
59 std::vector<PacketFeedback> last_packet_feedback_vector_; 59 std::vector<PacketFeedback> last_packet_feedback_vector_;
60 uint16_t local_net_id_;
61 uint16_t remote_net_id_;
60 }; 62 };
61 63
62 } // namespace webrtc 64 } // namespace webrtc
63 65
64 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 66 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698