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

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

Issue 1364083002: Remove ChannelManager::GetCapabilities() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 friend class WebRtcVoiceMediaChannel; 63 friend class WebRtcVoiceMediaChannel;
64 64
65 public: 65 public:
66 WebRtcVoiceEngine(); 66 WebRtcVoiceEngine();
67 // Dependency injection for testing. 67 // Dependency injection for testing.
68 WebRtcVoiceEngine(VoEWrapper* voe_wrapper, VoETraceWrapper* tracing); 68 WebRtcVoiceEngine(VoEWrapper* voe_wrapper, VoETraceWrapper* tracing);
69 ~WebRtcVoiceEngine(); 69 ~WebRtcVoiceEngine();
70 bool Init(rtc::Thread* worker_thread); 70 bool Init(rtc::Thread* worker_thread);
71 void Terminate(); 71 void Terminate();
72 72
73 int GetCapabilities();
74 webrtc::VoiceEngine* GetVoE() { return voe()->engine(); } 73 webrtc::VoiceEngine* GetVoE() { return voe()->engine(); }
75 VoiceMediaChannel* CreateChannel(webrtc::Call* call, 74 VoiceMediaChannel* CreateChannel(webrtc::Call* call,
76 const AudioOptions& options); 75 const AudioOptions& options);
77 76
78 AudioOptions GetOptions() const { return options_; } 77 AudioOptions GetOptions() const { return options_; }
79 bool SetOptions(const AudioOptions& options); 78 bool SetOptions(const AudioOptions& options);
80 bool SetDelayOffset(int offset); 79 bool SetDelayOffset(int offset);
81 bool SetDevices(const Device* in_device, const Device* out_device); 80 bool SetDevices(const Device* in_device, const Device* out_device);
82 bool GetOutputVolume(int* level); 81 bool GetOutputVolume(int* level);
83 bool SetOutputVolume(int level); 82 bool SetOutputVolume(int level);
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 373 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
375 374
376 // Do not lock this on the VoE media processor thread; potential for deadlock 375 // Do not lock this on the VoE media processor thread; potential for deadlock
377 // exists. 376 // exists.
378 mutable rtc::CriticalSection receive_channels_cs_; 377 mutable rtc::CriticalSection receive_channels_cs_;
379 }; 378 };
380 379
381 } // namespace cricket 380 } // namespace cricket
382 381
383 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 382 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698