zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint fix for webrtc/modules/video_coding PART 1!

Browse Source 
Trying to submit all changes at once proved impossible since there were
too many changes in too many files. The changes to PRESUBMIT.py
will be uploaded in the last CL.
(original CL: https://codereview.webrtc.org/1528503003/)

BUG=webrtc:5309
TBR=mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1541803002

Cr-Commit-Position: refs/heads/master@{#11100}
This commit is contained in:
philipel
2015-12-21 03:04:49 -08:00
committed by Commit bot
parent 53805324c0
commit cce46fc108
44 changed files with 1191 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
webrtc/modules/video_coding/codec_timer.cc
View File

@ -12,118 +12,85 @@
#include <assert.h>
namespace webrtc
{
namespace webrtc {
// The first kIgnoredSampleCount samples will be ignored.
static const int32_t kIgnoredSampleCount = 5;
VCMCodecTimer::VCMCodecTimer()
:
_filteredMax(0),
_ignoredSampleCount(0),
_shortMax(0),
_history()
{
Reset();
: _filteredMax(0), _ignoredSampleCount(0), _shortMax(0), _history() {
Reset();
}
void VCMCodecTimer::Reset()
{
_filteredMax = 0;
_ignoredSampleCount = 0;
_shortMax = 0;
for (int i=0; i < MAX_HISTORY_SIZE; i++)
{
_history[i].shortMax = 0;
_history[i].timeMs = -1;
}
void VCMCodecTimer::Reset() {
_filteredMax = 0;
_ignoredSampleCount = 0;
_shortMax = 0;
for (int i = 0; i < MAX_HISTORY_SIZE; i++) {
_history[i].shortMax = 0;
_history[i].timeMs = -1;
}
}
// Update the max-value filter
void VCMCodecTimer::MaxFilter(int32_t decodeTime, int64_t nowMs)
{
if (_ignoredSampleCount >= kIgnoredSampleCount)
{
UpdateMaxHistory(decodeTime, nowMs);
ProcessHistory(nowMs);
}
else
{
_ignoredSampleCount++;
}
void VCMCodecTimer::MaxFilter(int32_t decodeTime, int64_t nowMs) {
if (_ignoredSampleCount >= kIgnoredSampleCount) {
UpdateMaxHistory(decodeTime, nowMs);
ProcessHistory(nowMs);
} else {
_ignoredSampleCount++;
}
}
void
VCMCodecTimer::UpdateMaxHistory(int32_t decodeTime, int64_t now)
{
if (_history[0].timeMs >= 0 &&
now - _history[0].timeMs < SHORT_FILTER_MS)
{
if (decodeTime > _shortMax)
{
_shortMax = decodeTime;
}
void VCMCodecTimer::UpdateMaxHistory(int32_t decodeTime, int64_t now) {
if (_history[0].timeMs >= 0 && now - _history[0].timeMs < SHORT_FILTER_MS) {
if (decodeTime > _shortMax) {
_shortMax = decodeTime;
}
} else {
// Only add a new value to the history once a second
if (_history[0].timeMs == -1) {
// First, no shift
_shortMax = decodeTime;
} else {
// Shift
for (int i = (MAX_HISTORY_SIZE - 2); i >= 0; i--) {
_history[i + 1].shortMax = _history[i].shortMax;
_history[i + 1].timeMs = _history[i].timeMs;
}
}
if (_shortMax == 0) {
_shortMax = decodeTime;
}
else
{
// Only add a new value to the history once a second
if(_history[0].timeMs == -1)
{
// First, no shift
_shortMax = decodeTime;
}
else
{
// Shift
for(int i = (MAX_HISTORY_SIZE - 2); i >= 0 ; i--)
{
_history[i+1].shortMax = _history[i].shortMax;
_history[i+1].timeMs = _history[i].timeMs;
}
}
if (_shortMax == 0)
{
_shortMax = decodeTime;
}
_history[0].shortMax = _shortMax;
_history[0].timeMs = now;
_shortMax = 0;
}
_history[0].shortMax = _shortMax;
_history[0].timeMs = now;
_shortMax = 0;
}
}
void
VCMCodecTimer::ProcessHistory(int64_t nowMs)
{
_filteredMax = _shortMax;
if (_history[0].timeMs == -1)
{
return;
void VCMCodecTimer::ProcessHistory(int64_t nowMs) {
_filteredMax = _shortMax;
if (_history[0].timeMs == -1) {
return;
}
for (int i = 0; i < MAX_HISTORY_SIZE; i++) {
if (_history[i].timeMs == -1) {
break;
}
for (int i=0; i < MAX_HISTORY_SIZE; i++)
{
if (_history[i].timeMs == -1)
{
break;
}
if (nowMs - _history[i].timeMs > MAX_HISTORY_SIZE * SHORT_FILTER_MS)
{
// This sample (and all samples after this) is too old
break;
}
if (_history[i].shortMax > _filteredMax)
{
// This sample is the largest one this far into the history
_filteredMax = _history[i].shortMax;
}
if (nowMs - _history[i].timeMs > MAX_HISTORY_SIZE * SHORT_FILTER_MS) {
// This sample (and all samples after this) is too old
break;
}
if (_history[i].shortMax > _filteredMax) {
// This sample is the largest one this far into the history
_filteredMax = _history[i].shortMax;
}
}
}
// Get the maximum observed time within a time window
int32_t VCMCodecTimer::RequiredDecodeTimeMs(FrameType /*frameType*/) const
{
return _filteredMax;
}
int32_t VCMCodecTimer::RequiredDecodeTimeMs(FrameType /*frameType*/) const {
return _filteredMax;
}
} // namespace webrtc