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

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

Issue 1368943002: Fix suspend below min bitrate in new API by making it possible to set min bitrate at the receive-si… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge. Created 5 years, 2 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 21 matching lines...) Expand all
32 Clock* clock, 32 Clock* clock,
33 ProcessThread* process_thread); 33 ProcessThread* process_thread);
34 virtual ~TransportFeedbackAdapter(); 34 virtual ~TransportFeedbackAdapter();
35 35
36 void OnPacketSent(const PacketInfo& info) override; 36 void OnPacketSent(const PacketInfo& info) override;
37 37
38 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; 38 void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
39 39
40 void SetBitrateEstimator(RemoteBitrateEstimator* rbe); 40 void SetBitrateEstimator(RemoteBitrateEstimator* rbe);
41 41
42 RemoteBitrateEstimator* GetBitrateEstimator() const {
43 return bitrate_estimator_.get();
44 }
45
42 private: 46 private:
43 void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs, 47 void OnReceiveBitrateChanged(const std::vector<unsigned int>& ssrcs,
44 unsigned int bitrate) override; 48 unsigned int bitrate) override;
45 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;
46 50
47 rtc::CriticalSection lock_; 51 rtc::CriticalSection lock_;
48 SendTimeHistory send_time_history_ GUARDED_BY(&lock_); 52 SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
49 rtc::scoped_ptr<RtcpBandwidthObserver> rtcp_bandwidth_observer_; 53 rtc::scoped_ptr<RtcpBandwidthObserver> rtcp_bandwidth_observer_;
50 rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_; 54 rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
51 ProcessThread* const process_thread_; 55 ProcessThread* const process_thread_;
52 Clock* const clock_; 56 Clock* const clock_;
53 int64_t current_offset_ms_; 57 int64_t current_offset_ms_;
54 int64_t last_timestamp_us_; 58 int64_t last_timestamp_us_;
55 }; 59 };
56 60
57 } // namespace webrtc 61 } // namespace webrtc
58 62
59 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_ 63 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698