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

Side by Side Diff: webrtc/video_engine/vie_channel_group.cc

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 years, 3 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/video_engine/vie_channel.h ('k') | webrtc/voice_engine/channel_manager.h » ('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 (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
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 RemoteBitrateObserver* observer_; 131 RemoteBitrateObserver* observer_;
132 Clock* clock_; 132 Clock* clock_;
133 rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_; 133 rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
134 const uint32_t min_bitrate_bps_; 134 const uint32_t min_bitrate_bps_;
135 rtc::scoped_ptr<RemoteBitrateEstimator> rbe_; 135 rtc::scoped_ptr<RemoteBitrateEstimator> rbe_;
136 bool using_absolute_send_time_; 136 bool using_absolute_send_time_;
137 uint32_t packets_since_absolute_send_time_; 137 uint32_t packets_since_absolute_send_time_;
138 138
139 DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); 139 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator);
140 }; 140 };
141 141
142 } // namespace 142 } // namespace
143 143
144 ChannelGroup::ChannelGroup(ProcessThread* process_thread) 144 ChannelGroup::ChannelGroup(ProcessThread* process_thread)
145 : remb_(new VieRemb()), 145 : remb_(new VieRemb()),
146 bitrate_allocator_(new BitrateAllocator()), 146 bitrate_allocator_(new BitrateAllocator()),
147 call_stats_(new CallStats()), 147 call_stats_(new CallStats()),
148 encoder_state_feedback_(new EncoderStateFeedback()), 148 encoder_state_feedback_(new EncoderStateFeedback()),
149 packet_router_(new PacketRouter()), 149 packet_router_(new PacketRouter()),
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 rtc::CritScope lock(&encoder_map_crit_); 363 rtc::CritScope lock(&encoder_map_crit_);
364 for (const auto& encoder : vie_encoder_map_) 364 for (const auto& encoder : vie_encoder_map_)
365 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps(); 365 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps();
366 } 366 }
367 pacer_->UpdateBitrate( 367 pacer_->UpdateBitrate(
368 target_bitrate_bps / 1000, 368 target_bitrate_bps / 1000,
369 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, 369 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
370 pad_up_to_bitrate_bps / 1000); 370 pad_up_to_bitrate_bps / 1000);
371 } 371 }
372 } // namespace webrtc 372 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/voice_engine/channel_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698