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

Revert of Make QualityScaler more responsive to downgrades. (patchset #3 id:40001 of https://codereview.webrtc.org/1830593003/ )

Browse Source 
Reason for revert:
Speculative revert: want to see if this causes the regression in https://crbug.com/602621

Original issue's description:
> Make QualityScaler more responsive to downgrades.
>
> Permits going from HD to QVGA in 6 seconds instead of 10. Also adds
> windows for going up quickly in the beginning of a call (before any
> downscaling happens due to bad quality).
>
> BUG=webrtc:5678
> R=glaznev@webrtc.org, stefan@webrtc.org
>
> Committed: https://crrev.com/85829fd90cc4e7a91c9857921b19e8fc126aeb60
> Cr-Commit-Position: refs/heads/master@{#12219}

TBR=glaznev@webrtc.org,stefan@webrtc.org,pbos@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5678
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#12331}
This commit is contained in:
phoglund
2016-04-12 09:05:58 -07:00
committed by Commit bot
parent 164bc4bbd3
commit 19b4fecf08
5 changed files with 43 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/video_coding/utility/quality_scaler.h
View File

@ -30,8 +30,7 @@ class QualityScaler {
bool use_framerate_reduction,
int initial_bitrate_kbps,
int width,
int height,
int fps);
int height);
void SetMinResolution(int min_width, int min_height);
void ReportFramerate(int framerate);
void ReportQP(int qp);
@ -47,22 +46,17 @@ class QualityScaler {
void AdjustScale(bool up);
void UpdateTargetResolution(int frame_width, int frame_height);
void ClearSamples();
void UpdateSampleCounts();
Scaler scaler_;
VideoFrame scaled_frame_;
size_t num_samples_downscale_;
size_t num_samples_upscale_;
int measure_seconds_upscale_;
MovingAverage<int> average_qp_upscale_;
MovingAverage<int> average_qp_downscale_;
size_t num_samples_;
int framerate_;
int target_framerate_;
int low_qp_threshold_;
int high_qp_threshold_;
MovingAverage<int> framedrop_percent_;
MovingAverage<int> average_qp_;
Resolution res_;
int downscale_shift_;