| Index: talk/media/webrtc/webrtcvideoengine2.cc
|
| diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
|
| index 55c07426d090598877f1c4a6656d5936f20d5c99..e6bd294bc74e70f392cdd9f8a2486f8bf352a1fb 100644
|
| --- a/talk/media/webrtc/webrtcvideoengine2.cc
|
| +++ b/talk/media/webrtc/webrtcvideoengine2.cc
|
| @@ -2452,9 +2452,8 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::RenderFrame(
|
| return;
|
| }
|
|
|
| - if (frame.width() != last_width_ || frame.height() != last_height_) {
|
| - SetSize(frame.width(), frame.height());
|
| - }
|
| + last_width_ = frame.width();
|
| + last_height_ = frame.height();
|
|
|
| const WebRtcVideoFrame render_frame(
|
| frame.video_frame_buffer(),
|
| @@ -2479,9 +2478,6 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRenderer(
|
| cricket::VideoRenderer* renderer) {
|
| rtc::CritScope crit(&renderer_lock_);
|
| renderer_ = renderer;
|
| - if (renderer_ != NULL && last_width_ != -1) {
|
| - SetSize(last_width_, last_height_);
|
| - }
|
| }
|
|
|
| VideoRenderer* WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetRenderer() {
|
| @@ -2491,16 +2487,6 @@ VideoRenderer* WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetRenderer() {
|
| return renderer_;
|
| }
|
|
|
| -void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSize(int width,
|
| - int height) {
|
| - rtc::CritScope crit(&renderer_lock_);
|
| - if (!renderer_->SetSize(width, height, 0)) {
|
| - LOG(LS_ERROR) << "Could not set renderer size.";
|
| - }
|
| - last_width_ = width;
|
| - last_height_ = height;
|
| -}
|
| -
|
| std::string
|
| WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetCodecNameFromPayloadType(
|
| int payload_type) {
|
|
|