Mac AVfoundation: Change AVVideoScalingModeResizeAspect -> AVVideoScalingModeResizeAspectFill

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 31 matching lines @@
         {&AVMediaTypeMuxed_, "AVMediaTypeMuxed"},
         {&AVCaptureSessionRuntimeErrorNotification_,
          "AVCaptureSessionRuntimeErrorNotification"},
         {&AVCaptureSessionDidStopRunningNotification_,
          "AVCaptureSessionDidStopRunningNotification"},
         {&AVCaptureSessionErrorKey_, "AVCaptureSessionErrorKey"},
         {&AVCaptureSessionPreset320x240_, "AVCaptureSessionPreset320x240"},
         {&AVCaptureSessionPreset640x480_, "AVCaptureSessionPreset640x480"},
         {&AVCaptureSessionPreset1280x720_, "AVCaptureSessionPreset1280x720"},
         {&AVVideoScalingModeKey_, "AVVideoScalingModeKey"},
-        {&AVVideoScalingModeResizeAspect_, "AVVideoScalingModeResizeAspect"},
+        {&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();
     }
   }
 
   NSBundle* bundle() const { return bundle_; }
   void* library_handle() const { return library_handle_; }
@@ skipping 19 matching lines @@
   NSString* AVCaptureSessionPreset320x240() const {
     return AVCaptureSessionPreset320x240_;
   }
   NSString* AVCaptureSessionPreset640x480() const {
     return AVCaptureSessionPreset640x480_;
   }
   NSString* AVCaptureSessionPreset1280x720() const {
     return AVCaptureSessionPreset1280x720_;
   }
   NSString* AVVideoScalingModeKey() const { return AVVideoScalingModeKey_; }
-  NSString* AVVideoScalingModeResizeAspect() const {
-    return AVVideoScalingModeResizeAspect_;
+  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* AVVideoScalingModeResizeAspect_;
+  NSString* AVVideoScalingModeResizeAspectFill_;
 
   DISALLOW_COPY_AND_ASSIGN(AVFoundationInternal);
 };
 
 }  // namespace
 
 static base::LazyInstance<AVFoundationInternal> g_avfoundation_handle =
     LAZY_INSTANCE_INITIALIZER;
 
 bool AVFoundationGlue::IsAVFoundationSupported() {
@@ skipping 58 matching lines @@
 }
 
 NSString* AVFoundationGlue::AVCaptureSessionPreset1280x720() {
   return g_avfoundation_handle.Get().AVCaptureSessionPreset1280x720();
 }
 
 NSString* AVFoundationGlue::AVVideoScalingModeKey() {
   return g_avfoundation_handle.Get().AVVideoScalingModeKey();
 }
 
-NSString* AVFoundationGlue::AVVideoScalingModeResizeAspect() {
-  return g_avfoundation_handle.Get().AVVideoScalingModeResizeAspect();
+NSString* AVFoundationGlue::AVVideoScalingModeResizeAspectFill() {
+  return g_avfoundation_handle.Get().AVVideoScalingModeResizeAspectFill();
 }
 
 Class AVFoundationGlue::AVCaptureSessionClass() {
   return [AVFoundationBundle() classNamed:@"AVCaptureSession"];
 }
 
 Class AVFoundationGlue::AVCaptureVideoDataOutputClass() {
   return [AVFoundationBundle() classNamed:@"AVCaptureVideoDataOutput"];
 }
 
@@ skipping 20 matching lines @@
 @implementation AVCaptureDeviceInputGlue
 
 + (CrAVCaptureDeviceInput*)deviceInputWithDevice:(CrAVCaptureDevice*)device
                                            error:(NSError**)outError {
   return [[AVFoundationGlue::AVFoundationBundle()
       classNamed:@"AVCaptureDeviceInput"] deviceInputWithDevice:device
                                                           error:outError];
 }
 
 @end  // @implementation AVCaptureDeviceInputGlue