| Index: media/base/mac/avfoundation_glue.h
|
| diff --git a/media/base/mac/avfoundation_glue.h b/media/base/mac/avfoundation_glue.h
|
| index 4072b53874dd9302d2ad3310585d0f68a9f8c048..a5b430412fdcfe3da37983f4d41fcdf19bbb0451 100644
|
| --- a/media/base/mac/avfoundation_glue.h
|
| +++ b/media/base/mac/avfoundation_glue.h
|
| @@ -2,9 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// TODO(mcasas): Remove this whole glue, https://crbug.com/579648. This glue was
|
| -// introduced to support Mac OS X <= 10.6 where AVFoundation was not available,
|
| -// and had to happen in runtime.
|
| +// AVFoundation API is only introduced in Mac OS X > 10.6, and there is only one
|
| +// build of Chromium, so the (potential) linking with AVFoundation has to happen
|
| +// in runtime. For this to be clean, an AVFoundationGlue class is defined to try
|
| +// and load these AVFoundation system libraries. If it succeeds, subsequent
|
| +// clients can use AVFoundation via the rest of the classes declared in this
|
| +// file.
|
|
|
| #ifndef MEDIA_BASE_MAC_AVFOUNDATION_GLUE_H_
|
| #define MEDIA_BASE_MAC_AVFOUNDATION_GLUE_H_
|
| @@ -48,7 +51,6 @@
|
|
|
| static Class AVCaptureSessionClass();
|
| static Class AVCaptureVideoDataOutputClass();
|
| - static Class AVCaptureStillImageOutputClass();
|
| #endif // defined(__OBJC__)
|
|
|
| private:
|
| @@ -93,9 +95,6 @@
|
|
|
| MEDIA_EXPORT
|
| @interface CrAVCaptureOutput : NSObject // Originally from AVCaptureOutput.h.
|
| -
|
| -- (NSArray*)connections;
|
| -
|
| @end
|
|
|
| // Originally AVCaptureSession and coming from AVCaptureSession.h.
|
| @@ -105,8 +104,6 @@
|
| - (void)release;
|
| - (void)addInput:(CrAVCaptureInput*)input;
|
| - (void)removeInput:(CrAVCaptureInput*)input;
|
| -- (NSArray*)outputs;
|
| -- (BOOL)canAddOutput:(CrAVCaptureOutput*)output;
|
| - (void)addOutput:(CrAVCaptureOutput*)output;
|
| - (void)removeOutput:(CrAVCaptureOutput*)output;
|
| - (BOOL)isRunning;
|
| @@ -159,17 +156,6 @@
|
|
|
| @end
|
|
|
| -// Originally AVCaptureStillImageOutput and coming from AVCaptureOutput.h.
|
| -MEDIA_EXPORT
|
| -@interface CrAVCaptureStillImageOutput : CrAVCaptureOutput
|
| -
|
| -typedef void (^CompletionHandler)(CoreMediaGlue::CMSampleBufferRef, NSError*);
|
| -- (void)
|
| -captureStillImageAsynchronouslyFromConnection:(CrAVCaptureConnection*)connection
|
| - completionHandler:(CompletionHandler)handler;
|
| -
|
| -@end
|
| -
|
| // Class to provide access to class methods of AVCaptureDevice.
|
| MEDIA_EXPORT
|
| @interface AVCaptureDeviceGlue : NSObject
|
|
|