zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nuke SetSenderBufferingMode.

Browse Source 
Removes dead code in both ViEChannel and ViEEncoder that is no longer
invoked.

BUG=webrtc:5494
R=danilchap@webrtc.org

Review URL: https://codereview.webrtc.org/1715823002 .

Cr-Commit-Position: refs/heads/master@{#11690}
This commit is contained in:
Peter Boström
2016-02-19 19:58:34 +01:00
parent da9ae0c23f
commit 7254890b28
4 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/video/vie_channel.cc
View File

@ -35,7 +35,6 @@
namespace webrtc {
static const int kMaxTargetDelayMs = 10000;
const int kMinSendSidePacketHistorySize = 600;
const int kMaxPacketAgeToNack = 450;
const int kMaxNackListSize = 250;
@ -467,26 +466,6 @@ bool ViEChannel::IsSendingFecEnabled() {
return false;
}
int ViEChannel::SetSenderBufferingMode(int target_delay_ms) {
if ((target_delay_ms < 0) || (target_delay_ms > kMaxTargetDelayMs)) {
LOG(LS_ERROR) << "Invalid send buffer value.";
return -1;
}
if (target_delay_ms == 0) {
// Real-time mode.
nack_history_size_sender_ = kMinSendSidePacketHistorySize;
} else {
nack_history_size_sender_ = GetRequiredNackListSize(target_delay_ms);
// Don't allow a number lower than the default value.
if (nack_history_size_sender_ < kMinSendSidePacketHistorySize) {
nack_history_size_sender_ = kMinSendSidePacketHistorySize;
}
}
for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_);
return 0;
}
int ViEChannel::GetRequiredNackListSize(int target_delay_ms) {
// The max size of the nack list should be large enough to accommodate the
// the number of packets (frames) resulting from the increased delay.

1
webrtc/video/vie_channel.h
View File

@ -90,7 +90,6 @@ class ViEChannel : public VCMFrameTypeCallback,
int payload_type_red,
int payload_type_fec);
bool IsSendingFecEnabled();
int SetSenderBufferingMode(int target_delay_ms);
int SetSendTimestampOffsetStatus(bool enable, int id);
int SetSendAbsoluteSendTimeStatus(bool enable, int id);
int SetSendVideoRotationStatus(bool enable, int id);

16
webrtc/video/vie_encoder.cc
View File

@ -421,22 +421,6 @@ void ViEEncoder::SetProtectionMethod(bool nack, bool fec) {
vcm_->SetVideoProtection(protection_mode, true);
}
void ViEEncoder::SetSenderBufferingMode(int target_delay_ms) {
{
rtc::CritScope lock(&data_cs_);
target_delay_ms_ = target_delay_ms;
}
if (target_delay_ms > 0) {
// Disable external frame-droppers.
vcm_->EnableFrameDropper(false);
vp_->EnableTemporalDecimation(false);
} else {
// Real-time mode - enable frame droppers.
vp_->EnableTemporalDecimation(true);
vcm_->EnableFrameDropper(true);
}
}
void ViEEncoder::OnSetRates(uint32_t bitrate_bps, int framerate) {
if (stats_proxy_)
stats_proxy_->OnSetRates(bitrate_bps, framerate);

3
webrtc/video/vie_encoder.h
View File

@ -94,9 +94,6 @@ class ViEEncoder : public RtcpIntraFrameObserver,
// this class and set it on construction there.
void SetProtectionMethod(bool nack, bool fec);
// Buffering mode.
void SetSenderBufferingMode(int target_delay_ms);
// Implements VideoEncoderRateObserver.
void OnSetRates(uint32_t bitrate_bps, int framerate) override;