Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/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/browser/renderer_host/media/video_capture_host.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/browser_main_loop.h"
@@ skipping 77 matching lines @@
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&VideoCaptureHost::DoSendFrameInfoOnIOThread,
                  this, controller_id, format));
 }
 
 void VideoCaptureHost::OnFrameInfoChanged(
     const VideoCaptureControllerID& controller_id,
     int width,
     int height,
-    int frame_per_second) {
+    int frame_rate) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoSendFrameInfoChangedOnIOThread,
-                 this, controller_id, width, height, frame_per_second));
+                 this, controller_id, width, height, frame_rate));
 }
 
 void VideoCaptureHost::OnEnded(const VideoCaptureControllerID& controller_id) {
   DVLOG(1) << "VideoCaptureHost::OnEnded";
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoEndedOnIOThread, this, controller_id));
 }
 
 void VideoCaptureHost::DoSendNewBufferOnIOThread(
@@ skipping 50 matching lines @@
     const VideoCaptureControllerID& controller_id,
     const media::VideoCaptureCapability& format) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   media::VideoCaptureParams params;
   params.width = format.width;
   params.height = format.height;
-  params.frame_per_second = format.frame_rate;
+  params.frame_rate = format.frame_rate;
   params.frame_size_type = format.frame_size_type;
   Send(new VideoCaptureMsg_DeviceInfo(controller_id.device_id, params));
   Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
                                         VIDEO_CAPTURE_STATE_STARTED));
 }
 
 void VideoCaptureHost::DoSendFrameInfoChangedOnIOThread(
     const VideoCaptureControllerID& controller_id,
     int width,
     int height,
-    int frame_per_second) {
+    int frame_rate) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   media::VideoCaptureParams params;
   params.width = width;
   params.height = height;
-  params.frame_per_second = frame_per_second;
+  params.frame_rate = frame_rate;
   Send(new VideoCaptureMsg_DeviceInfoChanged(controller_id.device_id, params));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // IPC Messages handler.
 bool VideoCaptureHost::OnMessageReceived(const IPC::Message& message,
                                          bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(VideoCaptureHost, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Start, OnStartCapture)
     IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Pause, OnPauseCapture)
     IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Stop, OnStopCapture)
     IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_BufferReady, OnReceiveEmptyBuffer)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void VideoCaptureHost::OnStartCapture(int device_id,
                                       const media::VideoCaptureParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "VideoCaptureHost::OnStartCapture, device_id " << device_id
            << ", (" << params.width << ", " << params.height << ", "
-           << params.frame_per_second << ", " << params.session_id
+           << params.frame_rate << ", " << params.session_id
            << ", variable resolution device:"
            << ((params.frame_size_type ==
                media::VariableResolutionVideoCaptureDevice) ? "yes" : "no")
             << ")";
   VideoCaptureControllerID controller_id(device_id);
   DCHECK(entries_.find(controller_id) == entries_.end());
 
   entries_[controller_id] = new Entry(NULL);
   media_stream_manager_->video_capture_manager()->AddController(
       params, this, base::Bind(&VideoCaptureHost::OnControllerAdded, this,
@@ skipping 77 matching lines @@
   if (controller) {
     controller->StopCapture(controller_id, this);
     media_stream_manager_->video_capture_manager()->RemoveController(
         controller, this);
   }
   delete it->second;
   entries_.erase(controller_id);
 }
 
 }  // namespace content