| 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 #include <stddef.h> | 9 #include <stddef.h> |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 typedef CMFormatDescriptionRef CMVideoFormatDescriptionRef; | 45 typedef CMFormatDescriptionRef CMVideoFormatDescriptionRef; |
| 46 typedef FourCharCode CMVideoCodecType; | 46 typedef FourCharCode CMVideoCodecType; |
| 47 typedef struct { | 47 typedef struct { |
| 48 int32_t width; | 48 int32_t width; |
| 49 int32_t height; | 49 int32_t height; |
| 50 } CMVideoDimensions; | 50 } CMVideoDimensions; |
| 51 enum { | 51 enum { |
| 52 kCMPixelFormat_422YpCbCr8_yuvs = 'yuvs', | 52 kCMPixelFormat_422YpCbCr8_yuvs = 'yuvs', |
| 53 }; | 53 }; |
| 54 enum { | 54 enum { |
| 55 kCMVideoCodecType_JPEG = 'jpeg', |
| 55 kCMVideoCodecType_JPEG_OpenDML = 'dmb1', | 56 kCMVideoCodecType_JPEG_OpenDML = 'dmb1', |
| 56 kCMVideoCodecType_H264 = 'avc1', | 57 kCMVideoCodecType_H264 = 'avc1', |
| 57 }; | 58 }; |
| 58 | 59 |
| 59 // Originally from CMFormatDescriptionBridge.h | 60 // Originally from CMFormatDescriptionBridge.h |
| 60 enum { | 61 enum { |
| 61 kCMFormatDescriptionBridgeError_InvalidParameter = -12712, | 62 kCMFormatDescriptionBridgeError_InvalidParameter = -12712, |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 // Originally from CMSampleBuffer.h. | 65 // Originally from CMSampleBuffer.h. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 size_t* parameterSetSizeOut, | 112 size_t* parameterSetSizeOut, |
| 112 size_t* parameterSetCountOut, | 113 size_t* parameterSetCountOut, |
| 113 int* NALUnitHeaderLengthOut) | 114 int* NALUnitHeaderLengthOut) |
| 114 /*__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)*/; | 115 /*__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)*/; |
| 115 | 116 |
| 116 private: | 117 private: |
| 117 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue); | 118 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue); |
| 118 }; | 119 }; |
| 119 | 120 |
| 120 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ | 121 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_ |
| OLD | NEW |