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

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

Issue 2550273003: Moved call.h and most of api/call/* into call/ (Closed)
Patch Set: Added <set> include after presubmit complained. Created 4 years 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 * 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/api/call/audio_state.h"
22 #include "webrtc/api/rtpparameters.h" 21 #include "webrtc/api/rtpparameters.h"
23 #include "webrtc/base/fileutils.h" 22 #include "webrtc/base/fileutils.h"
24 #include "webrtc/base/sigslotrepeater.h" 23 #include "webrtc/base/sigslotrepeater.h"
24 #include "webrtc/call/audio_state.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/videocommon.h" 27 #include "webrtc/media/base/videocommon.h"
28 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h" 28 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
29 29
30 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) 30 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
31 #define DISABLE_MEDIA_ENGINE_FACTORY 31 #define DISABLE_MEDIA_ENGINE_FACTORY
32 #endif 32 #endif
33 33
34 namespace webrtc { 34 namespace webrtc {
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 virtual ~DataEngineInterface() {} 172 virtual ~DataEngineInterface() {}
173 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; 173 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
174 virtual const std::vector<DataCodec>& data_codecs() = 0; 174 virtual const std::vector<DataCodec>& data_codecs() = 0;
175 }; 175 };
176 176
177 webrtc::RtpParameters CreateRtpParametersWithOneEncoding(); 177 webrtc::RtpParameters CreateRtpParametersWithOneEncoding();
178 178
179 } // namespace cricket 179 } // namespace cricket
180 180
181 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_ 181 #endif // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.h ('k') | webrtc/media/base/videoengine_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698