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

Unified Diff: webrtc/video_engine/vie_encoder.cc

Issue 1411573007: Removed vie_defines.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 1 month 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_encoder.h ('k') | webrtc/video_engine/vie_receiver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_encoder.cc
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index 96ed2f9afd425664889bc374b46594c844ddee4b..fad58439afeb44dface5fc8efa98de0faccd04e6 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;
+static const int kMinKeyFrameRequestIntervalMs = 300;
+
std::vector<uint32_t> AllocateStreamBitrates(
uint32_t total_bitrate,
const SimulcastStream* stream_configs,
@@ -587,7 +588,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;
« no previous file with comments | « webrtc/video_engine/vie_encoder.h ('k') | webrtc/video_engine/vie_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698