Move VideoCapture::VideoCaptureCapability to video_capture_types.h

content/renderer/media/capture_video_decoder.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
 
 #include "base/time.h"
 #include "content/common/content_export.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 #include "media/video/capture/video_capture.h"
+#include "media/video/capture/video_capture_types.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 class VideoCaptureImplManager;
 
 // A filter takes raw frames from video capture engine and passes them to media
 // engine as a video decoder filter.
 class CONTENT_EXPORT CaptureVideoDecoder
     : public media::VideoDecoder,
       public media::VideoCapture::EventHandler {
  public:
   CaptureVideoDecoder(
       base::MessageLoopProxy* message_loop_proxy,
       media::VideoCaptureSessionId video_stream_id,
       VideoCaptureImplManager* vc_manager,
-      const media::VideoCapture::VideoCaptureCapability& capability);
+      const media::VideoCaptureCapability& capability);
   virtual ~CaptureVideoDecoder();
 
   // Filter implementation.
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time,
                     const media::PipelineStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
 
@@ skipping 47 matching lines @@
       scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf);
   void OnDeviceInfoReceivedOnDecoderThread(
       media::VideoCapture* capture,
       const media::VideoCaptureParams& device_info);
 
   // Delivers the frame to |read_cb_| and resets the callback.
   void DeliverFrame(const scoped_refptr<media::VideoFrame>& video_frame);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
-  media::VideoCapture::VideoCaptureCapability capability_;
+  media::VideoCaptureCapability capability_;
   gfx::Size natural_size_;
   DecoderState state_;
   bool got_first_frame_;
   ReadCB read_cb_;
   base::Closure pending_stop_cb_;
   media::StatisticsCB statistics_cb_;
 
   media::VideoCaptureSessionId video_stream_id_;
   media::VideoCapture* capture_engine_;
   base::Time last_frame_timestamp_;
   base::Time start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_