| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. and Robin Seggelmann | 3 * Copyright 2012 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, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 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 | 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. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 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 | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 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_SCTP_HYBRIDDATAENGINE_H_ | 28 #ifndef WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_ |
| 29 #define TALK_MEDIA_SCTP_HYBRIDDATAENGINE_H_ | 29 #define WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_ |
| 30 | 30 |
| 31 #include <string> | 31 #include <string> |
| 32 #include <vector> | 32 #include <vector> |
| 33 | 33 |
| 34 #include "talk/media/base/codec.h" | |
| 35 #include "talk/media/base/mediachannel.h" | |
| 36 #include "talk/media/base/mediaengine.h" | |
| 37 #include "webrtc/base/scoped_ptr.h" | 34 #include "webrtc/base/scoped_ptr.h" |
| 35 #include "webrtc/media/base/codec.h" |
| 36 #include "webrtc/media/base/mediachannel.h" |
| 37 #include "webrtc/media/base/mediaengine.h" |
| 38 | 38 |
| 39 namespace cricket { | 39 namespace cricket { |
| 40 | 40 |
| 41 class HybridDataEngine : public DataEngineInterface { | 41 class HybridDataEngine : public DataEngineInterface { |
| 42 public: | 42 public: |
| 43 // Takes ownership. | 43 // Takes ownership. |
| 44 HybridDataEngine(DataEngineInterface* first, | 44 HybridDataEngine(DataEngineInterface* first, |
| 45 DataEngineInterface* second) | 45 DataEngineInterface* second) |
| 46 : first_(first), | 46 : first_(first), |
| 47 second_(second) { | 47 second_(second) { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 66 virtual const std::vector<DataCodec>& data_codecs() { return codecs_; } | 66 virtual const std::vector<DataCodec>& data_codecs() { return codecs_; } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 rtc::scoped_ptr<DataEngineInterface> first_; | 69 rtc::scoped_ptr<DataEngineInterface> first_; |
| 70 rtc::scoped_ptr<DataEngineInterface> second_; | 70 rtc::scoped_ptr<DataEngineInterface> second_; |
| 71 std::vector<DataCodec> codecs_; | 71 std::vector<DataCodec> codecs_; |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 } // namespace cricket | 74 } // namespace cricket |
| 75 | 75 |
| 76 #endif // TALK_MEDIA_SCTP_HYBRIDDATAENGINE_H_ | 76 #endif // WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_ |
| OLD | NEW |