Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/video_capture_controller.cc

 // Copyright (c) 2012 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_controller.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
@@ skipping 270 matching lines @@
   uint8* target = static_cast<uint8*>(dib->memory());
   CHECK(dib->created_size() >= static_cast<size_t> (frame_info_.width *
                                                     frame_info_.height * 3) /
                                                     2);
   uint8* yplane = target;
   uint8* uplane = target + frame_info_.width * frame_info_.height;
   uint8* vplane = uplane + (frame_info_.width * frame_info_.height) / 4;
 
   // Do color conversion from the camera format to I420.
   switch (frame_info_.color) {
-    case media::VideoCaptureDevice::kColorUnknown:  // Color format not set.
+    case media::VideoFrame::kColorUnknown:  // Color format not set.
       break;
-    case media::VideoCaptureDevice::kI420: {
+    case media::VideoFrame::kI420: {
       memcpy(target, data, (frame_info_.width * frame_info_.height * 3) / 2);
       break;
     }
-    case media::VideoCaptureDevice::kYUY2: {
+    case media::VideoFrame::kYUY2: {
       media::ConvertYUY2ToYUV(data, yplane, uplane, vplane, frame_info_.width,
                               frame_info_.height);
       break;
     }
-    case media::VideoCaptureDevice::kRGB24: {
+    case media::VideoFrame::kRGB24: {
       int ystride = frame_info_.width;
       int uvstride = frame_info_.width / 2;
 #if defined(OS_WIN)  // RGB on Windows start at the bottom line.
       int rgb_stride = -3 * frame_info_.width;
       const uint8* rgb_src = data + 3 * frame_info_.width *
           (frame_info_.height -1);
 #else
       int rgb_stride = 3 * frame_info_.width;
       const uint8* rgb_src = data;
 #endif
       media::ConvertRGB24ToYUV(rgb_src, yplane, uplane, vplane,
                                frame_info_.width, frame_info_.height,
                                rgb_stride, ystride, uvstride);
       break;
     }
-    case media::VideoCaptureDevice::kARGB: {
+    case media::VideoFrame::kARGB: {
       media::ConvertRGB32ToYUV(data, yplane, uplane, vplane, frame_info_.width,
                                frame_info_.height, frame_info_.width * 4,
                                frame_info_.width, frame_info_.width / 2);
       break;
     }
     default:
       NOTREACHED();
   }
 
   BrowserThread::PostTask(BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureController::DoIncomingCapturedFrameOnIOThread,
                  this, buffer_id, timestamp));
 }
 
 void VideoCaptureController::OnError() {
   video_capture_manager_->Error(current_params_.session_id);
   BrowserThread::PostTask(BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, this));
 }
 
 void VideoCaptureController::OnFrameInfo(
-    const media::VideoCaptureDevice::Capability& info) {
+    const media::VideoCaptureCapability& info) {
   frame_info_= info;
   BrowserThread::PostTask(BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureController::DoFrameInfoOnIOThread,
                  this, info));
 }
 
 void VideoCaptureController::DoIncomingCapturedFrameOnIOThread(
     int buffer_id, base::Time timestamp) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 25 matching lines @@
        client_it != controller_clients_.end(); client_it++) {
     (*client_it)->event_handler->OnError((*client_it)->controller_id);
   }
   for (client_it = pending_clients_.begin();
        client_it != pending_clients_.end(); client_it++) {
     (*client_it)->event_handler->OnError((*client_it)->controller_id);
   }
 }
 
 void VideoCaptureController::DoFrameInfoOnIOThread(
-    const media::VideoCaptureDevice::Capability info) {
+    const media::VideoCaptureCapability info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(owned_dibs_.empty())
       << "Device is restarted without releasing shared memory.";
 
   bool frames_created = true;
   const size_t needed_size = (info.width * info.height * 3) / 2;
   {
     base::AutoLock lock(lock_);
     for (size_t i = 1; i <= kNoOfDIBS; ++i) {
       scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
@@ skipping 125 matching lines @@
 }
 
 void VideoCaptureController::DoDeviceStoppedOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   device_in_use_ = false;
   if (state_ == video_capture::kStopping) {
     PostStopping();
   }
 }