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

Get rid of some unnecessary copying when sending REMBs.

Browse Source 
BUG=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3947 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
solenberg@webrtc.org 2013-05-03 09:22:14 +00:00
parent d5726a1286
commit 2580bc4c30
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/video_engine/vie_remb.cc
View File

@ -122,10 +122,6 @@ void VieRemb::OnReceiveBitrateChanged(std::vector<unsigned int>* ssrcs,
}
}
bitrate_ = bitrate;
// TODO(holmer): Remove |ssrcs_| from this class as the REMB is produced
// immediately upon a call to this function.
ssrcs_.resize(ssrcs->size());
std::copy(ssrcs->begin(), ssrcs->end(), ssrcs_.begin());
// Calculate total receive bitrate estimate.
int64_t now = TickTime::MillisecondTimestamp();
@ -136,7 +132,7 @@ void VieRemb::OnReceiveBitrateChanged(std::vector<unsigned int>* ssrcs,
}
last_remb_time_ = now;
if (ssrcs_.empty() || receive_modules_.empty()) {
if (ssrcs->empty() || receive_modules_.empty()) {
list_crit_->Leave();
return;
}
@ -154,19 +150,13 @@ void VieRemb::OnReceiveBitrateChanged(std::vector<unsigned int>* ssrcs,
if (last_send_bitrate_ < kRembMinimumBitrateKbps) {
last_send_bitrate_ = kRembMinimumBitrateKbps;
}
// Copy SSRCs to avoid race conditions.
int ssrcs_length = ssrcs_.size();
unsigned int* ssrcs_copy = new unsigned int[ssrcs_length];
for (int i = 0; i < ssrcs_length; ++i) {
ssrcs_copy[i] = ssrcs_[i];
}
list_crit_->Leave();
if (sender) {
// TODO(holmer): Change RTP module API to take a vector pointer.
sender->SetREMBData(bitrate_, ssrcs_length, ssrcs_copy);
sender->SetREMBData(bitrate_, ssrcs->size(), &(*ssrcs)[0]);
}
delete [] ssrcs_copy;
}
} // namespace webrtc

1
webrtc/video_engine/vie_remb.h
View File

@ -71,7 +71,6 @@ class VieRemb : public RemoteBitrateObserver {
// The last bitrate update.
unsigned int bitrate_;
std::vector<unsigned int> ssrcs_;
};
} // namespace webrtc