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

Side by Side Diff: webrtc/pc/rtcpmuxfilter.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/remoteaudiosource.cc ('k') | webrtc/pc/rtcpmuxfilter_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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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/rtcpmuxfilter.h" 11 #include "webrtc/pc/rtcpmuxfilter.h"
12 12
13 #include "webrtc/base/logging.h" 13 #include "webrtc/rtc_base/logging.h"
14 14
15 namespace cricket { 15 namespace cricket {
16 16
17 RtcpMuxFilter::RtcpMuxFilter() : state_(ST_INIT), offer_enable_(false) { 17 RtcpMuxFilter::RtcpMuxFilter() : state_(ST_INIT), offer_enable_(false) {
18 } 18 }
19 19
20 bool RtcpMuxFilter::IsFullyActive() const { 20 bool RtcpMuxFilter::IsFullyActive() const {
21 return state_ == ST_ACTIVE; 21 return state_ == ST_ACTIVE;
22 } 22 }
23 23
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 116 }
117 117
118 bool RtcpMuxFilter::ExpectAnswer(ContentSource source) { 118 bool RtcpMuxFilter::ExpectAnswer(ContentSource source) {
119 return ((state_ == ST_SENTOFFER && source == CS_REMOTE) || 119 return ((state_ == ST_SENTOFFER && source == CS_REMOTE) ||
120 (state_ == ST_RECEIVEDOFFER && source == CS_LOCAL) || 120 (state_ == ST_RECEIVEDOFFER && source == CS_LOCAL) ||
121 (state_ == ST_SENTPRANSWER && source == CS_LOCAL) || 121 (state_ == ST_SENTPRANSWER && source == CS_LOCAL) ||
122 (state_ == ST_RECEIVEDPRANSWER && source == CS_REMOTE)); 122 (state_ == ST_RECEIVEDPRANSWER && source == CS_REMOTE));
123 } 123 }
124 124
125 } // namespace cricket 125 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/remoteaudiosource.cc ('k') | webrtc/pc/rtcpmuxfilter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698