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

Side by Side Diff: webrtc/pc/rtpsender.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 | « webrtc/pc/rtpsender.h ('k') | webrtc/pc/rtpsenderreceiver_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 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/pc/rtpsender.h" 11 #include "webrtc/pc/rtpsender.h"
12 12
13 #include "webrtc/api/mediastreaminterface.h" 13 #include "webrtc/api/mediastreaminterface.h"
14 #include "webrtc/base/checks.h"
15 #include "webrtc/base/helpers.h"
16 #include "webrtc/base/trace_event.h"
17 #include "webrtc/pc/localaudiosource.h" 14 #include "webrtc/pc/localaudiosource.h"
15 #include "webrtc/rtc_base/checks.h"
16 #include "webrtc/rtc_base/helpers.h"
17 #include "webrtc/rtc_base/trace_event.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 LocalAudioSinkAdapter::LocalAudioSinkAdapter() : sink_(nullptr) {} 21 LocalAudioSinkAdapter::LocalAudioSinkAdapter() : sink_(nullptr) {}
22 22
23 LocalAudioSinkAdapter::~LocalAudioSinkAdapter() { 23 LocalAudioSinkAdapter::~LocalAudioSinkAdapter() {
24 rtc::CritScope lock(&lock_); 24 rtc::CritScope lock(&lock_);
25 if (sink_) 25 if (sink_)
26 sink_->OnClose(); 26 sink_->OnClose();
27 } 27 }
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 LOG(LS_WARNING) << "SetVideoSend: No video channel exists."; 463 LOG(LS_WARNING) << "SetVideoSend: No video channel exists.";
464 return; 464 return;
465 } 465 }
466 // Allow SetVideoSend to fail since |enable| is false and |source| is null. 466 // Allow SetVideoSend to fail since |enable| is false and |source| is null.
467 // This the normal case when the underlying media channel has already been 467 // This the normal case when the underlying media channel has already been
468 // deleted. 468 // deleted.
469 channel_->SetVideoSend(ssrc_, false, nullptr, nullptr); 469 channel_->SetVideoSend(ssrc_, false, nullptr, nullptr);
470 } 470 }
471 471
472 } // namespace webrtc 472 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/rtpsender.h ('k') | webrtc/pc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698