generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recreate VideoStreams when setting resolution.

Browse Source 
Instead of just changing resolution on the last stream streams are
reallocated to make sure that all streams are updated to match the
new input resolution.

R=pthatcher@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/29469004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7197 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-09-16 16:33:13 +00:00
parent 88e85ad64d
commit cddd17c0f8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -1563,15 +1563,19 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetDimensions(
return; return;
} }
// TODO(pbos): Fix me, this only affects the last stream!
parameters_.video_streams.back().width = width;
parameters_.video_streams.back().height = height;
void* encoder_settings = encoder_factory_->CreateVideoEncoderSettings( void* encoder_settings = encoder_factory_->CreateVideoEncoderSettings(
codec_settings.codec, parameters_.options); codec_settings.codec, parameters_.options);
VideoCodec codec = codec_settings.codec;
codec.width = width;
codec.height = height;
std::vector<webrtc::VideoStream> video_streams =
encoder_factory_->CreateVideoStreams(codec,
parameters_.options,
parameters_.config.rtp.ssrcs.size());
bool stream_reconfigured = stream_->ReconfigureVideoEncoder( bool stream_reconfigured = stream_->ReconfigureVideoEncoder(
parameters_.video_streams, encoder_settings); video_streams, encoder_settings);
encoder_factory_->DestroyVideoEncoderSettings(codec_settings.codec, encoder_factory_->DestroyVideoEncoderSettings(codec_settings.codec,
encoder_settings); encoder_settings);
@ -1581,6 +1585,8 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetDimensions(
<< width << "x" << height; << width << "x" << height;
return; return;
} }
parameters_.video_streams = video_streams;
} }
void WebRtcVideoChannel2::WebRtcVideoSendStream::Start() { void WebRtcVideoChannel2::WebRtcVideoSendStream::Start() {