Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: media/base/mac/avfoundation_glue.h

Issue 2529493002: mac: Remove more media/base/mac glue unneeded now that we target 10.9 (Closed)
Patch Set: . Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mac/BUILD.gn ('k') | media/base/mac/avfoundation_glue.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mac/avfoundation_glue.h
diff --git a/media/base/mac/avfoundation_glue.h b/media/base/mac/avfoundation_glue.h
deleted file mode 100644
index 4072b53874dd9302d2ad3310585d0f68a9f8c048..0000000000000000000000000000000000000000
--- a/media/base/mac/avfoundation_glue.h
+++ /dev/null
@@ -1,194 +0,0 @@
-// 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.
-
-// 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.
-
-#ifndef MEDIA_BASE_MAC_AVFOUNDATION_GLUE_H_
-#define MEDIA_BASE_MAC_AVFOUNDATION_GLUE_H_
-
-#if defined(__OBJC__)
-#import <Foundation/Foundation.h>
-#endif // defined(__OBJC__)
-
-#include <stdint.h>
-
-#include "base/macros.h"
-#include "media/base/mac/coremedia_glue.h"
-#include "media/base/media_export.h"
-
-class MEDIA_EXPORT AVFoundationGlue {
- public:
- // Must be called on the UI thread prior to attempting to use any other
- // AVFoundation methods.
- static void InitializeAVFoundation();
-
-#if defined(__OBJC__)
- static NSBundle const* AVFoundationBundle();
-
- // Originally coming from AVCaptureDevice.h but in global namespace.
- static NSString* AVCaptureDeviceWasConnectedNotification();
- static NSString* AVCaptureDeviceWasDisconnectedNotification();
-
- // Originally coming from AVMediaFormat.h but in global namespace.
- static NSString* AVMediaTypeVideo();
- static NSString* AVMediaTypeAudio();
- static NSString* AVMediaTypeMuxed();
-
- // Originally from AVCaptureSession.h but in global namespace.
- static NSString* AVCaptureSessionRuntimeErrorNotification();
- static NSString* AVCaptureSessionDidStopRunningNotification();
- static NSString* AVCaptureSessionErrorKey();
-
- // Originally from AVVideoSettings.h but in global namespace.
- static NSString* AVVideoScalingModeKey();
- static NSString* AVVideoScalingModeResizeAspectFill();
-
- static Class AVCaptureSessionClass();
- static Class AVCaptureVideoDataOutputClass();
- static Class AVCaptureStillImageOutputClass();
-#endif // defined(__OBJC__)
-
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(AVFoundationGlue);
-};
-
-#if defined(__OBJC__)
-
-// Originally AVCaptureDevice and coming from AVCaptureDevice.h
-MEDIA_EXPORT
-@interface CrAVCaptureDevice : NSObject
-
-- (BOOL)hasMediaType:(NSString*)mediaType;
-- (NSString*)uniqueID;
-- (NSString*)localizedName;
-- (BOOL)isSuspended;
-- (NSArray*)formats;
-- (int32_t)transportType;
-
-@end
-
-// Originally AVCaptureDeviceFormat and coming from AVCaptureDevice.h.
-MEDIA_EXPORT
-@interface CrAVCaptureDeviceFormat : NSObject
-
-- (CoreMediaGlue::CMFormatDescriptionRef)formatDescription;
-- (NSArray*)videoSupportedFrameRateRanges;
-
-@end
-
-// Originally AVFrameRateRange and coming from AVCaptureDevice.h.
-MEDIA_EXPORT
-@interface CrAVFrameRateRange : NSObject
-
-- (Float64)maxFrameRate;
-
-@end
-
-MEDIA_EXPORT
-@interface CrAVCaptureInput : NSObject // Originally from AVCaptureInput.h.
-@end
-
-MEDIA_EXPORT
-@interface CrAVCaptureOutput : NSObject // Originally from AVCaptureOutput.h.
-
-- (NSArray*)connections;
-
-@end
-
-// Originally AVCaptureSession and coming from AVCaptureSession.h.
-MEDIA_EXPORT
-@interface CrAVCaptureSession : NSObject
-
-- (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;
-- (void)startRunning;
-- (void)stopRunning;
-
-@end
-
-// Originally AVCaptureConnection and coming from AVCaptureSession.h.
-MEDIA_EXPORT
-@interface CrAVCaptureConnection : NSObject
-
-- (BOOL)isVideoMinFrameDurationSupported;
-- (void)setVideoMinFrameDuration:(CoreMediaGlue::CMTime)minFrameRate;
-- (BOOL)isVideoMaxFrameDurationSupported;
-- (void)setVideoMaxFrameDuration:(CoreMediaGlue::CMTime)maxFrameRate;
-
-@end
-
-// Originally AVCaptureDeviceInput and coming from AVCaptureInput.h.
-MEDIA_EXPORT
-@interface CrAVCaptureDeviceInput : CrAVCaptureInput
-
-@end
-
-// Originally AVCaptureVideoDataOutputSampleBufferDelegate from
-// AVCaptureOutput.h.
-@protocol CrAVCaptureVideoDataOutputSampleBufferDelegate <NSObject>
-
-@optional
-
-- (void)captureOutput:(CrAVCaptureOutput*)captureOutput
-didOutputSampleBuffer:(CoreMediaGlue::CMSampleBufferRef)sampleBuffer
- fromConnection:(CrAVCaptureConnection*)connection;
-
-@end
-
-// Originally AVCaptureVideoDataOutput and coming from AVCaptureOutput.h.
-MEDIA_EXPORT
-@interface CrAVCaptureVideoDataOutput : CrAVCaptureOutput
-
-- (oneway void)release;
-- (void)setSampleBufferDelegate:(id)sampleBufferDelegate
- queue:(dispatch_queue_t)sampleBufferCallbackQueue;
-
-- (void)setAlwaysDiscardsLateVideoFrames:(BOOL)flag;
-- (void)setVideoSettings:(NSDictionary*)videoSettings;
-- (NSDictionary*)videoSettings;
-- (CrAVCaptureConnection*)connectionWithMediaType:(NSString*)mediaType;
-
-@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
-
-+ (NSArray*)devices;
-
-+ (CrAVCaptureDevice*)deviceWithUniqueID:(NSString*)deviceUniqueID;
-
-@end
-
-// Class to provide access to class methods of AVCaptureDeviceInput.
-MEDIA_EXPORT
-@interface AVCaptureDeviceInputGlue : NSObject
-
-+ (CrAVCaptureDeviceInput*)deviceInputWithDevice:(CrAVCaptureDevice*)device
- error:(NSError**)outError;
-
-@end
-
-#endif // defined(__OBJC__)
-
-#endif // MEDIA_BASE_MAC_AVFOUNDATION_GLUE_H_
« no previous file with comments | « media/base/mac/BUILD.gn ('k') | media/base/mac/avfoundation_glue.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698