Consolidate duplicated frame / capability structures in video_capture_types.h

content/renderer/pepper/pepper_video_capture_host.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/pepper/pepper_video_capture_host.h"
 
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_media_device_manager.h"
 #include "content/renderer/pepper/pepper_platform_video_capture.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
@@ skipping 142 matching lines @@
   // re-use the buffer.
   platform_video_capture_->FeedBuffer(buffer);
 }
 
 void PepperVideoCaptureHost::OnDeviceInfoReceived(
     media::VideoCapture* capture,
     const media::VideoCaptureParams& device_info) {
   PP_VideoCaptureDeviceInfo_Dev info = {
     static_cast<uint32_t>(device_info.width),
     static_cast<uint32_t>(device_info.height),
-    static_cast<uint32_t>(device_info.frame_per_second)
+    static_cast<uint32_t>(device_info.frame_rate)
   };
   ReleaseBuffers();
 
   // YUV 4:2:0
   int uv_width = info.width / 2;
   int uv_height = info.height / 2;
   size_t size = info.width * info.height + 2 * uv_width * uv_height;
 
   ppapi::proxy::ResourceMessageReplyParams params(pp_resource(), 0);
 
@@ skipping 172 matching lines @@
 void PepperVideoCaptureHost::SetRequestedInfo(
     const PP_VideoCaptureDeviceInfo_Dev& device_info,
     uint32_t buffer_count) {
   // Clamp the buffer count to between 1 and |kMaxBuffers|.
   buffer_count_hint_ = std::min(std::max(buffer_count, 1U), kMaxBuffers);
 
   capability_.width = device_info.width;
   capability_.height = device_info.height;
   capability_.frame_rate = device_info.frames_per_second;
   capability_.expected_capture_delay = 0;  // Ignored.
-  capability_.color = media::VideoCaptureCapability::kI420;
+  capability_.color = media::PIXEL_FORMAT_I420;
   capability_.interlaced = false;  // Ignored.
 }
 
 void PepperVideoCaptureHost::DetachPlatformVideoCapture() {
   if (platform_video_capture_.get()) {
     platform_video_capture_->DetachEventHandler();
     platform_video_capture_ = NULL;
   }
 }
 
@@ skipping 47 matching lines @@
 PepperVideoCaptureHost::BufferInfo::BufferInfo()
     : in_use(false),
       data(NULL),
       buffer() {
 }
 
 PepperVideoCaptureHost::BufferInfo::~BufferInfo() {
 }
 
 }  // namespace content