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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/3) (Closed)
Patch Set: Rebased onto 89c4a7e57d524b13fbe0c823a83a4c10c2e63bd0 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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/modules/rtp_rtcp/source/rtp_rtcp_impl.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 17
18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/logging.h"
20 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
21 #include "webrtc/config.h" 19 #include "webrtc/config.h"
20 #include "webrtc/rtc_base/checks.h"
21 #include "webrtc/rtc_base/logging.h"
22 22
23 #ifdef _WIN32 23 #ifdef _WIN32
24 // Disable warning C4355: 'this' : used in base member initializer list. 24 // Disable warning C4355: 'this' : used in base member initializer list.
25 #pragma warning(disable : 4355) 25 #pragma warning(disable : 4355)
26 #endif 26 #endif
27 27
28 namespace webrtc { 28 namespace webrtc {
29 29
30 RTPExtensionType StringToRtpExtensionType(const std::string& extension) { 30 RTPExtensionType StringToRtpExtensionType(const std::string& extension) {
31 if (extension == RtpExtension::kTimestampOffsetUri) 31 if (extension == RtpExtension::kTimestampOffsetUri)
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 StreamDataCountersCallback* 886 StreamDataCountersCallback*
887 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 887 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
888 return rtp_sender_->GetRtpStatisticsCallback(); 888 return rtp_sender_->GetRtpStatisticsCallback();
889 } 889 }
890 890
891 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( 891 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation(
892 const BitrateAllocation& bitrate) { 892 const BitrateAllocation& bitrate) {
893 rtcp_sender_.SetVideoBitrateAllocation(bitrate); 893 rtcp_sender_.SetVideoBitrateAllocation(bitrate);
894 } 894 }
895 } // namespace webrtc 895 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698