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

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

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * Copyright 2004 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #ifndef TALK_MEDIA_BASE_MEDIAENGINE_H_ 11 #ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
29 #define TALK_MEDIA_BASE_MEDIAENGINE_H_ 12 #define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
30 13
31 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 14 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
32 #include <CoreAudio/CoreAudio.h> 15 #include <CoreAudio/CoreAudio.h>
33 #endif 16 #endif
34 17
35 #include <string> 18 #include <string>
36 #include <vector> 19 #include <vector>
37 20
38 #include "talk/media/base/codec.h"
39 #include "talk/media/base/mediachannel.h"
40 #include "talk/media/base/mediacommon.h"
41 #include "talk/media/base/videocapturer.h"
42 #include "talk/media/base/videocommon.h"
43 #include "talk/media/devices/devicemanager.h"
44 #include "webrtc/audio_state.h" 21 #include "webrtc/audio_state.h"
45 #include "webrtc/base/fileutils.h" 22 #include "webrtc/base/fileutils.h"
46 #include "webrtc/base/sigslotrepeater.h" 23 #include "webrtc/base/sigslotrepeater.h"
24 #include "webrtc/media/base/codec.h"
25 #include "webrtc/media/base/mediachannel.h"
26 #include "webrtc/media/base/mediacommon.h"
27 #include "webrtc/media/base/videocapturer.h"
28 #include "webrtc/media/base/videocommon.h"
29 #include "webrtc/media/devices/devicemanager.h"
47 30
48 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) 31 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
49 #define DISABLE_MEDIA_ENGINE_FACTORY 32 #define DISABLE_MEDIA_ENGINE_FACTORY
50 #endif 33 #endif
51 34
52 namespace webrtc { 35 namespace webrtc {
53 class Call; 36 class Call;
54 } 37 }
55 38
56 namespace cricket { 39 namespace cricket {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 197
215 class DataEngineInterface { 198 class DataEngineInterface {
216 public: 199 public:
217 virtual ~DataEngineInterface() {} 200 virtual ~DataEngineInterface() {}
218 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; 201 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
219 virtual const std::vector<DataCodec>& data_codecs() = 0; 202 virtual const std::vector<DataCodec>& data_codecs() = 0;
220 }; 203 };
221 204
222 } // namespace cricket 205 } // namespace cricket
223 206
224 #endif // TALK_MEDIA_BASE_MEDIAENGINE_H_ 207 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698