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

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

Issue 2589743002: Make OverheadObserver::OnOverheadChanged count RTP headers only (Closed)
Patch Set: Add explicit cast. Created 3 years, 11 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // TODO(holmer): This method should return DelayBasedBwe::Result so that we 42 // TODO(holmer): This method should return DelayBasedBwe::Result so that we
43 // can get rid of the dependency on BitrateController. Requires changes 43 // can get rid of the dependency on BitrateController. Requires changes
44 // to the CongestionController interface. 44 // to the CongestionController interface.
45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; 45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
46 std::vector<PacketInfo> GetTransportFeedbackVector() const override; 46 std::vector<PacketInfo> GetTransportFeedbackVector() const override;
47 47
48 // Implements CallStatsObserver. 48 // Implements CallStatsObserver.
49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; 49 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
50 50
51 void SetMinBitrate(int min_bitrate_bps); 51 void SetMinBitrate(int min_bitrate_bps);
52 void SetTransportOverhead(int transport_overhead_bytes_per_packet);
52 53
53 int64_t GetProbingIntervalMs() const; 54 int64_t GetProbingIntervalMs() const;
54 55
55 private: 56 private:
56 std::vector<PacketInfo> GetPacketFeedbackVector( 57 std::vector<PacketInfo> GetPacketFeedbackVector(
57 const rtcp::TransportFeedback& feedback); 58 const rtcp::TransportFeedback& feedback);
58 59
59 rtc::CriticalSection lock_; 60 rtc::CriticalSection lock_;
60 rtc::CriticalSection bwe_lock_; 61 rtc::CriticalSection bwe_lock_;
62 int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_);
61 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 63 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
62 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_); 64 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(&bwe_lock_);
63 Clock* const clock_; 65 Clock* const clock_;
64 int64_t current_offset_ms_; 66 int64_t current_offset_ms_;
65 int64_t last_timestamp_us_; 67 int64_t last_timestamp_us_;
66 BitrateController* const bitrate_controller_; 68 BitrateController* const bitrate_controller_;
67 std::vector<PacketInfo> last_packet_feedback_vector_; 69 std::vector<PacketInfo> last_packet_feedback_vector_;
68 }; 70 };
69 71
70 } // namespace webrtc 72 } // namespace webrtc
71 73
72 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 74 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698