| Index: content/browser/renderer_host/media/video_capture_texture_wrapper.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
|
| index e02b6fc92347ff5c38e676e1bcb20dd526156539..773de53f4b83132f03c9eb8a8b2b84948dfdcd31 100644
|
| --- a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc
|
| @@ -283,11 +283,17 @@ void VideoCaptureTextureWrapper::TextureWrapperDelegate::OnIncomingCapturedData(
|
| gpu_memory_buffers_.pop();
|
| DCHECK(gpu_memory_buffer.get());
|
|
|
| - uint8* mapped_buffer = static_cast<uint8*>(gpu_memory_buffer->Map());
|
| + void* data = NULL;
|
| + bool rv = gpu_memory_buffer->Map(&data);
|
| + DCHECK(rv);
|
| + uint32 stride;
|
| + gpu_memory_buffer->GetStride(&stride);
|
| +
|
| + uint8* mapped_buffer = static_cast<uint8*>(data);
|
| DCHECK(mapped_buffer);
|
| libyuv::ARGBCopy(
|
| reinterpret_cast<uint8*>(argb_buffer->data()), frame_size.width() * 4,
|
| - mapped_buffer, frame_size.width() * 4,
|
| + mapped_buffer, stride,
|
| frame_size.width(), frame_size.height());
|
| gpu_memory_buffer->Unmap();
|
|
|
|
|