| OLD | NEW |
| 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 10 matching lines...) Expand all Loading... |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 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, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 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 | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef TALK_MEDIA_BASE_MEDIAENGINE_H_ | 28 #ifndef TALK_MEDIA_BASE_MEDIAENGINE_H_ |
| 29 #define TALK_MEDIA_BASE_MEDIAENGINE_H_ | 29 #define TALK_MEDIA_BASE_MEDIAENGINE_H_ |
| 30 | 30 |
| 31 #ifdef OSX | 31 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
| 32 #include <CoreAudio/CoreAudio.h> | 32 #include <CoreAudio/CoreAudio.h> |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 #include <string> | 35 #include <string> |
| 36 #include <vector> | 36 #include <vector> |
| 37 | 37 |
| 38 #include "talk/media/base/codec.h" | 38 #include "talk/media/base/codec.h" |
| 39 #include "talk/media/base/mediachannel.h" | 39 #include "talk/media/base/mediachannel.h" |
| 40 #include "talk/media/base/mediacommon.h" | 40 #include "talk/media/base/mediacommon.h" |
| 41 #include "talk/media/base/videocapturer.h" | 41 #include "talk/media/base/videocapturer.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 class DataEngineInterface { | 213 class DataEngineInterface { |
| 214 public: | 214 public: |
| 215 virtual ~DataEngineInterface() {} | 215 virtual ~DataEngineInterface() {} |
| 216 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; | 216 virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0; |
| 217 virtual const std::vector<DataCodec>& data_codecs() = 0; | 217 virtual const std::vector<DataCodec>& data_codecs() = 0; |
| 218 }; | 218 }; |
| 219 | 219 |
| 220 } // namespace cricket | 220 } // namespace cricket |
| 221 | 221 |
| 222 #endif // TALK_MEDIA_BASE_MEDIAENGINE_H_ | 222 #endif // TALK_MEDIA_BASE_MEDIAENGINE_H_ |
| OLD | NEW |