Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/win/sink_input_pin_win.cc

 // Copyright (c) 2011 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 "media/video/capture/win/sink_input_pin_win.h"
 
 // Avoid including strsafe.h via dshow as it will cause build warnings.
 #define NO_DSHOW_STRSAFE
 #include <dshow.h>
 
@@ skipping 92 matching lines @@
   resulting_capability_.width = pvi->bmiHeader.biWidth;
   resulting_capability_.height = abs(pvi->bmiHeader.biHeight);
   if (pvi->AvgTimePerFrame > 0) {
     resulting_capability_.frame_rate =
         static_cast<int>(kSecondsToReferenceTime / pvi->AvgTimePerFrame);
   } else {
     resulting_capability_.frame_rate = requested_capability_.frame_rate;
   }
   if (sub_type == kMediaSubTypeI420 &&
       pvi->bmiHeader.biCompression == MAKEFOURCC('I', '4', '2', '0')) {
-    resulting_capability_.color = VideoCaptureDevice::kI420;
+    resulting_capability_.color = VideoCaptureCapability::kI420;
     return true;  // This format is acceptable.
   }
   if (sub_type == MEDIASUBTYPE_YUY2 &&
       pvi->bmiHeader.biCompression == MAKEFOURCC('Y', 'U', 'Y', '2')) {
-    resulting_capability_.color = VideoCaptureDevice::kYUY2;
+    resulting_capability_.color = VideoCaptureCapability::kYUY2;
     return true;  // This format is acceptable.
   }
   if (sub_type == MEDIASUBTYPE_RGB24 &&
       pvi->bmiHeader.biCompression == BI_RGB) {
-    resulting_capability_.color = VideoCaptureDevice::kRGB24;
+    resulting_capability_.color = VideoCaptureCapability::kRGB24;
     return true;  // This format is acceptable.
   }
   return false;
 }
 
 HRESULT SinkInputPin::Receive(IMediaSample* sample) {
   const int length = sample->GetActualDataLength();
   uint8* buffer = NULL;
   if (FAILED(sample->GetPointer(&buffer)))
     return S_FALSE;
 
   observer_->FrameReceived(buffer, length);
   return S_OK;
 }
 
 void SinkInputPin::SetRequestedMediaCapability(
-    const VideoCaptureDevice::Capability& capability) {
+    const VideoCaptureCapability& capability) {
   requested_capability_ = capability;
-  resulting_capability_ = VideoCaptureDevice::Capability();
+  resulting_capability_.width = 0;
+  resulting_capability_.height = 0;
+  resulting_capability_.frame_rate = 0;
+  resulting_capability_.color = VideoCaptureCapability::kColorUnknown;
+  resulting_capability_.expected_capture_delay = 0;
+  resulting_capability_.interlaced = false;
 }
 
-const VideoCaptureDevice::Capability& SinkInputPin::ResultingCapability() {
+const VideoCaptureCapability& SinkInputPin::ResultingCapability() {
   return resulting_capability_;
 }
 
 }  // namespace media