Chromium Code Reviews| Index: webrtc/video/video_send_stream.cc |
| diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc |
| index 32101871121999170f5a8281039db60d3cd7a5cc..10fd0d7829339f76bd52e1f4cd434e778ef7b81e 100644 |
| --- a/webrtc/video/video_send_stream.cc |
| +++ b/webrtc/video/video_send_stream.cc |
| @@ -397,6 +397,7 @@ VideoSendStream::VideoSendStream( |
| encoder_wakeup_event_(false, false), |
| stop_encoder_thread_(0), |
| encoder_max_bitrate_bps_(0), |
| + encoder_target_rate_bps_(0), |
| state_(State::kStopped), |
| overuse_detector_( |
| Clock::GetRealTimeClock(), |
| @@ -527,6 +528,7 @@ bool VideoSendStream::DeliverRtcp(const uint8_t* packet, size_t length) { |
| } |
| void VideoSendStream::Start() { |
| + LOG(LS_INFO) << "VideoSendStream::Start"; |
| if (payload_router_.active()) |
| return; |
| TRACE_EVENT_INSTANT0("webrtc", "VideoSendStream::Start"); |
| @@ -539,6 +541,7 @@ void VideoSendStream::Start() { |
| } |
| void VideoSendStream::Stop() { |
| + LOG(LS_INFO) << "VideoSendStream::Stop"; |
| if (!payload_router_.active()) |
| return; |
| TRACE_EVENT_INSTANT0("webrtc", "VideoSendStream::Stop"); |
| @@ -895,6 +898,13 @@ uint32_t VideoSendStream::OnBitrateUpdated(uint32_t bitrate_bps, |
| rtc::CritScope lock(&encoder_settings_crit_); |
| encoder_target_rate_bps = |
| std::min(encoder_max_bitrate_bps_, encoder_target_rate_bps); |
| + if ((encoder_target_rate_bps_ == 0 && encoder_target_rate_bps > 0) || |
| + (encoder_target_rate_bps_ > 0 && encoder_target_rate_bps == 0)) { |
| + LOG(LS_INFO) |
| + << "OnBitrateUpdated: Encoder target state changed, target bitrate " |
|
stefan-webrtc
2016/07/06 14:21:32
"Encoder target rate changed: xxx bps" instead?
perkj_webrtc
2016/07/06 14:30:06
Encoder state changed: target... ? This will only
stefan-webrtc
2016/07/06 14:33:58
Acknowledged.
|
| + << encoder_target_rate_bps << "bps."; |
|
stefan-webrtc
2016/07/06 14:21:32
Space before bps
perkj_webrtc
2016/07/06 14:30:06
Done.
|
| + } |
| + encoder_target_rate_bps_ = encoder_target_rate_bps; |
| } |
| vie_encoder_.OnBitrateUpdated(encoder_target_rate_bps, fraction_loss, rtt); |
| stats_proxy_.OnSetEncoderTargetRate(encoder_target_rate_bps); |