Add multi-planar functions to GpuMemoryBuffer

content/browser/renderer_host/media/video_capture_texture_wrapper.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/video_capture_texture_wrapper.h"
 
 #include "base/bind.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
@@ skipping 265 matching lines @@
 
   DVLOG_IF(1, gpu_memory_buffers_.empty()) << " Skipping ingress frame, 0 GMBs";
   if (gpu_memory_buffers_.empty())
     return;
 
   linked_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
       gpu_memory_buffers_.front();
   gpu_memory_buffers_.pop();
   DCHECK(gpu_memory_buffer.get());
 
-  uint8* mapped_buffer = static_cast<uint8*>(gpu_memory_buffer->Map());
+  void* mapped_buffers[gpu_memory_buffer->GetNumberOfPlanes()];
+  bool map_completed = gpu_memory_buffer->Map(mapped_buffers);
+  DCHECK(map_completed);
+
+  uint8* mapped_buffer = static_cast<uint8*>(mapped_buffers[0]);

[reveman, 2015/03/23 22:24:01]

If you're assuming one plane then you might as well do:

void* mapped_buffer = NULL;
gpu_memory_buffer->Map(&mapped_buffer);

[emircan, 2015/03/24 16:52:26]

Done. I wasn't sure if these functions would be supporting multi buffers later,
so I wanted to leave some functionality for that.

   DCHECK(mapped_buffer);
   libyuv::ARGBCopy(
       reinterpret_cast<uint8*>(argb_buffer->data()), frame_size.width() * 4,
       mapped_buffer, frame_size.width() * 4,

[reveman, 2015/03/23 22:24:01]

btw, should "frame_size.width() * 4" be the buffer stride instead?

[emircan, 2015/03/24 16:52:26]

Done.

       frame_size.width(), frame_size.height());
   gpu_memory_buffer->Unmap();
 
   gpu::gles2::GLES2Interface* gl = capture_thread_context_->ContextGL();
   GLuint image_id = gl->CreateImageCHROMIUM(gpu_memory_buffer->AsClientBuffer(),
                                             frame_size.width(),
                                             frame_size.height(),
                                             GL_RGBA);
   DCHECK(image_id);
 
@@ skipping 147 matching lines @@
 void VideoCaptureTextureWrapper::TextureWrapperDelegate::OnError(
     const std::string& message) {
   DCHECK(capture_task_runner_->BelongsToCurrentThread());
   DLOG(ERROR) << message;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, controller_));
 }
 
 }  // namespace content