Reland: Reorganize media::VideoCapture* types

media/video/capture/win/sink_filter_win.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 "media/video/capture/win/sink_filter_win.h"
 
 #include "base/logging.h"
 #include "media/video/capture/win/sink_input_pin_win.h"
 
 // Define GUID for I420. This is the color format we would like to support but
@@ skipping 10 matching lines @@
 
 SinkFilter::SinkFilter(SinkFilterObserver* observer)
     : input_pin_(NULL) {
   input_pin_ = new SinkInputPin(this, observer);
 }
 
 SinkFilter::~SinkFilter() {
   input_pin_->SetOwner(NULL);
 }
 
-void SinkFilter::SetRequestedMediaCapability(
-    const VideoCaptureCapability& capability) {
-  input_pin_->SetRequestedMediaCapability(capability);
+void SinkFilter::SetRequestedMediaFormat(const VideoCaptureFormat& format) {
+  input_pin_->SetRequestedMediaFormat(format);
 }
 
-const VideoCaptureCapability& SinkFilter::ResultingCapability() {
-  return input_pin_->ResultingCapability();
+const VideoCaptureFormat& SinkFilter::ResultingFormat() {
+  return input_pin_->ResultingFormat();
 }
 
 size_t SinkFilter::NoOfPins() {
   return 1;
 }
 
 IPin* SinkFilter::GetPin(int index) {
   return index == 0 ? input_pin_ : NULL;
 }
 
 STDMETHODIMP SinkFilter::GetClassID(CLSID* clsid) {
   *clsid = __uuidof(SinkFilter);
   return S_OK;
 }
 
 }  // namespace media