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

Side by Side Diff: webrtc/video_engine/vie_channel_group.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
« no previous file with comments | « webrtc/video/rampup_tests.cc ('k') | webrtc/video_engine/vie_channel_group.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 int number_of_cores, 56 int number_of_cores,
57 const VideoSendStream::Config& config); 57 const VideoSendStream::Config& config);
58 bool CreateReceiveChannel(int channel_id, 58 bool CreateReceiveChannel(int channel_id,
59 Transport* transport, 59 Transport* transport,
60 int number_of_cores, 60 int number_of_cores,
61 const VideoReceiveStream::Config& config); 61 const VideoReceiveStream::Config& config);
62 void DeleteChannel(int channel_id); 62 void DeleteChannel(int channel_id);
63 ViEChannel* GetChannel(int channel_id) const; 63 ViEChannel* GetChannel(int channel_id) const;
64 ViEEncoder* GetEncoder(int channel_id) const; 64 ViEEncoder* GetEncoder(int channel_id) const;
65 void SetSyncInterface(VoEVideoSync* sync_interface); 65 void SetSyncInterface(VoEVideoSync* sync_interface);
66 void SetBweBitrates(int min_bitrate_bps,
67 int start_bitrate_bps,
68 int max_bitrate_bps);
66 69
67 void SetChannelRembStatus(bool sender, bool receiver, ViEChannel* channel); 70 void SetChannelRembStatus(bool sender, bool receiver, ViEChannel* channel);
68 71
69 BitrateController* GetBitrateController() const; 72 BitrateController* GetBitrateController() const;
70 CallStats* GetCallStats() const; 73 CallStats* GetCallStats() const;
71 RemoteBitrateEstimator* GetRemoteBitrateEstimator() const; 74 RemoteBitrateEstimator* GetRemoteBitrateEstimator() const;
72 EncoderStateFeedback* GetEncoderStateFeedback() const; 75 EncoderStateFeedback* GetEncoderStateFeedback() const;
73 int64_t GetPacerQueuingDelayMs() const; 76 int64_t GetPacerQueuingDelayMs() const;
74 77
75 // Implements BitrateObserver. 78 // Implements BitrateObserver.
(...skipping 27 matching lines...) Expand all
103 // Maps Channel id -> ViEEncoder. 106 // Maps Channel id -> ViEEncoder.
104 mutable rtc::CriticalSection encoder_map_crit_; 107 mutable rtc::CriticalSection encoder_map_crit_;
105 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_); 108 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_);
106 109
107 // Registered at construct time and assumed to outlive this class. 110 // Registered at construct time and assumed to outlive this class.
108 ProcessThread* const process_thread_; 111 ProcessThread* const process_thread_;
109 rtc::scoped_ptr<ProcessThread> pacer_thread_; 112 rtc::scoped_ptr<ProcessThread> pacer_thread_;
110 113
111 rtc::scoped_ptr<BitrateController> bitrate_controller_; 114 rtc::scoped_ptr<BitrateController> bitrate_controller_;
112 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_; 115 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_;
116 int min_bitrate_bps_;
113 }; 117 };
114 118
115 } // namespace webrtc 119 } // namespace webrtc
116 120
117 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ 121 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
OLDNEW
« no previous file with comments | « webrtc/video/rampup_tests.cc ('k') | webrtc/video_engine/vie_channel_group.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698