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

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

Issue 1388723002: Remove default receive channel from WVoE; baby step 1. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@wvoe_misc_clean
Patch Set: rebase 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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 void OnError(int error); 237 void OnError(int error);
238 238
239 int GetReceiveChannelId(uint32 ssrc) const; 239 int GetReceiveChannelId(uint32 ssrc) const;
240 int GetSendChannelId(uint32 ssrc) const; 240 int GetSendChannelId(uint32 ssrc) const;
241 241
242 private: 242 private:
243 bool SetSendCodecs(const std::vector<AudioCodec>& codecs); 243 bool SetSendCodecs(const std::vector<AudioCodec>& codecs);
244 bool SetSendRtpHeaderExtensions( 244 bool SetSendRtpHeaderExtensions(
245 const std::vector<RtpHeaderExtension>& extensions); 245 const std::vector<RtpHeaderExtension>& extensions);
246 bool SetOptions(const AudioOptions& options); 246 bool SetOptions(const AudioOptions& options);
247 bool SetRecvOptions(int channel_id, const AudioOptions& options);
247 bool SetMaxSendBandwidth(int bps); 248 bool SetMaxSendBandwidth(int bps);
248 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs); 249 bool SetRecvCodecs(const std::vector<AudioCodec>& codecs);
249 bool SetRecvRtpHeaderExtensions( 250 bool SetRecvRtpHeaderExtensions(
250 const std::vector<RtpHeaderExtension>& extensions); 251 const std::vector<RtpHeaderExtension>& extensions);
251 bool SetLocalRenderer(uint32 ssrc, AudioRenderer* renderer); 252 bool SetLocalRenderer(uint32 ssrc, AudioRenderer* renderer);
252 bool MuteStream(uint32 ssrc, bool mute); 253 bool MuteStream(uint32 ssrc, bool mute);
253 254
254 WebRtcVoiceEngine* engine() { return engine_; } 255 WebRtcVoiceEngine* engine() { return engine_; }
255 int GetLastEngineError() { return engine()->GetLastEngineError(); } 256 int GetLastEngineError() { return engine()->GetLastEngineError(); }
256 int GetOutputLevel(int channel); 257 int GetOutputLevel(int channel);
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 343 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
343 344
344 // Do not lock this on the VoE media processor thread; potential for deadlock 345 // Do not lock this on the VoE media processor thread; potential for deadlock
345 // exists. 346 // exists.
346 mutable rtc::CriticalSection receive_channels_cs_; 347 mutable rtc::CriticalSection receive_channels_cs_;
347 }; 348 };
348 349
349 } // namespace cricket 350 } // namespace cricket
350 351
351 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 352 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | talk/media/webrtc/webrtcvoiceengine.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698