| Index: media/base/mac/videotoolbox_glue.h
|
| diff --git a/media/base/mac/videotoolbox_glue.h b/media/base/mac/videotoolbox_glue.h
|
| index 9a978bf09da268f3146bd379be91fe92a4f71db2..212722a08d13c1e5a4e6a38f5841ba330b7d5edb 100644
|
| --- a/media/base/mac/videotoolbox_glue.h
|
| +++ b/media/base/mac/videotoolbox_glue.h
|
| @@ -11,13 +11,11 @@
|
| #include "media/base/mac/coremedia_glue.h"
|
| #include "media/base/media_export.h"
|
|
|
| -// VideoToolbox API is available in and after OS X 10.9 and iOS 8 (10.8 has
|
| -// support for software encoding, but this class exposes the 10.9 API level).
|
| -// Chromium requires OS X 10.9 or iOS 9. This class is defined to try and load
|
| -// the VideoToolbox library at runtime. If it succeeds, clients can use
|
| -// VideoToolbox via this class.
|
| -// Note that this file is necessary because Chromium still targets OS X 10.6 for
|
| -// deployment. It should be deprecated soon, see crbug.com/579648.
|
| +// VideoToolbox API is available in OS X 10.9 and iOS 8 (10.8 has support for
|
| +// software encoding, but this class exposes the 10.9 API level). Chromium
|
| +// requires OS X 10.6 or iOS 6. Linking with VideoToolbox therefore has to
|
| +// happen at runtime. This class is defined to try and load the VideoToolbox
|
| +// library. If it succeeds, clients can use VideoToolbox via this class.
|
| class MEDIA_EXPORT VideoToolboxGlue {
|
| public:
|
| class Loader;
|
| @@ -51,7 +49,6 @@
|
| CFStringRef kVTCompressionPropertyKey_AllowFrameReordering() const;
|
| CFStringRef kVTCompressionPropertyKey_AverageBitRate() const;
|
| CFStringRef kVTCompressionPropertyKey_ColorPrimaries() const;
|
| - CFStringRef kVTCompressionPropertyKey_DataRateLimits() const;
|
| CFStringRef kVTCompressionPropertyKey_ExpectedFrameRate() const;
|
| CFStringRef kVTCompressionPropertyKey_MaxFrameDelayCount() const;
|
| CFStringRef kVTCompressionPropertyKey_MaxKeyFrameInterval() const;
|
| @@ -71,8 +68,6 @@
|
| CFStringRef
|
| kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder()
|
| const;
|
| - CFStringRef
|
| - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder() const;
|
|
|
| // Originally from VTCompressionSession.h
|
| OSStatus VTCompressionSessionCreate(
|
|
|