| Index: content/browser/renderer_host/media/video_capture_controller.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
|
| index f35ea57504c98675fb2c2f7eb21b1871d1a57f82..8ff97bdf767d93c8821ef401ec33b229dfc31348 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.cc
|
| @@ -469,23 +469,29 @@ void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedData(
|
| NOTREACHED();
|
| }
|
|
|
| - libyuv::ConvertToI420(data,
|
| - length,
|
| - yplane,
|
| - yplane_stride,
|
| - uplane,
|
| - uv_plane_stride,
|
| - vplane,
|
| - uv_plane_stride,
|
| - crop_x,
|
| - crop_y,
|
| - frame_format.frame_size.width(),
|
| - (flip ? -frame_format.frame_size.height() :
|
| + if (libyuv::ConvertToI420(data,
|
| + length,
|
| + yplane,
|
| + yplane_stride,
|
| + uplane,
|
| + uv_plane_stride,
|
| + vplane,
|
| + uv_plane_stride,
|
| + crop_x,
|
| + crop_y,
|
| + frame_format.frame_size.width(),
|
| + (flip ? -frame_format.frame_size.height() :
|
| frame_format.frame_size.height()),
|
| - new_unrotated_width,
|
| - new_unrotated_height,
|
| - rotation_mode,
|
| - origin_colorspace);
|
| + new_unrotated_width,
|
| + new_unrotated_height,
|
| + rotation_mode,
|
| + origin_colorspace) != 0) {
|
| + DLOG(WARNING) << "Failed to convert buffer from"
|
| + << media::VideoCaptureFormat::PixelFormatToString(
|
| + frame_format.pixel_format)
|
| + << "to I420.";
|
| + return;
|
| + }
|
| scoped_refptr<media::VideoFrame> frame =
|
| media::VideoFrame::WrapExternalPackedMemory(
|
| media::VideoFrame::I420,
|
|
|