OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 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 #include "talk/app/webrtc/webrtcsession.h" | 28 #include "webrtc/api/webrtcsession.h" |
29 | 29 |
30 #include <limits.h> | 30 #include <limits.h> |
31 | 31 |
32 #include <algorithm> | 32 #include <algorithm> |
33 #include <set> | 33 #include <set> |
34 #include <utility> | 34 #include <utility> |
35 #include <vector> | 35 #include <vector> |
36 | 36 |
37 #include "talk/app/webrtc/jsepicecandidate.h" | |
38 #include "talk/app/webrtc/jsepsessiondescription.h" | |
39 #include "talk/app/webrtc/mediaconstraintsinterface.h" | |
40 #include "talk/app/webrtc/peerconnectioninterface.h" | |
41 #include "talk/app/webrtc/sctputils.h" | |
42 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" | |
43 #include "talk/session/media/channel.h" | 37 #include "talk/session/media/channel.h" |
44 #include "talk/session/media/channelmanager.h" | 38 #include "talk/session/media/channelmanager.h" |
45 #include "talk/session/media/mediasession.h" | 39 #include "talk/session/media/mediasession.h" |
| 40 #include "webrtc/api/jsepicecandidate.h" |
| 41 #include "webrtc/api/jsepsessiondescription.h" |
| 42 #include "webrtc/api/mediaconstraintsinterface.h" |
| 43 #include "webrtc/api/peerconnectioninterface.h" |
| 44 #include "webrtc/api/sctputils.h" |
| 45 #include "webrtc/api/webrtcsessiondescriptionfactory.h" |
46 #include "webrtc/audio/audio_sink.h" | 46 #include "webrtc/audio/audio_sink.h" |
47 #include "webrtc/base/basictypes.h" | 47 #include "webrtc/base/basictypes.h" |
48 #include "webrtc/base/checks.h" | 48 #include "webrtc/base/checks.h" |
49 #include "webrtc/base/helpers.h" | 49 #include "webrtc/base/helpers.h" |
50 #include "webrtc/base/logging.h" | 50 #include "webrtc/base/logging.h" |
51 #include "webrtc/base/stringencode.h" | 51 #include "webrtc/base/stringencode.h" |
52 #include "webrtc/base/stringutils.h" | 52 #include "webrtc/base/stringutils.h" |
53 #include "webrtc/call.h" | 53 #include "webrtc/call.h" |
54 #include "webrtc/media/base/constants.h" | 54 #include "webrtc/media/base/constants.h" |
55 #include "webrtc/media/base/videocapturer.h" | 55 #include "webrtc/media/base/videocapturer.h" |
(...skipping 2120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2176 } | 2176 } |
2177 } | 2177 } |
2178 | 2178 |
2179 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2179 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
2180 const rtc::SentPacket& sent_packet) { | 2180 const rtc::SentPacket& sent_packet) { |
2181 RTC_DCHECK(worker_thread()->IsCurrent()); | 2181 RTC_DCHECK(worker_thread()->IsCurrent()); |
2182 media_controller_->call_w()->OnSentPacket(sent_packet); | 2182 media_controller_->call_w()->OnSentPacket(sent_packet); |
2183 } | 2183 } |
2184 | 2184 |
2185 } // namespace webrtc | 2185 } // namespace webrtc |
OLD | NEW |