Chromium Code Reviews| Index: webrtc/modules/video_coding/video_sender.cc |
| diff --git a/webrtc/modules/video_coding/video_sender.cc b/webrtc/modules/video_coding/video_sender.cc |
| index b9c5ea547a40865cc18e1eb49c657504c22c31cc..7953ebe2fb3619f5f7e210364f2db4654daa8d8a 100644 |
| --- a/webrtc/modules/video_coding/video_sender.cc |
| +++ b/webrtc/modules/video_coding/video_sender.cc |
| @@ -288,9 +288,16 @@ int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame, |
| !_encoder->SupportsNativeHandle()) { |
| // This module only supports software encoding. |
| // TODO(pbos): Offload conversion from the encoder thread. |
| - converted_frame = converted_frame.ConvertNativeToI420Frame(); |
| - RTC_CHECK(!converted_frame.IsZeroSize()) |
| + rtc::scoped_refptr<VideoFrameBuffer> converted_buffer( |
| + converted_frame.video_frame_buffer()->NativeToI420Buffer()); |
| + |
| + RTC_CHECK(converted_buffer) |
|
perkj_webrtc
2016/06/15 20:43:12
in b/28636240 we are asked to replace this check w
nisse-webrtc
2016/06/16 07:22:28
Not sure what to do instead. For now, log a warnin
|
| << "Frame conversion failed, won't be able to encode frame."; |
| + |
| + converted_frame = VideoFrame(converted_buffer, |
| + converted_frame.timestamp(), |
| + converted_frame.render_time_ms(), |
| + converted_frame.rotation()); |
| } |
| int32_t ret = |
| _encoder->Encode(converted_frame, codecSpecificInfo, next_frame_types); |