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

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

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 22 matching lines...) Expand all
33 virtual ~TransportFeedbackAdapter(); 33 virtual ~TransportFeedbackAdapter();
34 34
35 void SetBitrateEstimator(RemoteBitrateEstimator* rbe); 35 void SetBitrateEstimator(RemoteBitrateEstimator* rbe);
36 RemoteBitrateEstimator* GetBitrateEstimator() const { 36 RemoteBitrateEstimator* GetBitrateEstimator() const {
37 return bitrate_estimator_.get(); 37 return bitrate_estimator_.get();
38 } 38 }
39 39
40 // Implements TransportFeedbackObserver. 40 // Implements TransportFeedbackObserver.
41 void AddPacket(uint16_t sequence_number, 41 void AddPacket(uint16_t sequence_number,
42 size_t length, 42 size_t length,
43 bool was_paced,
43 int probe_cluster_id) override; 44 int probe_cluster_id) override;
44 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms); 45 void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
45 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; 46 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
46 47
47 // Implements CallStatsObserver. 48 // Implements CallStatsObserver.
48 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;
49 50
50 private: 51 private:
51 // Implements RemoteBitrateObserver. 52 // Implements RemoteBitrateObserver.
52 void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs, 53 void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
53 uint32_t bitrate) override; 54 uint32_t bitrate) override;
54 55
55 rtc::CriticalSection lock_; 56 rtc::CriticalSection lock_;
56 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 57 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
57 BitrateController* bitrate_controller_; 58 BitrateController* bitrate_controller_;
58 std::unique_ptr<RemoteBitrateEstimator> bitrate_estimator_; 59 std::unique_ptr<RemoteBitrateEstimator> bitrate_estimator_;
59 Clock* const clock_; 60 Clock* const clock_;
60 int64_t current_offset_ms_; 61 int64_t current_offset_ms_;
61 int64_t last_timestamp_us_; 62 int64_t last_timestamp_us_;
62 }; 63 };
63 64
64 } // namespace webrtc 65 } // namespace webrtc
65 66
66 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ 67 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698