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: talk/media/webrtc/webrtcvoiceengine.h

Issue 1331443003: Remove GetOutputScaling from VoiceMediaChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/webrtc/webrtcvoiceengine.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 * 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 bool SetLocalRenderer(uint32 ssrc, AudioRenderer* renderer) override; 313 bool SetLocalRenderer(uint32 ssrc, AudioRenderer* renderer) override;
314 bool GetActiveStreams(AudioInfo::StreamList* actives) override; 314 bool GetActiveStreams(AudioInfo::StreamList* actives) override;
315 int GetOutputLevel() override; 315 int GetOutputLevel() override;
316 int GetTimeSinceLastTyping() override; 316 int GetTimeSinceLastTyping() override;
317 void SetTypingDetectionParameters(int time_window, 317 void SetTypingDetectionParameters(int time_window,
318 int cost_per_typing, 318 int cost_per_typing,
319 int reporting_threshold, 319 int reporting_threshold,
320 int penalty_decay, 320 int penalty_decay,
321 int type_event_delay) override; 321 int type_event_delay) override;
322 bool SetOutputScaling(uint32 ssrc, double left, double right) override; 322 bool SetOutputScaling(uint32 ssrc, double left, double right) override;
323 bool GetOutputScaling(uint32 ssrc, double* left, double* right) override;
324 323
325 bool SetRingbackTone(const char* buf, int len) override; 324 bool SetRingbackTone(const char* buf, int len) override;
326 bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) override; 325 bool PlayRingbackTone(uint32 ssrc, bool play, bool loop) override;
327 bool CanInsertDtmf() override; 326 bool CanInsertDtmf() override;
328 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override; 327 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override;
329 328
330 void OnPacketReceived(rtc::Buffer* packet, 329 void OnPacketReceived(rtc::Buffer* packet,
331 const rtc::PacketTime& packet_time) override; 330 const rtc::PacketTime& packet_time) override;
332 void OnRtcpReceived(rtc::Buffer* packet, 331 void OnRtcpReceived(rtc::Buffer* packet,
333 const rtc::PacketTime& packet_time) override; 332 const rtc::PacketTime& packet_time) override;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 454 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
456 455
457 // 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
458 // exists. 457 // exists.
459 mutable rtc::CriticalSection receive_channels_cs_; 458 mutable rtc::CriticalSection receive_channels_cs_;
460 }; 459 };
461 460
462 } // namespace cricket 461 } // namespace cricket
463 462
464 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 463 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698