generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused private data member engine_id_

Browse Source 
BUG=chromium:447445
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/39459004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8088 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org 2015-01-19 07:54:29 +00:00
parent fe672e3839
commit 2624b1ed23
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/video_engine/vie_channel_group.cc
View File

@ -32,14 +32,12 @@ static const uint32_t kTimeOffsetSwitchThreshold = 30;
class WrappingBitrateEstimator : public RemoteBitrateEstimator { class WrappingBitrateEstimator : public RemoteBitrateEstimator {
public: public:
WrappingBitrateEstimator(int engine_id, WrappingBitrateEstimator(RemoteBitrateObserver* observer,
RemoteBitrateObserver* observer,
Clock* clock, Clock* clock,
const Config& config) const Config& config)
: observer_(observer), : observer_(observer),
clock_(clock), clock_(clock),
crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
engine_id_(engine_id),
min_bitrate_bps_(config.Get<RemoteBitrateEstimatorMinRate>().min_rate), min_bitrate_bps_(config.Get<RemoteBitrateEstimatorMinRate>().min_rate),
rate_control_type_(kAimdControl), rate_control_type_(kAimdControl),
rbe_(RemoteBitrateEstimatorFactory().Create(observer_, rbe_(RemoteBitrateEstimatorFactory().Create(observer_,
@ -142,7 +140,6 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator {
RemoteBitrateObserver* observer_; RemoteBitrateObserver* observer_;
Clock* clock_; Clock* clock_;
scoped_ptr<CriticalSectionWrapper> crit_sect_; scoped_ptr<CriticalSectionWrapper> crit_sect_;
const int engine_id_;
const uint32_t min_bitrate_bps_; const uint32_t min_bitrate_bps_;
RateControlType rate_control_type_; RateControlType rate_control_type_;
scoped_ptr<RemoteBitrateEstimator> rbe_; scoped_ptr<RemoteBitrateEstimator> rbe_;
@ -153,8 +150,7 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator {
}; };
} // namespace } // namespace
ChannelGroup::ChannelGroup(int engine_id, ChannelGroup::ChannelGroup(ProcessThread* process_thread,
ProcessThread* process_thread,
const Config* config) const Config* config)
: remb_(new VieRemb()), : remb_(new VieRemb()),
bitrate_controller_( bitrate_controller_(
@ -172,8 +168,7 @@ ChannelGroup::ChannelGroup(int engine_id,
assert(config_); // Must have a valid config pointer here. assert(config_); // Must have a valid config pointer here.
remote_bitrate_estimator_.reset( remote_bitrate_estimator_.reset(
new WrappingBitrateEstimator(engine_id, new WrappingBitrateEstimator(remb_.get(),
remb_.get(),
Clock::GetRealTimeClock(), Clock::GetRealTimeClock(),
*config_)); *config_));

3
webrtc/video_engine/vie_channel_group.h
View File

@ -31,8 +31,7 @@ class VieRemb;
// group are assumed to send/receive data to the same end-point. // group are assumed to send/receive data to the same end-point.
class ChannelGroup { class ChannelGroup {
public: public:
ChannelGroup(int engine_id, ProcessThread* process_thread, ChannelGroup(ProcessThread* process_thread, const Config* config);
const Config* config);
~ChannelGroup(); ~ChannelGroup();
void AddChannel(int channel_id); void AddChannel(int channel_id);

2
webrtc/video_engine/vie_channel_manager.cc
View File

@ -85,7 +85,7 @@ int ViEChannelManager::CreateChannel(int* channel_id,
} }
// Create a new channel group and add this channel. // Create a new channel group and add this channel.
ChannelGroup* group = new ChannelGroup(engine_id_, module_process_thread_, ChannelGroup* group = new ChannelGroup(module_process_thread_,
channel_group_config); channel_group_config);
BitrateController* bitrate_controller = group->GetBitrateController(); BitrateController* bitrate_controller = group->GetBitrateController();
ViEEncoder* vie_encoder = new ViEEncoder(engine_id_, new_channel_id, ViEEncoder* vie_encoder = new ViEEncoder(engine_id_, new_channel_id,