| 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, |
| 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 #include "talk/session/media/channelmanager.h" | 28 #include "webrtc/pc/channelmanager.h" |
| 29 | 29 |
| 30 #ifdef HAVE_CONFIG_H | 30 #ifdef HAVE_CONFIG_H |
| 31 #include <config.h> | 31 #include <config.h> |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 #include <algorithm> | 34 #include <algorithm> |
| 35 | 35 |
| 36 #include "talk/session/media/srtpfilter.h" | |
| 37 #include "webrtc/api/mediacontroller.h" | 36 #include "webrtc/api/mediacontroller.h" |
| 38 #include "webrtc/base/bind.h" | 37 #include "webrtc/base/bind.h" |
| 39 #include "webrtc/base/common.h" | 38 #include "webrtc/base/common.h" |
| 40 #include "webrtc/base/logging.h" | 39 #include "webrtc/base/logging.h" |
| 41 #include "webrtc/base/sigslotrepeater.h" | 40 #include "webrtc/base/sigslotrepeater.h" |
| 42 #include "webrtc/base/stringencode.h" | 41 #include "webrtc/base/stringencode.h" |
| 43 #include "webrtc/base/stringutils.h" | 42 #include "webrtc/base/stringutils.h" |
| 44 #include "webrtc/base/trace_event.h" | 43 #include "webrtc/base/trace_event.h" |
| 45 #include "webrtc/media/base/capturemanager.h" | 44 #include "webrtc/media/base/capturemanager.h" |
| 46 #include "webrtc/media/base/device.h" | 45 #include "webrtc/media/base/device.h" |
| 47 #include "webrtc/media/base/hybriddataengine.h" | 46 #include "webrtc/media/base/hybriddataengine.h" |
| 48 #include "webrtc/media/base/rtpdataengine.h" | 47 #include "webrtc/media/base/rtpdataengine.h" |
| 49 #include "webrtc/media/base/videocapturer.h" | 48 #include "webrtc/media/base/videocapturer.h" |
| 50 #ifdef HAVE_SCTP | 49 #ifdef HAVE_SCTP |
| 51 #include "webrtc/media/sctp/sctpdataengine.h" | 50 #include "webrtc/media/sctp/sctpdataengine.h" |
| 52 #endif | 51 #endif |
| 52 #include "webrtc/pc/srtpfilter.h" |
| 53 | 53 |
| 54 namespace cricket { | 54 namespace cricket { |
| 55 | 55 |
| 56 enum { | 56 enum { |
| 57 MSG_VIDEOCAPTURESTATE = 1, | 57 MSG_VIDEOCAPTURESTATE = 1, |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 using rtc::Bind; | 60 using rtc::Bind; |
| 61 | 61 |
| 62 static const int kNotSetOutputVolume = -1; | 62 static const int kNotSetOutputVolume = -1; |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 return worker_thread_->Invoke<bool>( | 568 return worker_thread_->Invoke<bool>( |
| 569 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 569 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
| 570 } | 570 } |
| 571 | 571 |
| 572 void ChannelManager::StopRtcEventLog() { | 572 void ChannelManager::StopRtcEventLog() { |
| 573 worker_thread_->Invoke<void>( | 573 worker_thread_->Invoke<void>( |
| 574 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 574 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
| 575 } | 575 } |
| 576 | 576 |
| 577 } // namespace cricket | 577 } // namespace cricket |
| OLD | NEW |