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

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

Issue 2142893002: Revert of Clean up unused cricket::VideoCapturer inclusion from mediaengine.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | no next file » | 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/api/rtpparameters.h" 22 #include "webrtc/api/rtpparameters.h"
23 #include "webrtc/base/fileutils.h" 23 #include "webrtc/base/fileutils.h"
24 #include "webrtc/base/sigslotrepeater.h" 24 #include "webrtc/base/sigslotrepeater.h"
25 #include "webrtc/media/base/codec.h" 25 #include "webrtc/media/base/codec.h"
26 #include "webrtc/media/base/mediachannel.h" 26 #include "webrtc/media/base/mediachannel.h"
27 #include "webrtc/media/base/mediacommon.h" 27 #include "webrtc/media/base/mediacommon.h"
28 #include "webrtc/media/base/videocapturer.h"
28 #include "webrtc/media/base/videocommon.h" 29 #include "webrtc/media/base/videocommon.h"
29 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h" 30 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
30 31
31 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) 32 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
32 #define DISABLE_MEDIA_ENGINE_FACTORY 33 #define DISABLE_MEDIA_ENGINE_FACTORY
33 #endif 34 #endif
34 35
35 namespace webrtc { 36 namespace webrtc {
36 class AudioDeviceModule; 37 class AudioDeviceModule;
37 class Call; 38 class Call;
38 } 39 }
39 40
40 namespace cricket { 41 namespace cricket {
41 42
43 class VideoCapturer;
44
42 struct RtpCapabilities { 45 struct RtpCapabilities {
43 std::vector<webrtc::RtpExtension> header_extensions; 46 std::vector<webrtc::RtpExtension> header_extensions;
44 }; 47 };
45 48
46 // MediaEngineInterface is an abstraction of a media engine which can be 49 // MediaEngineInterface is an abstraction of a media engine which can be
47 // subclassed to support different media componentry backends. 50 // subclassed to support different media componentry backends.
48 // It supports voice and video operations in the same class to facilitate 51 // It supports voice and video operations in the same class to facilitate
49 // proper synchronization between both media types. 52 // proper synchronization between both media types.
50 class MediaEngineInterface { 53 class MediaEngineInterface {
51 public: 54 public:
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 virtual ~DataEngineInterface() {} 182 virtual ~DataEngineInterface() {}
180 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; 183 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
181 virtual const std::vector<DataCodec>& data_codecs() = 0; 184 virtual const std::vector<DataCodec>& data_codecs() = 0;
182 }; 185 };
183 186
184 webrtc::RtpParameters CreateRtpParametersWithOneEncoding(); 187 webrtc::RtpParameters CreateRtpParametersWithOneEncoding();
185 188
186 } // namespace cricket 189 } // namespace cricket
187 190
188 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ 191 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698