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

media/video/capture/mac/avfoundation_glue.mm

 // Copyright 2013 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/avfoundation_glue.h"
 
 #include <dlfcn.h>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 27 matching lines @@
         {&AVCaptureDeviceWasDisconnectedNotification_,
          "AVCaptureDeviceWasDisconnectedNotification"},
         {&AVMediaTypeVideo_, "AVMediaTypeVideo"},
         {&AVMediaTypeAudio_, "AVMediaTypeAudio"},
         {&AVMediaTypeMuxed_, "AVMediaTypeMuxed"},
         {&AVCaptureSessionRuntimeErrorNotification_,
          "AVCaptureSessionRuntimeErrorNotification"},
         {&AVCaptureSessionDidStopRunningNotification_,
          "AVCaptureSessionDidStopRunningNotification"},
         {&AVCaptureSessionErrorKey_, "AVCaptureSessionErrorKey"},
-        {&AVCaptureSessionPreset320x240_, "AVCaptureSessionPreset320x240"},
-        {&AVCaptureSessionPreset640x480_, "AVCaptureSessionPreset640x480"},
-        {&AVCaptureSessionPreset1280x720_, "AVCaptureSessionPreset1280x720"},
         {&AVVideoScalingModeKey_, "AVVideoScalingModeKey"},
         {&AVVideoScalingModeResizeAspectFill_,
          "AVVideoScalingModeResizeAspectFill"},
     };
     for (size_t i = 0; i < arraysize(av_strings); ++i) {
       *av_strings[i].loaded_string = *reinterpret_cast<NSString**>(
           dlsym(library_handle_, av_strings[i].symbol));
       DCHECK(*av_strings[i].loaded_string) << dlerror();
     }
   }
@@ skipping 12 matching lines @@
   NSString* AVMediaTypeMuxed() const { return AVMediaTypeMuxed_; }
   NSString* AVCaptureSessionRuntimeErrorNotification() const {
     return AVCaptureSessionRuntimeErrorNotification_;
   }
   NSString* AVCaptureSessionDidStopRunningNotification() const {
     return AVCaptureSessionDidStopRunningNotification_;
   }
   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_;
   }
 
  private:
   NSBundle* bundle_;
   void* library_handle_;
   // The following members are replicas of the respectives in AVFoundation.
   NSString* AVCaptureDeviceWasConnectedNotification_;
   NSString* AVCaptureDeviceWasDisconnectedNotification_;
   NSString* AVMediaTypeVideo_;
   NSString* AVMediaTypeAudio_;
   NSString* AVMediaTypeMuxed_;
   NSString* AVCaptureSessionRuntimeErrorNotification_;
   NSString* AVCaptureSessionDidStopRunningNotification_;
   NSString* AVCaptureSessionErrorKey_;
-  NSString* AVCaptureSessionPreset320x240_;
-  NSString* AVCaptureSessionPreset640x480_;
-  NSString* AVCaptureSessionPreset1280x720_;
   NSString* AVVideoScalingModeKey_;
   NSString* AVVideoScalingModeResizeAspectFill_;
 
   DISALLOW_COPY_AND_ASSIGN(AVFoundationInternal);
 };
 
 }  // namespace
 
 static base::LazyInstance<AVFoundationInternal> g_avfoundation_handle =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 44 matching lines @@
 
 NSString* AVFoundationGlue::AVCaptureSessionDidStopRunningNotification() {
   return
       g_avfoundation_handle.Get().AVCaptureSessionDidStopRunningNotification();
 }
 
 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();
 }
 
 NSString* AVFoundationGlue::AVVideoScalingModeResizeAspectFill() {
   return g_avfoundation_handle.Get().AVVideoScalingModeResizeAspectFill();
 }
 
 Class AVFoundationGlue::AVCaptureSessionClass() {
   return [AVFoundationBundle() classNamed:@"AVCaptureSession"];
@@ skipping 26 matching lines @@
 @implementation AVCaptureDeviceInputGlue
 
 + (CrAVCaptureDeviceInput*)deviceInputWithDevice:(CrAVCaptureDevice*)device
                                            error:(NSError**)outError {
   return [[AVFoundationGlue::AVFoundationBundle()
       classNamed:@"AVCaptureDeviceInput"] deviceInputWithDevice:device
                                                           error:outError];
 }
 
 @end  // @implementation AVCaptureDeviceInputGlue