Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
index 48ed02ae351443313369e2c4d038e38131a9386b..43e135a2aed7ece510711bbf18c0a9e2f0500a81 100644 |
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
@@ -579,8 +579,13 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, |
} |
rps_.Init(); |
+ // TODO(pbos): Investigate whether a bad-QP threshold makes sense for software |
+ // VP8. |
+ // TODO(pbos): Investigate turning on input-framerate reduction for software |
+ // VP8. |
stefan-webrtc
2015/09/25 14:18:02
Don't need these comemnts. libvpx handles this
pbos-webrtc
2015/09/25 14:24:08
Done.
|
+ const int kDisabledBadQpThreshold = 64; |
quality_scaler_.Init(codec_.qpMax / QualityScaler::kDefaultLowQpDenominator, |
- false); |
+ kDisabledBadQpThreshold, false); |
quality_scaler_.ReportFramerate(codec_.maxFramerate); |
return InitAndSetControlSettings(); |
@@ -891,11 +896,6 @@ int VP8EncoderImpl::Encode(const VideoFrame& frame, |
int VP8EncoderImpl::UpdateCodecFrameSize(const VideoFrame& input_image) { |
codec_.width = input_image.width(); |
codec_.height = input_image.height(); |
- if (codec_.numberOfSimulcastStreams <= 1) { |
- // For now scaling is only used for single-layer streams. |
- codec_.simulcastStream[0].width = input_image.width(); |
- codec_.simulcastStream[0].height = input_image.height(); |
stefan-webrtc
2015/09/25 14:18:02
w00t?
pbos-webrtc
2015/09/25 14:24:08
Oops, I think I tested some locally. Don't remembe
|
- } |
// Update the cpu_speed setting for resolution change. |
vpx_codec_control(&(encoders_[0]), |
VP8E_SET_CPUUSED, |