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 4969069788949d402eebd287fdbe95439571d972..beb0ac4a42dc9127ead7c23bf1db73755cb0d5dd 100644 |
| --- a/webrtc/modules/video_coding/video_sender.cc |
| +++ b/webrtc/modules/video_coding/video_sender.cc |
| @@ -300,7 +300,10 @@ int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame, |
| return VCM_PARAMETER_ERROR; |
| } |
| VideoFrame converted_frame = videoFrame; |
| - if (converted_frame.native_handle() && !_encoder->SupportsNativeHandle()) { |
| + // TODO(nisse): Is it allowed to have video_frame_buffer() return a |
|
perkj_webrtc
2016/04/13 05:44:08
I don't think video_frame_buffer() ever should be
nisse-webrtc
2016/04/13 07:28:50
Good. Should I add some RTC_CHECKS to that effect
|
| + // nullptr here? |
| + if (converted_frame.video_frame_buffer()->native_handle() && |
| + !_encoder->SupportsNativeHandle()) { |
| // This module only supports software encoding. |
| // TODO(pbos): Offload conversion from the encoder thread. |
| converted_frame = converted_frame.ConvertNativeToI420Frame(); |