| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ | 5 #ifndef MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ |
| 6 #define MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ | 6 #define MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ |
| 7 | 7 |
| 8 #include <CoreVideo/CoreVideo.h> | 8 #include <CoreVideo/CoreVideo.h> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 // Originally from CMFormatDescription.h. | 41 // Originally from CMFormatDescription.h. |
| 42 typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef; | 42 typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef; |
| 43 typedef CMFormatDescriptionRef CMVideoFormatDescriptionRef; | 43 typedef CMFormatDescriptionRef CMVideoFormatDescriptionRef; |
| 44 typedef FourCharCode CMVideoCodecType; | 44 typedef FourCharCode CMVideoCodecType; |
| 45 typedef struct { | 45 typedef struct { |
| 46 int32_t width; | 46 int32_t width; |
| 47 int32_t height; | 47 int32_t height; |
| 48 } CMVideoDimensions; | 48 } CMVideoDimensions; |
| 49 enum { | 49 enum { |
| 50 kCMPixelFormat_422YpCbCr8_yuvs = 'yuvs', | 50 kCMPixelFormat_422YpCbCr8_yuvs = 'yuvs', |
| 51 kCMPixelFormat_420YpCbCr8BiPlanarVideoRange = '420v', | |
| 52 }; | 51 }; |
| 53 enum { | 52 enum { |
| 54 kCMVideoCodecType_JPEG_OpenDML = 'dmb1', | 53 kCMVideoCodecType_JPEG_OpenDML = 'dmb1', |
| 55 kCMVideoCodecType_H264 = 'avc1', | 54 kCMVideoCodecType_H264 = 'avc1', |
| 56 }; | 55 }; |
| 57 | 56 |
| 58 // Originally from CMFormatDescriptionBridge.h | 57 // Originally from CMFormatDescriptionBridge.h |
| 59 enum { | 58 enum { |
| 60 kCMFormatDescriptionBridgeError_InvalidParameter = -12712, | 59 kCMFormatDescriptionBridgeError_InvalidParameter = -12712, |
| 61 }; | 60 }; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 size_t* parameterSetSizeOut, | 108 size_t* parameterSetSizeOut, |
| 110 size_t* parameterSetCountOut, | 109 size_t* parameterSetCountOut, |
| 111 int* NALUnitHeaderLengthOut) | 110 int* NALUnitHeaderLengthOut) |
| 112 /*__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)*/; | 111 /*__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)*/; |
| 113 | 112 |
| 114 private: | 113 private: |
| 115 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue); | 114 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue); |
| 116 }; | 115 }; |
| 117 | 116 |
| 118 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ | 117 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ |
| OLD | NEW |