Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/video_capture_manager.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_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
 }
 
 void VideoCaptureManager::OnStart(
     const media::VideoCaptureParams capture_params,
     media::VideoCaptureDevice::EventHandler* video_capture_receiver) {
   SCOPED_UMA_HISTOGRAM_TIMER("Media.VideoCaptureManager.OnStartTime");
   DCHECK(IsOnDeviceThread());
   DCHECK(video_capture_receiver != NULL);
   DVLOG(1) << "VideoCaptureManager::OnStart, (" << capture_params.width
            << ", " << capture_params.height
-           << ", " << capture_params.frame_per_second
+           << ", " << capture_params.frame_rate
            << ", " << capture_params.session_id
            << ")";
 
   media::VideoCaptureDevice* video_capture_device =
       GetDeviceInternal(capture_params.session_id);
   if (!video_capture_device) {
     // Invalid session id.
     video_capture_receiver->OnError();
     return;
   }
   // TODO(mcasas): Variable resolution video capture devices, are not yet
   // fully supported, see crbug.com/261410, second part, and crbug.com/266082 .
   if (capture_params.frame_size_type !=
       media::ConstantResolutionVideoCaptureDevice) {
     LOG(DFATAL) << "Only constant Video Capture resolution device supported.";
     video_capture_receiver->OnError();
     return;
   }
   Controllers::iterator cit = controllers_.find(video_capture_device);
   if (cit != controllers_.end()) {
     cit->second->ready_to_delete = false;
   }
 
   // Possible errors are signaled to video_capture_receiver by
   // video_capture_device. video_capture_receiver to perform actions.
   media::VideoCaptureCapability params_as_capability_copy;
   params_as_capability_copy.width = capture_params.width;
   params_as_capability_copy.height = capture_params.height;
-  params_as_capability_copy.frame_rate = capture_params.frame_per_second;
+  params_as_capability_copy.frame_rate = capture_params.frame_rate;
   params_as_capability_copy.session_id = capture_params.session_id;
   params_as_capability_copy.frame_size_type = capture_params.frame_size_type;
   video_capture_device->Allocate(params_as_capability_copy,
                                  video_capture_receiver);
   video_capture_device->Start();
 }
 
 void VideoCaptureManager::OnStop(
     const media::VideoCaptureSessionId capture_session_id,
     base::Closure stopped_cb) {
@@ skipping 281 matching lines @@
 
     VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
     if (dit != devices_.end()) {
       return dit->second.capture_device;
     }
   }
   return NULL;
 }
 
 }  // namespace content