Index: talk/media/webrtc/webrtcvideoengine2.cc |
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc |
index 7e2c1d41518c90bd35d83a3c8a2c6894dd9acf5e..597ec7d2966811983f5ef64d3f8ec21aba546d06 100644 |
--- a/talk/media/webrtc/webrtcvideoengine2.cc |
+++ b/talk/media/webrtc/webrtcvideoengine2.cc |
@@ -789,7 +789,6 @@ WebRtcVideoChannel2::WebRtcVideoChannel2( |
options_.SetAll(options); |
options_.cpu_overuse_detection.Get(&signal_cpu_adaptation_); |
webrtc::Call::Config config; |
- config.overuse_callback = this; |
if (voice_engine != NULL) { |
config.voice_engine = voice_engine->voe()->engine(); |
} |
@@ -1117,10 +1116,13 @@ bool WebRtcVideoChannel2::AddSendStream(const StreamParams& sp) { |
for (uint32 used_ssrc : sp.ssrcs) |
send_ssrcs_.insert(used_ssrc); |
+ webrtc::VideoSendStream::Config config(this); |
+ config.overuse_callback = this; |
pbos-webrtc
2015/09/03 20:36:39
Can you set WebRtcVideoSendStream::this inside the
the sun
2015/09/03 20:54:55
I'm just changing the API and introducing the poss
|
+ |
WebRtcVideoSendStream* stream = |
new WebRtcVideoSendStream(call_.get(), |
sp, |
- webrtc::VideoSendStream::Config(this), |
+ config, |
external_encoder_factory_, |
options_, |
bitrate_config_.max_bitrate_bps, |