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

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

Issue 2060813002: Configure VoE NACK through AudioReceiveStream::Config. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@wvoe_config_nack
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) 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 232 }
233 233
234 int GetReceiveChannelId(uint32_t ssrc) const; 234 int GetReceiveChannelId(uint32_t ssrc) const;
235 int GetSendChannelId(uint32_t ssrc) const; 235 int GetSendChannelId(uint32_t ssrc) const;
236 236
237 private: 237 private:
238 bool SetOptions(const AudioOptions& options); 238 bool SetOptions(const AudioOptions& options);
239 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs); 239 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs);
240 bool SetSendCodecs(const std::vector<AudioCodec>& codecs); 240 bool SetSendCodecs(const std::vector<AudioCodec>& codecs);
241 bool SetSendCodecs(int channel, const webrtc::RtpParameters& rtp_parameters); 241 bool SetSendCodecs(int channel, const webrtc::RtpParameters& rtp_parameters);
242 void SetNack(int channel, bool nack_enabled);
243 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec); 242 bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec);
244 bool SetLocalSource(uint32_t ssrc, AudioSource* source); 243 bool SetLocalSource(uint32_t ssrc, AudioSource* source);
245 bool MuteStream(uint32_t ssrc, bool mute); 244 bool MuteStream(uint32_t ssrc, bool mute);
246 245
247 WebRtcVoiceEngine* engine() { return engine_; } 246 WebRtcVoiceEngine* engine() { return engine_; }
248 int GetLastEngineError() { return engine()->GetLastEngineError(); } 247 int GetLastEngineError() { return engine()->GetLastEngineError(); }
249 int GetOutputLevel(int channel); 248 int GetOutputLevel(int channel);
250 bool SetPlayout(int channel, bool playout); 249 bool SetPlayout(int channel, bool playout);
251 bool ChangePlayout(bool playout); 250 bool ChangePlayout(bool playout);
252 int CreateVoEChannel(); 251 int CreateVoEChannel();
(...skipping 14 matching lines...) Expand all
267 rtc::ThreadChecker worker_thread_checker_; 266 rtc::ThreadChecker worker_thread_checker_;
268 267
269 WebRtcVoiceEngine* const engine_ = nullptr; 268 WebRtcVoiceEngine* const engine_ = nullptr;
270 std::vector<AudioCodec> send_codecs_; 269 std::vector<AudioCodec> send_codecs_;
271 std::vector<AudioCodec> recv_codecs_; 270 std::vector<AudioCodec> recv_codecs_;
272 int max_send_bitrate_bps_ = 0; 271 int max_send_bitrate_bps_ = 0;
273 AudioOptions options_; 272 AudioOptions options_;
274 rtc::Optional<int> dtmf_payload_type_; 273 rtc::Optional<int> dtmf_payload_type_;
275 bool desired_playout_ = false; 274 bool desired_playout_ = false;
276 bool recv_transport_cc_enabled_ = false; 275 bool recv_transport_cc_enabled_ = false;
276 bool recv_nack_enabled_ = false;
277 bool playout_ = false; 277 bool playout_ = false;
278 bool send_ = false; 278 bool send_ = false;
279 webrtc::Call* const call_ = nullptr; 279 webrtc::Call* const call_ = nullptr;
280 280
281 // SSRC of unsignalled receive stream, or -1 if there isn't one. 281 // SSRC of unsignalled receive stream, or -1 if there isn't one.
282 int64_t default_recv_ssrc_ = -1; 282 int64_t default_recv_ssrc_ = -1;
283 // Volume for unsignalled stream, which may be set before the stream exists. 283 // Volume for unsignalled stream, which may be set before the stream exists.
284 double default_recv_volume_ = 1.0; 284 double default_recv_volume_ = 1.0;
285 // Sink for unsignalled stream, which may be set before the stream exists. 285 // Sink for unsignalled stream, which may be set before the stream exists.
286 std::unique_ptr<webrtc::AudioSinkInterface> default_sink_; 286 std::unique_ptr<webrtc::AudioSinkInterface> default_sink_;
(...skipping 10 matching lines...) Expand all
297 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_; 297 std::map<uint32_t, WebRtcAudioReceiveStream*> recv_streams_;
298 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 298 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
299 299
300 SendCodecSpec send_codec_spec_; 300 SendCodecSpec send_codec_spec_;
301 301
302 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel); 302 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WebRtcVoiceMediaChannel);
303 }; 303 };
304 } // namespace cricket 304 } // namespace cricket
305 305
306 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ 306 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698