Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/renderer/media/capture_video_decoder.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/renderer/media/capture_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/filter_host.h"
@@ skipping 243 matching lines @@
                                      natural_size_.width(),
                                      natural_size_.height(),
                                      buf->timestamp - start_time_,
                                      base::TimeDelta::FromMilliseconds(0));
 
   last_frame_timestamp_ = buf->timestamp;
   uint8* buffer = buf->memory_pointer;
 
   // Assume YV12 format. Note that camera gives YUV and media pipeline video
   // renderer asks for YVU. The following code did the conversion.
-  DCHECK_EQ(capability_.color, media::VideoFrame::I420);
+  DCHECK_EQ(capability_.color, media::VideoCaptureCapability::kI420);
   int y_width = buf->width;
   int y_height = buf->height;
   int uv_width = buf->width / 2;
   int uv_height = buf->height / 2;  // YV12 format.
   CopyYPlane(buffer, y_width, y_height, video_frame);
   buffer += y_width * y_height;
   CopyUPlane(buffer, uv_width, uv_height, video_frame);
   buffer += uv_width * uv_height;
   CopyVPlane(buffer, uv_width, uv_height, video_frame);
 
   DeliverFrame(video_frame);
   capture->FeedBuffer(buf);
 }
 
 void CaptureVideoDecoder::DeliverFrame(
     const scoped_refptr<media::VideoFrame>& video_frame) {
   // Reset the callback before running to protect against reentrancy.
   ReadCB read_cb = read_cb_;
   read_cb_.Reset();
   read_cb.Run(video_frame);
 }