Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm

 // 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.
 
 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h"
 
 #import <QTKit/QTKit.h>
 
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
@@ skipping 263 matching lines @@
 
       for (size_t y = 0; y < frameHeight; ++y) {
         memcpy(adjustedAddress + y * expectedBytesPerRow,
                addressToPass + y * bytesPerRow,
                expectedBytesPerRow);
       }
 
       addressToPass = adjustedAddress;
       frameSize = frameHeight * expectedBytesPerRow;
     }
-
-    media::VideoCaptureFormat captureFormat(gfx::Size(frameWidth, frameHeight),
-                                            frameRate_,
-                                            media::PIXEL_FORMAT_UYVY);
+    media::VideoCaptureCapability captureCapability;
+    captureCapability.width = frameWidth;
+    captureCapability.height = frameHeight;
+    captureCapability.frame_rate = frameRate_;
+    captureCapability.color = media::PIXEL_FORMAT_UYVY;
 
     // The aspect ratio dictionary is often missing, in which case we report
     // a pixel aspect ratio of 0:0.
     int aspectNumerator = 0, aspectDenominator = 0;
     CFDictionaryRef aspectRatioDict = (CFDictionaryRef)CVBufferGetAttachment(
         videoFrame, kCVImageBufferPixelAspectRatioKey, NULL);
     if (aspectRatioDict) {
       CFNumberRef aspectNumeratorRef = (CFNumberRef)CFDictionaryGetValue(
           aspectRatioDict, kCVImageBufferPixelAspectRatioHorizontalSpacingKey);
       CFNumberRef aspectDenominatorRef = (CFNumberRef)CFDictionaryGetValue(
           aspectRatioDict, kCVImageBufferPixelAspectRatioVerticalSpacingKey);
       DCHECK(aspectNumeratorRef && aspectDenominatorRef) <<
           "Aspect Ratio dictionary missing its entries.";
       CFNumberGetValue(aspectNumeratorRef, kCFNumberIntType, &aspectNumerator);
       CFNumberGetValue(
           aspectDenominatorRef, kCFNumberIntType, &aspectDenominator);
     }
 
     // Deliver the captured video frame.
-    frameReceiver_->ReceiveFrame(addressToPass, frameSize, captureFormat,
+    frameReceiver_->ReceiveFrame(addressToPass, frameSize, captureCapability,
         aspectNumerator, aspectDenominator);
 
     CVPixelBufferUnlockBaseAddress(videoFrame, kLockFlags);
   }
   [lock_ unlock];
 }
 
 - (void)handleNotification:(NSNotification*)errorNotification {
   NSError * error = (NSError*)[[errorNotification userInfo]
       objectForKey:QTCaptureSessionErrorKey];
   frameReceiver_->ReceiveError([[error localizedDescription] UTF8String]);
 }
 
 @end