Remove QualityScaler framerate reduction.

Framerate-reduction code is disabled on all platforms, and this code
adds complexity. It's necessary to react fast, especially on mobile
platforms or other bad network conditions and framerate reduction adds
another step between HD and QVGA.

BUG=webrtc:5678, webrtc:5830
R=jackychen@webrtc.org, mflodman@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#12503}
This commit is contained in:
Peter Boström
2016-04-26 13:37:10 +02:00
parent d486dc1bd7
commit 3c6eac2860
19 changed files with 15 additions and 228 deletions

View File

@ -71,15 +71,6 @@ int32_t VPMFramePreprocessor::SetTargetResolution(uint32_t width,
return VPM_OK;
}
void VPMFramePreprocessor::SetTargetFramerate(int frame_rate) {
if (frame_rate == -1) {
vd_->EnableTemporalDecimation(false);
} else {
vd_->EnableTemporalDecimation(true);
vd_->SetTargetFramerate(frame_rate);
}
}
void VPMFramePreprocessor::UpdateIncomingframe_rate() {
vd_->UpdateIncomingframe_rate();
}

View File

@ -46,9 +46,6 @@ class VPMFramePreprocessor {
uint32_t height,
uint32_t frame_rate);
// Set target frame rate.
void SetTargetFramerate(int frame_rate);
// Update incoming frame rate/dimension.
void UpdateIncomingframe_rate();

View File

@ -79,8 +79,6 @@ class VideoProcessing {
uint32_t height,
uint32_t frame_rate) = 0;
virtual void SetTargetFramerate(int frame_rate) = 0;
virtual uint32_t GetDecimatedFrameRate() = 0;
virtual uint32_t GetDecimatedWidth() const = 0;
virtual uint32_t GetDecimatedHeight() const = 0;

View File

@ -135,11 +135,6 @@ int32_t VideoProcessingImpl::SetTargetResolution(uint32_t width,
return frame_pre_processor_.SetTargetResolution(width, height, frame_rate);
}
void VideoProcessingImpl::SetTargetFramerate(int frame_rate) {
rtc::CritScope cs(&mutex_);
frame_pre_processor_.SetTargetFramerate(frame_rate);
}
uint32_t VideoProcessingImpl::GetDecimatedFrameRate() {
rtc::CritScope cs(&mutex_);
return frame_pre_processor_.GetDecimatedFrameRate();

View File

@ -35,7 +35,6 @@ class VideoProcessingImpl : public VideoProcessing {
int32_t SetTargetResolution(uint32_t width,
uint32_t height,
uint32_t frame_rate) override;
void SetTargetFramerate(int frame_rate) override;
uint32_t GetDecimatedFrameRate() override;
uint32_t GetDecimatedWidth() const override;
uint32_t GetDecimatedHeight() const override;