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, |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #include <limits.h> | 30 #include <limits.h> |
31 | 31 |
32 #include <algorithm> | 32 #include <algorithm> |
33 #include <vector> | 33 #include <vector> |
34 #include <set> | 34 #include <set> |
35 | 35 |
36 #include "talk/app/webrtc/jsepicecandidate.h" | 36 #include "talk/app/webrtc/jsepicecandidate.h" |
37 #include "talk/app/webrtc/jsepsessiondescription.h" | 37 #include "talk/app/webrtc/jsepsessiondescription.h" |
38 #include "talk/app/webrtc/mediaconstraintsinterface.h" | 38 #include "talk/app/webrtc/mediaconstraintsinterface.h" |
39 #include "talk/app/webrtc/mediastreamsignaling.h" | |
40 #include "talk/app/webrtc/peerconnectioninterface.h" | 39 #include "talk/app/webrtc/peerconnectioninterface.h" |
41 #include "talk/app/webrtc/sctputils.h" | 40 #include "talk/app/webrtc/sctputils.h" |
42 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" | 41 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" |
43 #include "talk/media/base/constants.h" | 42 #include "talk/media/base/constants.h" |
44 #include "talk/media/base/videocapturer.h" | 43 #include "talk/media/base/videocapturer.h" |
45 #include "talk/session/media/channel.h" | 44 #include "talk/session/media/channel.h" |
46 #include "talk/session/media/channelmanager.h" | 45 #include "talk/session/media/channelmanager.h" |
47 #include "talk/session/media/mediasession.h" | 46 #include "talk/session/media/mediasession.h" |
48 #include "webrtc/base/basictypes.h" | 47 #include "webrtc/base/basictypes.h" |
49 #include "webrtc/base/checks.h" | 48 #include "webrtc/base/checks.h" |
(...skipping 2140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2190 } | 2189 } |
2191 } | 2190 } |
2192 | 2191 |
2193 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2192 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
2194 const rtc::SentPacket& sent_packet) { | 2193 const rtc::SentPacket& sent_packet) { |
2195 RTC_DCHECK(worker_thread()->IsCurrent()); | 2194 RTC_DCHECK(worker_thread()->IsCurrent()); |
2196 media_controller_->call_w()->OnSentPacket(sent_packet); | 2195 media_controller_->call_w()->OnSentPacket(sent_packet); |
2197 } | 2196 } |
2198 | 2197 |
2199 } // namespace webrtc | 2198 } // namespace webrtc |
OLD | NEW |