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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.h

Issue 1813763005: Updated structures and functions for setting the max bitrate limit to take rtc::Optional<int> Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More code review feedback Created 4 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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 int GetReceiveChannelId(uint32_t ssrc) const; 210 int GetReceiveChannelId(uint32_t ssrc) const;
211 int GetSendChannelId(uint32_t ssrc) const; 211 int GetSendChannelId(uint32_t ssrc) const;
212 212
213 private: 213 private:
214 bool SetOptions(const AudioOptions& options); 214 bool SetOptions(const AudioOptions& options);
215 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs); 215 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs);
216 bool SetSendCodecs(const std::vector<AudioCodec>& codecs); 216 bool SetSendCodecs(const std::vector<AudioCodec>& codecs);
217 bool SetSendCodecs(int channel); 217 bool SetSendCodecs(int channel);
218 void SetNack(int channel, bool nack_enabled); 218 void SetNack(int channel, bool nack_enabled);
219 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec); 219 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec);
220 bool SetMaxSendBandwidth(int bps); 220 bool SetMaxSendBitrate(rtc::Optional<int> bps);
221 bool SetLocalSource(uint32_t ssrc, AudioSource* source); 221 bool SetLocalSource(uint32_t ssrc, AudioSource* source);
222 bool MuteStream(uint32_t ssrc, bool mute); 222 bool MuteStream(uint32_t ssrc, bool mute);
223 223
224 WebRtcVoiceEngine* engine() { return engine_; } 224 WebRtcVoiceEngine* engine() { return engine_; }
225 int GetLastEngineError() { return engine()->GetLastEngineError(); } 225 int GetLastEngineError() { return engine()->GetLastEngineError(); }
226 int GetOutputLevel(int channel); 226 int GetOutputLevel(int channel);
227 bool SetPlayout(int channel, bool playout); 227 bool SetPlayout(int channel, bool playout);
228 bool ChangePlayout(bool playout); 228 bool ChangePlayout(bool playout);
229 int CreateVoEChannel(); 229 int CreateVoEChannel();
230 bool DeleteVoEChannel(int channel); 230 bool DeleteVoEChannel(int channel);
231 bool IsDefaultRecvStream(uint32_t ssrc) { 231 bool IsDefaultRecvStream(uint32_t ssrc) {
232 return default_recv_ssrc_ == static_cast<int64_t>(ssrc); 232 return default_recv_ssrc_ == static_cast<int64_t>(ssrc);
233 } 233 }
234 bool SetSendBitrateInternal(int bps); 234 bool SetSendBitrateInternal(rtc::Optional<int> bps);
235 bool HasSendCodec() const { 235 bool HasSendCodec() const {
236 return send_codec_spec_.codec_inst.pltype != -1; 236 return send_codec_spec_.codec_inst.pltype != -1;
237 } 237 }
238 238
239 rtc::ThreadChecker worker_thread_checker_; 239 rtc::ThreadChecker worker_thread_checker_;
240 240
241 WebRtcVoiceEngine* const engine_ = nullptr; 241 WebRtcVoiceEngine* const engine_ = nullptr;
242 std::vector<AudioCodec> recv_codecs_; 242 std::vector<AudioCodec> recv_codecs_;
243 bool send_bitrate_setting_ = false; 243 rtc::Optional<int> send_bitrate_bps_;
244 int send_bitrate_bps_ = 0;
245 AudioOptions options_; 244 AudioOptions options_;
246 rtc::Optional<int> dtmf_payload_type_; 245 rtc::Optional<int> dtmf_payload_type_;
247 bool desired_playout_ = false; 246 bool desired_playout_ = false;
248 bool recv_transport_cc_enabled_ = false; 247 bool recv_transport_cc_enabled_ = false;
249 bool playout_ = false; 248 bool playout_ = false;
250 bool send_ = false; 249 bool send_ = false;
251 webrtc::Call* const call_ = nullptr; 250 webrtc::Call* const call_ = nullptr;
252 251
253 // SSRC of unsignalled receive stream, or -1 if there isn't one. 252 // SSRC of unsignalled receive stream, or -1 if there isn't one.
254 int64_t default_recv_ssrc_ = -1; 253 int64_t default_recv_ssrc_ = -1;
(...skipping 29 matching lines...) Expand all
284 int cng_payload_type = -1; 283 int cng_payload_type = -1;
285 int cng_plfreq = -1; 284 int cng_plfreq = -1;
286 webrtc::CodecInst codec_inst; 285 webrtc::CodecInst codec_inst;
287 } send_codec_spec_; 286 } send_codec_spec_;
288 287
289 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 288 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
290 }; 289 };
291 } // namespace cricket 290 } // namespace cricket
292 291
293 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ 292 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698