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

Side by Side Diff: talk/session/media/channel.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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
« no previous file with comments | « talk/session/media/channel.h ('k') | talk/session/media/channel_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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,
(...skipping 11 matching lines...) Expand all
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 <utility> 28 #include <utility>
29 29
30 #include "talk/session/media/channel.h" 30 #include "talk/session/media/channel.h"
31 31
32 #include "talk/media/base/constants.h"
33 #include "talk/media/base/rtputils.h"
34 #include "talk/session/media/channelmanager.h" 32 #include "talk/session/media/channelmanager.h"
35 #include "webrtc/audio/audio_sink.h" 33 #include "webrtc/audio/audio_sink.h"
36 #include "webrtc/base/bind.h" 34 #include "webrtc/base/bind.h"
37 #include "webrtc/base/buffer.h" 35 #include "webrtc/base/buffer.h"
38 #include "webrtc/base/byteorder.h" 36 #include "webrtc/base/byteorder.h"
39 #include "webrtc/base/common.h" 37 #include "webrtc/base/common.h"
40 #include "webrtc/base/dscp.h" 38 #include "webrtc/base/dscp.h"
41 #include "webrtc/base/logging.h" 39 #include "webrtc/base/logging.h"
42 #include "webrtc/base/trace_event.h" 40 #include "webrtc/base/trace_event.h"
41 #include "webrtc/media/base/constants.h"
42 #include "webrtc/media/base/rtputils.h"
43 #include "webrtc/p2p/base/transportchannel.h" 43 #include "webrtc/p2p/base/transportchannel.h"
44 44
45 namespace cricket { 45 namespace cricket {
46 using rtc::Bind; 46 using rtc::Bind;
47 47
48 namespace { 48 namespace {
49 // See comment below for why we need to use a pointer to a scoped_ptr. 49 // See comment below for why we need to use a pointer to a scoped_ptr.
50 bool SetRawAudioSink_w(VoiceMediaChannel* channel, 50 bool SetRawAudioSink_w(VoiceMediaChannel* channel,
51 uint32_t ssrc, 51 uint32_t ssrc,
52 rtc::scoped_ptr<webrtc::AudioSinkInterface>* sink) { 52 rtc::scoped_ptr<webrtc::AudioSinkInterface>* sink) {
(...skipping 2212 matching lines...) Expand 10 before | Expand all | Expand 10 after
2265 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2265 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2266 } 2266 }
2267 2267
2268 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2268 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2269 rtc::TypedMessageData<uint32_t>* message = 2269 rtc::TypedMessageData<uint32_t>* message =
2270 new rtc::TypedMessageData<uint32_t>(sid); 2270 new rtc::TypedMessageData<uint32_t>(sid);
2271 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2271 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2272 } 2272 }
2273 2273
2274 } // namespace cricket 2274 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/channel.h ('k') | talk/session/media/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698