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

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

Issue 1311533009: - Rename VoiceChannel::MuteStream() -> SetAudioSend() (incl. media channel) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@lj_remove_typingmonitor_files
Patch Set: Created 5 years, 3 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 bool SetRecvRtpHeaderExtensions( 298 bool SetRecvRtpHeaderExtensions(
299 const std::vector<RtpHeaderExtension>& extensions) override; 299 const std::vector<RtpHeaderExtension>& extensions) override;
300 bool SetSendRtpHeaderExtensions( 300 bool SetSendRtpHeaderExtensions(
301 const std::vector<RtpHeaderExtension>& extensions) override; 301 const std::vector<RtpHeaderExtension>& extensions) override;
302 bool SetPlayout(bool playout) override; 302 bool SetPlayout(bool playout) override;
303 bool PausePlayout(); 303 bool PausePlayout();
304 bool ResumePlayout(); 304 bool ResumePlayout();
305 bool SetSend(SendFlags send) override; 305 bool SetSend(SendFlags send) override;
306 bool PauseSend(); 306 bool PauseSend();
307 bool ResumeSend(); 307 bool ResumeSend();
308 bool SetAudioSend(uint32 ssrc, bool mute, const AudioOptions* options,
309 AudioRenderer* renderer) override;
308 bool AddSendStream(const StreamParams& sp) override; 310 bool AddSendStream(const StreamParams& sp) override;
309 bool RemoveSendStream(uint32 ssrc) override; 311 bool RemoveSendStream(uint32 ssrc) override;
310 bool AddRecvStream(const StreamParams& sp) override; 312 bool AddRecvStream(const StreamParams& sp) override;
311 bool RemoveRecvStream(uint32 ssrc) override; 313 bool RemoveRecvStream(uint32 ssrc) override;
312 bool SetRemoteRenderer(uint32 ssrc, AudioRenderer* renderer) override; 314 bool SetRemoteRenderer(uint32 ssrc, AudioRenderer* renderer) override;
313 bool SetLocalRenderer(uint32 ssrc, AudioRenderer* renderer) override;
314 bool GetActiveStreams(AudioInfo::StreamList* actives) override; 315 bool GetActiveStreams(AudioInfo::StreamList* actives) override;
315 int GetOutputLevel() override; 316 int GetOutputLevel() override;
316 int GetTimeSinceLastTyping() override; 317 int GetTimeSinceLastTyping() override;
317 void SetTypingDetectionParameters(int time_window, 318 void SetTypingDetectionParameters(int time_window,
318 int cost_per_typing, 319 int cost_per_typing,
319 int reporting_threshold, 320 int reporting_threshold,
320 int penalty_decay, 321 int penalty_decay,
321 int type_event_delay) override; 322 int type_event_delay) override;
322 bool SetOutputScaling(uint32 ssrc, double left, double right) override; 323 bool SetOutputScaling(uint32 ssrc, double left, double right) override;
323 324
324 bool SetRingbackTone(const char* buf, int len) override; 325 bool SetRingbackTone(const char* buf, int len) override;
325 bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) override; 326 bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) override;
326 bool CanInsertDtmf() override; 327 bool CanInsertDtmf() override;
327 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override; 328 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override;
328 329
329 void OnPacketReceived(rtc::Buffer* packet, 330 void OnPacketReceived(rtc::Buffer* packet,
330 const rtc::PacketTime& packet_time) override; 331 const rtc::PacketTime& packet_time) override;
331 void OnRtcpReceived(rtc::Buffer* packet, 332 void OnRtcpReceived(rtc::Buffer* packet,
332 const rtc::PacketTime& packet_time) override; 333 const rtc::PacketTime& packet_time) override;
333 void OnReadyToSend(bool ready) override {} 334 void OnReadyToSend(bool ready) override {}
334 bool MuteStream(uint32 ssrc, bool on) override;
335 bool SetMaxSendBandwidth(int bps) override; 335 bool SetMaxSendBandwidth(int bps) override;
336 bool GetStats(VoiceMediaInfo* info) override; 336 bool GetStats(VoiceMediaInfo* info) override;
337 // Gets last reported error from WebRtc voice engine. This should be only 337 // Gets last reported error from WebRtc voice engine. This should be only
338 // called in response a failure. 338 // called in response a failure.
339 void GetLastMediaError(uint32* ssrc, 339 void GetLastMediaError(uint32* ssrc,
340 VoiceMediaChannel::Error* error) override; 340 VoiceMediaChannel::Error* error) override;
341 341
342 // implements Transport interface 342 // implements Transport interface
343 int SendPacket(int channel, const void* data, size_t len) override { 343 int SendPacket(int channel, const void* data, size_t len) override {
344 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len, 344 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 454 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
455 455
456 // Do not lock this on the VoE media processor thread; potential for deadlock 456 // Do not lock this on the VoE media processor thread; potential for deadlock
457 // exists. 457 // exists.
458 mutable rtc::CriticalSection receive_channels_cs_; 458 mutable rtc::CriticalSection receive_channels_cs_;
459 }; 459 };
460 460
461 } // namespace cricket 461 } // namespace cricket
462 462
463 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 463 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698