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

Unified Diff: webrtc/video_engine/vie_channel.cc

Issue 1421013006: Delete a chain of methods in ViE, VoE and ACM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_engine/vie_sync_module.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_channel.cc
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index 147ecb1456764e0b97d78b4cdbb771e44874c4d1..9140cf1510cbe97bd42d1f67a74f69edd812c764 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -40,7 +40,6 @@ namespace webrtc {
const int kMaxDecodeWaitTimeMs = 50;
static const int kMaxTargetDelayMs = 10000;
-static const float kMaxIncompleteTimeMultiplier = 3.5f;
// Helper class receiving statistics callbacks.
class ChannelStatsObserver : public CallStatsObserver {
@@ -575,33 +574,6 @@ int ViEChannel::SetSenderBufferingMode(int target_delay_ms) {
return 0;
}
-int ViEChannel::SetReceiverBufferingMode(int target_delay_ms) {
- if ((target_delay_ms < 0) || (target_delay_ms > kMaxTargetDelayMs)) {
- LOG(LS_ERROR) << "Invalid receive buffer delay value.";
- return -1;
- }
- int max_nack_list_size;
- int max_incomplete_time_ms;
- if (target_delay_ms == 0) {
- // Real-time mode - restore default settings.
- max_nack_reordering_threshold_ = kMaxPacketAgeToNack;
- max_nack_list_size = kMaxNackListSize;
- max_incomplete_time_ms = 0;
- } else {
- max_nack_list_size = 3 * GetRequiredNackListSize(target_delay_ms) / 4;
- max_nack_reordering_threshold_ = max_nack_list_size;
- // Calculate the max incomplete time and round to int.
- max_incomplete_time_ms = static_cast<int>(kMaxIncompleteTimeMultiplier *
- target_delay_ms + 0.5f);
- }
- vcm_->SetNackSettings(max_nack_list_size, max_nack_reordering_threshold_,
- max_incomplete_time_ms);
- vcm_->SetMinReceiverDelay(target_delay_ms);
- if (vie_sync_.SetTargetBufferingDelay(target_delay_ms) < 0)
- return -1;
- 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.
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_engine/vie_sync_module.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698