Reland: Reorganize media::VideoCapture* types

media/video/capture/win/capability_list_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/capability_list_win.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
@@ skipping 15 matching lines @@
 bool CompareWidth(const ResolutionDiff& item1, const ResolutionDiff& item2) {
   return abs(item1.diff_width) < abs(item2.diff_width);
 }
 
 bool CompareFrameRate(const ResolutionDiff& item1,
                       const ResolutionDiff& item2) {
   return abs(item1.diff_frame_rate) < abs(item2.diff_frame_rate);
 }
 
 bool CompareColor(const ResolutionDiff& item1, const ResolutionDiff& item2) {
-  return item1.capability->color < item2.capability->color;
+  return item1.capability->supported_format.pixel_format <
+         item2.capability->supported_format.pixel_format;
 }
 
 }  // namespace.
 
 CapabilityList::CapabilityList() {
   DetachFromThread();
 }
 
 CapabilityList::~CapabilityList() {}
 
 // Appends an entry to the list.
 void CapabilityList::Add(const VideoCaptureCapabilityWin& capability) {
   DCHECK(CalledOnValidThread());
   capabilities_.push_back(capability);
 }
 
-const VideoCaptureCapabilityWin& CapabilityList::GetBestMatchedCapability(
+const VideoCaptureCapabilityWin& CapabilityList::GetBestMatchedFormat(
     int requested_width,
     int requested_height,
     int requested_frame_rate) const {
   DCHECK(CalledOnValidThread());
   DCHECK(!capabilities_.empty());
 
   std::list<ResolutionDiff> diff_list;
 
   // Loop through the candidates to create a list of differentials between the
   // requested resolution and the camera capability.
   for (Capabilities::const_iterator it = capabilities_.begin();
        it != capabilities_.end(); ++it) {
     ResolutionDiff diff;
     diff.capability = &(*it);
-    diff.diff_width = it->width - requested_width;
-    diff.diff_height = it->height - requested_height;
+    diff.diff_width = it->supported_format.frame_size.width() - requested_width;
+    diff.diff_height =
+        it->supported_format.frame_size.height() - requested_height;
     // The 1000 allows using integer arithmetic for f.i. 29.971 fps.
     diff.diff_frame_rate =
         1000 * ((static_cast<float>(it->frame_rate_numerator) /
                  it->frame_rate_denominator) -
                 requested_frame_rate);
     diff_list.push_back(diff);
   }
 
   // Sort the best height candidates.
   diff_list.sort(&CompareHeight);
@@ skipping 29 matching lines @@
       break;
     }
   }
 
   // Decide the best color format.
   diff_list.sort(&CompareColor);
   return *diff_list.front().capability;
 }
 
 }  // namespace media