Removed vie_defines.h

webrtc/video_engine/vie_encoder.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #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 {
 
 // Margin on when we pause the encoder when the pacing buffer overflows relative
 // to the configured buffer delay.
 static const float kEncoderPausePacerMargin = 2.0f;
 
 // Don't stop the encoder unless the delay is above this configured value.
 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,
     size_t number_of_streams) {
   if (number_of_streams == 0) {
     std::vector<uint32_t> stream_bitrates(1, 0);
     stream_bitrates[0] = total_bitrate;
     return stream_bitrates;
   }
   std::vector<uint32_t> stream_bitrates(number_of_streams, 0);
@@ skipping 534 matching lines @@
                         << ssrc_streams_.size();
       return;
     }
     std::map<unsigned int, int64_t>::iterator time_it =
         time_last_intra_request_ms_.find(ssrc);
     if (time_it == time_last_intra_request_ms_.end()) {
       time_last_intra_request_ms_[ssrc] = 0;
     }
 
     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;
     idx = stream_it->second;
   }
   // Release the critsect before triggering key frame.
   vcm_->IntraFrameRequest(idx);
 }
 
 void ViEEncoder::OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc) {
@@ skipping 100 matching lines @@
     const uint32_t width,
     const uint32_t height) {
   return vpm_->SetTargetResolution(width, height, frame_rate);
 }
 
 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
   vpm_->SetTargetFramerate(frame_rate);
 }
 
 }  // namespace webrtc