Removed vie_defines.h

webrtc/video_engine/vie_channel.cc

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..0b4d504a043915196f87dd5d513927ae5cd9f65b 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -34,13 +34,15 @@
 #include "webrtc/video_engine/call_stats.h"
 #include "webrtc/video_engine/payload_router.h"
 #include "webrtc/video_engine/report_block_stats.h"
-#include "webrtc/video_engine/vie_defines.h"
 
 namespace webrtc {
 
 const int kMaxDecodeWaitTimeMs = 50;
 static const int kMaxTargetDelayMs = 10000;
 static const float kMaxIncompleteTimeMultiplier = 3.5f;
+const int kMinSendSidePacketHistorySize = 600;
+const int kMaxPacketAgeToNack = 450;
+const int kMaxNackListSize = 250;
 
 // Helper class receiving statistics callbacks.
 class ChannelStatsObserver : public CallStatsObserver {
@@ -109,7 +111,7 @@ ViEChannel::ViEChannel(uint32_t number_of_cores,
       packet_router_(packet_router),
       bandwidth_observer_(bandwidth_observer),
       transport_feedback_observer_(transport_feedback_observer),
-      nack_history_size_sender_(kSendSidePacketHistorySize),
+      nack_history_size_sender_(kMinSendSidePacketHistorySize),
       max_nack_reordering_threshold_(kMaxPacketAgeToNack),
       pre_render_callback_(NULL),
       report_block_stats_sender_(new ReportBlockStats()),
@@ -139,6 +141,7 @@ ViEChannel::ViEChannel(uint32_t number_of_cores,
 }
 
 int32_t ViEChannel::Init() {
+  const int kDefaultRenderDelayMs = 10;

[pbos-webrtc, 2015/10/29 15:39:40]

static

[mflodman, 2015/11/06 11:38:36]

Done.

   module_process_thread_->RegisterModule(vie_receiver_.GetReceiveStatistics());
 
   // RTP/RTCP initialization.
@@ -161,7 +164,7 @@ int32_t ViEChannel::Init() {
   vcm_->RegisterFrameTypeCallback(this);
   vcm_->RegisterReceiveStatisticsCallback(this);
   vcm_->RegisterDecoderTimingCallback(this);
-  vcm_->SetRenderDelay(kViEDefaultRenderDelayMs);
+  vcm_->SetRenderDelay(kDefaultRenderDelayMs);
 
   module_process_thread_->RegisterModule(vcm_);
   module_process_thread_->RegisterModule(&vie_sync_);
@@ -562,12 +565,12 @@ int ViEChannel::SetSenderBufferingMode(int target_delay_ms) {
   }
   if (target_delay_ms == 0) {
     // Real-time mode.
-    nack_history_size_sender_ = kSendSidePacketHistorySize;
+    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_ < kSendSidePacketHistorySize) {
-      nack_history_size_sender_ = kSendSidePacketHistorySize;
+    if (nack_history_size_sender_ < kMinSendSidePacketHistorySize) {
+      nack_history_size_sender_ = kMinSendSidePacketHistorySize;
     }
   }
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)