Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: webrtc/api/webrtcsession.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * Copyright 2012 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
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
14 * derived from this software without specific prior written permission.
15 *
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
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
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,
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
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #include "talk/app/webrtc/webrtcsession.h" 11 #include "webrtc/api/webrtcsession.h"
29 12
30 #include <limits.h> 13 #include <limits.h>
31 14
32 #include <algorithm> 15 #include <algorithm>
33 #include <set> 16 #include <set>
34 #include <utility> 17 #include <utility>
35 #include <vector> 18 #include <vector>
36 19
37 #include "talk/app/webrtc/jsepicecandidate.h" 20 #include "webrtc/api/jsepicecandidate.h"
38 #include "talk/app/webrtc/jsepsessiondescription.h" 21 #include "webrtc/api/jsepsessiondescription.h"
39 #include "talk/app/webrtc/mediaconstraintsinterface.h" 22 #include "webrtc/api/mediaconstraintsinterface.h"
40 #include "talk/app/webrtc/peerconnectioninterface.h" 23 #include "webrtc/api/peerconnectioninterface.h"
41 #include "talk/app/webrtc/sctputils.h" 24 #include "webrtc/api/sctputils.h"
42 #include "talk/app/webrtc/webrtcsessiondescriptionfactory.h" 25 #include "webrtc/api/webrtcsessiondescriptionfactory.h"
43 #include "talk/media/base/constants.h" 26 #include "talk/media/base/constants.h"
44 #include "talk/media/base/videocapturer.h" 27 #include "talk/media/base/videocapturer.h"
45 #include "talk/session/media/channel.h" 28 #include "talk/session/media/channel.h"
46 #include "talk/session/media/channelmanager.h" 29 #include "talk/session/media/channelmanager.h"
47 #include "talk/session/media/mediasession.h" 30 #include "talk/session/media/mediasession.h"
48 #include "webrtc/audio/audio_sink.h" 31 #include "webrtc/audio/audio_sink.h"
49 #include "webrtc/base/basictypes.h" 32 #include "webrtc/base/basictypes.h"
50 #include "webrtc/base/checks.h" 33 #include "webrtc/base/checks.h"
51 #include "webrtc/base/helpers.h" 34 #include "webrtc/base/helpers.h"
52 #include "webrtc/base/logging.h" 35 #include "webrtc/base/logging.h"
(...skipping 2152 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 } 2188 }
2206 } 2189 }
2207 2190
2208 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2191 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2209 const rtc::SentPacket& sent_packet) { 2192 const rtc::SentPacket& sent_packet) {
2210 RTC_DCHECK(worker_thread()->IsCurrent()); 2193 RTC_DCHECK(worker_thread()->IsCurrent());
2211 media_controller_->call_w()->OnSentPacket(sent_packet); 2194 media_controller_->call_w()->OnSentPacket(sent_packet);
2212 } 2195 }
2213 2196
2214 } // namespace webrtc 2197 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698