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

Dynamic resolution change for VP8 HW encode.

Browse Source 
Off by default for now.

BUG=
R=glaznev@webrtc.org, stefan@webrtc.org
TBR=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/45849004

Cr-Commit-Position: refs/heads/master@{#9045}
This commit is contained in:
jackychen
2015-04-21 15:30:11 -07:00
parent 5464a6e548
commit 61b4d518af
17 changed files with 222 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
webrtc/modules/video_coding/utility/quality_scaler.cc
View File

@ -7,8 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
namespace webrtc {
@ -16,25 +15,41 @@ static const int kMinFps = 10;
static const int kMeasureSeconds = 5;
static const int kFramedropPercentThreshold = 60;
static const int kLowQpThresholdDenominator = 3;
static const double kFramesizeFlucThreshold = 0.11;
QualityScaler::QualityScaler()
: num_samples_(0), low_qp_threshold_(-1), downscale_shift_(0) {
: num_samples_(0), low_qp_threshold_(-1), downscale_shift_(0),
min_width_(0), min_height_(0) {
}
void QualityScaler::Init(int max_qp) {
ClearSamples();
downscale_shift_ = 0;
low_qp_threshold_ = max_qp / kLowQpThresholdDenominator ;
low_qp_threshold_ = max_qp / kLowQpThresholdDenominator;
}
void QualityScaler::SetMinResolution(int min_width, int min_height) {
min_width_ = min_width;
min_height_ = min_height;
}
// TODO(jackychen): target_framesize should be calculated from average bitrate
// in the measured period of time.
// Report framerate(fps) and target_bitrate(kbit/s) to estimate # of samples
// and get target_framesize_.
void QualityScaler::ReportFramerate(int framerate) {
num_samples_ = static_cast<size_t>(
kMeasureSeconds * (framerate < kMinFps ? kMinFps : framerate));
}
void QualityScaler::ReportEncodedFrame(int qp) {
average_qp_.AddSample(qp);
void QualityScaler::ReportNormalizedQP(int qp) {
framedrop_percent_.AddSample(0);
frame_quality_.AddSample(static_cast<double>(qp) / low_qp_threshold_);
}
void QualityScaler::ReportNormalizedFrameSizeFluctuation(
double framesize_deviation) {
framedrop_percent_.AddSample(0);
frame_quality_.AddSample(framesize_deviation / kFramesizeFlucThreshold);
}
void QualityScaler::ReportDroppedFrame() {
@ -43,23 +58,25 @@ void QualityScaler::ReportDroppedFrame() {
QualityScaler::Resolution QualityScaler::GetScaledResolution(
const I420VideoFrame& frame) {
// Both of these should be set through InitEncode -> Should be set by now.
// Should be set through InitEncode -> Should be set by now.
assert(low_qp_threshold_ >= 0);
assert(num_samples_ > 0);
// Update scale factor.
int avg;
if (framedrop_percent_.GetAverage(num_samples_, &avg) &&
avg >= kFramedropPercentThreshold) {
AdjustScale(false);
} else if (average_qp_.GetAverage(num_samples_, &avg) &&
avg <= low_qp_threshold_) {
AdjustScale(true);
}
Resolution res;
res.width = frame.width();
res.height = frame.height();
// Update scale factor.
int avg_drop;
double avg_quality;
if (framedrop_percent_.GetAverage(num_samples_, &avg_drop) &&
avg_drop >= kFramedropPercentThreshold) {
AdjustScale(false);
} else if (frame_quality_.GetAverage(num_samples_, &avg_quality) &&
avg_quality <= 1.0) {
AdjustScale(true);
}
assert(downscale_shift_ >= 0);
for (int shift = downscale_shift_;
shift > 0 && res.width > 1 && res.height > 1;
@ -68,6 +85,12 @@ QualityScaler::Resolution QualityScaler::GetScaledResolution(
res.height >>= 1;
}
// Set this limitation for VP8 HW encoder to avoid crash.
if (min_width_ > 0 && res.width * res.height < min_width_ * min_height_) {
res.width = min_width_;
res.height = min_height_;
}
return res;
}
@ -94,37 +117,9 @@ const I420VideoFrame& QualityScaler::GetScaledFrame(
return scaled_frame_;
}
QualityScaler::MovingAverage::MovingAverage() : sum_(0) {
}
void QualityScaler::MovingAverage::AddSample(int sample) {
samples_.push_back(sample);
sum_ += sample;
}
bool QualityScaler::MovingAverage::GetAverage(size_t num_samples, int* avg) {
assert(num_samples > 0);
if (num_samples > samples_.size())
return false;
// Remove old samples.
while (num_samples < samples_.size()) {
sum_ -= samples_.front();
samples_.pop_front();
}
*avg = sum_ / static_cast<int>(num_samples);
return true;
}
void QualityScaler::MovingAverage::Reset() {
sum_ = 0;
samples_.clear();
}
void QualityScaler::ClearSamples() {
average_qp_.Reset();
framedrop_percent_.Reset();
frame_quality_.Reset();
}
void QualityScaler::AdjustScale(bool up) {