Removed vie_defines.h

webrtc/video_engine/vie_encoder.cc

Index: webrtc/video_engine/vie_encoder.cc
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index f705bc26c2ebecc062e2db341edbd350ee0fbc4b..229900a85396418a435866a3dc945a79b1a88e84 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -33,7 +33,6 @@
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video_engine/payload_router.h"
-#include "webrtc/video_engine/vie_defines.h"
 
 namespace webrtc {
 
@@ -46,6 +45,8 @@ static const int kMinPacingDelayMs = 200;
 
 static const float kStopPaddingThresholdMs = 2000;
 
+const int kMinKeyFrameRequestIntervalMs = 300;

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

static

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

Done.

+
 std::vector<uint32_t> AllocateStreamBitrates(
     uint32_t total_bitrate,
     const SimulcastStream* stream_configs,
@@ -600,7 +601,8 @@ void ViEEncoder::OnReceivedIntraFrameRequest(uint32_t ssrc) {
     }
 
     int64_t now = TickTime::MillisecondTimestamp();
-    if (time_last_intra_request_ms_[ssrc] + kViEMinKeyRequestIntervalMs > now) {
+    if (time_last_intra_request_ms_[ssrc] + kMinKeyFrameRequestIntervalMs
+        > now) {
       return;
     }
     time_last_intra_request_ms_[ssrc] = now;