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

Side by Side Diff: webrtc/media/base/mediaengine.h

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 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 | « webrtc/media/base/fakemediaengine.h ('k') | webrtc/media/base/videocapturer.h » ('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 * 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
11 #ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ 11 #ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
12 #define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ 12 #define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
13 13
14 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 14 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
15 #include <CoreAudio/CoreAudio.h> 15 #include <CoreAudio/CoreAudio.h>
16 #endif 16 #endif
17 17
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/audio_state.h" 21 #include "webrtc/audio_state.h"
22 #include "webrtc/base/fileutils.h" 22 #include "webrtc/base/fileutils.h"
23 #include "webrtc/base/sigslotrepeater.h" 23 #include "webrtc/base/sigslotrepeater.h"
24 #include "webrtc/media/base/codec.h" 24 #include "webrtc/media/base/codec.h"
25 #include "webrtc/media/base/mediachannel.h" 25 #include "webrtc/media/base/mediachannel.h"
26 #include "webrtc/media/base/mediacommon.h" 26 #include "webrtc/media/base/mediacommon.h"
27 #include "webrtc/media/base/videocapturer.h" 27 #include "webrtc/media/base/videocapturer.h"
28 #include "webrtc/media/base/videocommon.h" 28 #include "webrtc/media/base/videocommon.h"
29 #include "webrtc/media/devices/devicemanager.h"
30 29
31 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) 30 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
32 #define DISABLE_MEDIA_ENGINE_FACTORY 31 #define DISABLE_MEDIA_ENGINE_FACTORY
33 #endif 32 #endif
34 33
35 namespace webrtc { 34 namespace webrtc {
36 class Call; 35 class Call;
37 } 36 }
38 37
39 namespace cricket { 38 namespace cricket {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 class DataEngineInterface { 200 class DataEngineInterface {
202 public: 201 public:
203 virtual ~DataEngineInterface() {} 202 virtual ~DataEngineInterface() {}
204 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; 203 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
205 virtual const std::vector<DataCodec>& data_codecs() = 0; 204 virtual const std::vector<DataCodec>& data_codecs() = 0;
206 }; 205 };
207 206
208 } // namespace cricket 207 } // namespace cricket
209 208
210 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ 209 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/fakemediaengine.h ('k') | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698