Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

content/browser/renderer_host/media/video_capture_device_client.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_device_client.h"
 
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
@@ skipping 229 matching lines @@
   libyuv::RotationMode rotation_mode = libyuv::kRotate0;
   if (rotation == 90)
     rotation_mode = libyuv::kRotate90;
   else if (rotation == 180)
     rotation_mode = libyuv::kRotate180;
   else if (rotation == 270)
     rotation_mode = libyuv::kRotate270;
 
   const gfx::Size dimensions(destination_width, destination_height);
   if (!VideoFrame::IsValidConfig(VideoFrame::I420,
+                                 VideoFrame::STORAGE_UNKNOWN,
                                  dimensions,
                                  gfx::Rect(dimensions),
                                  dimensions)) {
     return;
   }
 
   scoped_ptr<Buffer> buffer(
       ReserveOutputBuffer(media::PIXEL_FORMAT_I420, dimensions));
   if (!buffer.get())
     return;
@@ skipping 193 matching lines @@
     capture_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&TextureWrapHelper::OnIncomingCapturedGpuMemoryBuffer,
                    texture_wrap_helper_,
                    base::Passed(&buffer),
                    frame_format,
                    timestamp));
   } else {
     DCHECK_EQ(frame_format.pixel_format, media::PIXEL_FORMAT_I420);
     scoped_refptr<VideoFrame> video_frame =
-        VideoFrame::WrapExternalPackedMemory(
+        VideoFrame::WrapExternalData(
             VideoFrame::I420,
             frame_format.frame_size,
             gfx::Rect(frame_format.frame_size),
             frame_format.frame_size,
             reinterpret_cast<uint8*>(buffer->data()),
             VideoFrame::AllocationSize(VideoFrame::I420,
                                        frame_format.frame_size),
-            base::SharedMemory::NULLHandle(),
-            0  /* shared_memory_offset */,
             base::TimeDelta());
     DCHECK(video_frame.get());
     video_frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE,
                                        frame_format.frame_rate);
     OnIncomingCapturedVideoFrame(buffer.Pass(), video_frame, timestamp);
   }
 }
 
 void VideoCaptureDeviceClient::OnIncomingCapturedVideoFrame(
     scoped_ptr<Buffer> buffer,
@@ skipping 180 matching lines @@
 void VideoCaptureDeviceClient::TextureWrapHelper::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