Mac AVFoundation: Allow use of all camera's supported resolutions.

Historically, QTKit had the camera resolutions limited to QVGA/VGA/HD
due to some internal rescaling not respecting aspect ratio in those
systems. AVFoundation has not shown such problems, to the best
of the author's knowledge, and the limited resolutions prevent 
using all the camera's capabilities. This CL enables the use of all
resolutions listed by the camera as supported.

QTKit implementation remains untouched.

Tested: Locally using C910 and Facetime HD alternatively. This CL
solves the attached bugs 367668, 367670.

[1] https://code.google.com/p/chromium/codesearch#chromium/src/media/video/capture/mac/video_capture_device_mac.mm&sq=package:chromium&l=189

BUG=288562, 367668, 367670

Review URL: https://codereview.chromium.org/258783007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266845 0039d316-1c4b-4281-b951-d872f2087c98

media/video/capture/mac/avfoundation_glue.h

@@ -41,9 +41,6 @@ class MEDIA_EXPORT AVFoundationGlue {
   static NSString* AVCaptureSessionRuntimeErrorNotification();
   static NSString* AVCaptureSessionDidStopRunningNotification();
   static NSString* AVCaptureSessionErrorKey();
-  static NSString* AVCaptureSessionPreset320x240();
-  static NSString* AVCaptureSessionPreset640x480();
-  static NSString* AVCaptureSessionPreset1280x720();
 
   // Originally from AVVideoSettings.h but in global namespace.
   static NSString* AVVideoScalingModeKey();
@@ -64,7 +61,6 @@ MEDIA_EXPORT
 - (NSString*)uniqueID;
 - (NSString*)localizedName;
 - (BOOL)isSuspended;
-- (BOOL)supportsAVCaptureSessionPreset:(NSString*)preset;
 - (NSArray*)formats;
 
 @end
@@ -99,9 +95,6 @@ MEDIA_EXPORT
 @interface CrAVCaptureSession : NSObject
 
 - (void)release;
-- (BOOL)canSetSessionPreset:(NSString*)preset;
-- (void)setSessionPreset:(NSString*)preset;
-- (NSString*)sessionPreset;
 - (void)addInput:(CrAVCaptureInput*)input;
 - (void)removeInput:(CrAVCaptureInput*)input;
 - (void)addOutput:(CrAVCaptureOutput*)output;

media/video/capture/mac/avfoundation_glue.mm

@@ -45,9 +45,6 @@ class AVFoundationInternal {
         {&AVCaptureSessionDidStopRunningNotification_,
          "AVCaptureSessionDidStopRunningNotification"},
         {&AVCaptureSessionErrorKey_, "AVCaptureSessionErrorKey"},
-        {&AVCaptureSessionPreset320x240_, "AVCaptureSessionPreset320x240"},
-        {&AVCaptureSessionPreset640x480_, "AVCaptureSessionPreset640x480"},
-        {&AVCaptureSessionPreset1280x720_, "AVCaptureSessionPreset1280x720"},
         {&AVVideoScalingModeKey_, "AVVideoScalingModeKey"},
         {&AVVideoScalingModeResizeAspectFill_,
          "AVVideoScalingModeResizeAspectFill"},
@@ -80,15 +77,6 @@ class AVFoundationInternal {
   NSString* AVCaptureSessionErrorKey() const {
     return AVCaptureSessionErrorKey_;
   }
-  NSString* AVCaptureSessionPreset320x240() const {
-    return AVCaptureSessionPreset320x240_;
-  }
-  NSString* AVCaptureSessionPreset640x480() const {
-    return AVCaptureSessionPreset640x480_;
-  }
-  NSString* AVCaptureSessionPreset1280x720() const {
-    return AVCaptureSessionPreset1280x720_;
-  }
   NSString* AVVideoScalingModeKey() const { return AVVideoScalingModeKey_; }
   NSString* AVVideoScalingModeResizeAspectFill() const {
     return AVVideoScalingModeResizeAspectFill_;
@@ -106,9 +94,6 @@ class AVFoundationInternal {
   NSString* AVCaptureSessionRuntimeErrorNotification_;
   NSString* AVCaptureSessionDidStopRunningNotification_;
   NSString* AVCaptureSessionErrorKey_;
-  NSString* AVCaptureSessionPreset320x240_;
-  NSString* AVCaptureSessionPreset640x480_;
-  NSString* AVCaptureSessionPreset1280x720_;
   NSString* AVVideoScalingModeKey_;
   NSString* AVVideoScalingModeResizeAspectFill_;
 
@@ -173,18 +158,6 @@ NSString* AVFoundationGlue::AVCaptureSessionErrorKey() {
   return g_avfoundation_handle.Get().AVCaptureSessionErrorKey();
 }
 
-NSString* AVFoundationGlue::AVCaptureSessionPreset320x240() {
-  return g_avfoundation_handle.Get().AVCaptureSessionPreset320x240();
-}
-
-NSString* AVFoundationGlue::AVCaptureSessionPreset640x480() {
-  return g_avfoundation_handle.Get().AVCaptureSessionPreset640x480();
-}
-
-NSString* AVFoundationGlue::AVCaptureSessionPreset1280x720() {
-  return g_avfoundation_handle.Get().AVCaptureSessionPreset1280x720();
-}
-
 NSString* AVFoundationGlue::AVVideoScalingModeKey() {
   return g_avfoundation_handle.Get().AVVideoScalingModeKey();
 }

media/video/capture/mac/video_capture_device_avfoundation_mac.mm

@@ -175,39 +175,12 @@
   frameHeight_ = height;
   frameRate_ = frameRate;
 
-  // Identify the sessionPreset that corresponds to the desired resolution.
-  NSString* sessionPreset;
-  if (width == 1280 && height == 720 && [captureSession_ canSetSessionPreset:
-          AVFoundationGlue::AVCaptureSessionPreset1280x720()]) {
-    sessionPreset = AVFoundationGlue::AVCaptureSessionPreset1280x720();
-  } else if (width == 640 && height == 480 && [captureSession_
-          canSetSessionPreset:
-              AVFoundationGlue::AVCaptureSessionPreset640x480()]) {
-    sessionPreset = AVFoundationGlue::AVCaptureSessionPreset640x480();
-  } else if (width == 320 && height == 240 && [captureSession_
-          canSetSessionPreset:
-              AVFoundationGlue::AVCaptureSessionPreset320x240()]) {
-    sessionPreset = AVFoundationGlue::AVCaptureSessionPreset320x240();
-  } else {
-    DLOG(ERROR) << "Unsupported resolution (" << width << "x" << height << ")";
-    return NO;
-  }
-  [captureSession_ setSessionPreset:sessionPreset];
-
-  // Check that our capture Device can be used with the current preset.
-  if (![captureDevice_ supportsAVCaptureSessionPreset:
-          [captureSession_ sessionPreset]]){
-    DLOG(ERROR) << "Video capture device does not support current preset";
-    return NO;
-  }
-
-  // Despite all Mac documentation detailing that setting the sessionPreset is
-  // enough, that is not the case for, at least, the MacBook Air built-in
-  // FaceTime HD Camera, and the capture output has to be configured as well.
-  // The reason for this mismatch is probably because most of the AVFoundation
-  // docs are written for iOS and not for MacOsX.
-  // AVVideoScalingModeKey() refers to letterboxing yes/no and preserve aspect
-  // ratio yes/no when scaling. Currently we set cropping and preservation.
+  // The capture output has to be configured, despite Mac documentation
+  // detailing that setting the sessionPreset would be enough. The reason for
+  // this mismatch is probably because most of the AVFoundation docs are written
+  // for iOS and not for MacOsX. AVVideoScalingModeKey() refers to letterboxing
+  // yes/no and preserve aspect ratio yes/no when scaling. Currently we set
+  // cropping and preservation.
   NSDictionary* videoSettingsDictionary = @{
     (id)kCVPixelBufferWidthKey : @(width),
     (id)kCVPixelBufferHeightKey : @(height),

media/video/capture/mac/video_capture_device_mac.mm

@@ -190,7 +190,8 @@ void VideoCaptureDeviceMac::AllocateAndStart(
   // QTKit API can scale captured frame to any size requested, which would lead
   // to undesired aspect ratio changes. Try to open the camera with a known
   // supported format and let the client crop/pad the captured frames.
-  GetBestMatchSupportedResolution(&width, &height);
+  if (!AVFoundationGlue::IsAVFoundationSupported())
+    GetBestMatchSupportedResolution(&width, &height);
 
   client_ = client.Pass();
   NSString* deviceId =