Reason for revert: Regressed behavior is actually desirable (go down to 360p instead of producing super-bad 720p). Original issue's description: > Revert of Make QualityScaler more responsive to downgrades. (patchset #3 id:40001 of https://codereview.webrtc.org/1830593003/ ) > > 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 > > Committed: https://crrev.com/19b4fecf08e3fe215e431a260fb673553c15e569 > Cr-Commit-Position: refs/heads/master@{#12331} TBR=glaznev@webrtc.org,stefan@webrtc.org,phoglund@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:602621, webrtc:5678 Review URL: https://codereview.webrtc.org/1887493003 Cr-Commit-Position: refs/heads/master@{#12341}
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2014 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
|
|
|
|
#include "webrtc/common_video/libyuv/include/scaler.h"
|
|
#include "webrtc/modules/video_coding/utility/moving_average.h"
|
|
|
|
namespace webrtc {
|
|
class QualityScaler {
|
|
public:
|
|
static const int kDefaultLowQpDenominator;
|
|
static const int kDefaultMinDownscaleDimension;
|
|
struct Resolution {
|
|
int width;
|
|
int height;
|
|
};
|
|
|
|
QualityScaler();
|
|
void Init(int low_qp_threshold,
|
|
int high_qp_threshold,
|
|
bool use_framerate_reduction,
|
|
int initial_bitrate_kbps,
|
|
int width,
|
|
int height,
|
|
int fps);
|
|
void SetMinResolution(int min_width, int min_height);
|
|
void ReportFramerate(int framerate);
|
|
void ReportQP(int qp);
|
|
void ReportDroppedFrame();
|
|
void Reset(int framerate, int bitrate, int width, int height);
|
|
void OnEncodeFrame(const VideoFrame& frame);
|
|
Resolution GetScaledResolution() const;
|
|
const VideoFrame& GetScaledFrame(const VideoFrame& frame);
|
|
int GetTargetFramerate() const;
|
|
int downscale_shift() const { return downscale_shift_; }
|
|
|
|
private:
|
|
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_;
|
|
|
|
int framerate_;
|
|
int target_framerate_;
|
|
int low_qp_threshold_;
|
|
int high_qp_threshold_;
|
|
MovingAverage<int> framedrop_percent_;
|
|
Resolution res_;
|
|
|
|
int downscale_shift_;
|
|
int framerate_down_;
|
|
bool use_framerate_reduction_;
|
|
int min_width_;
|
|
int min_height_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
|