media/base/mac/coremedia_glue.h - Issue 860333003: Mac Video Capture: Add support for pixel format NV12 for AVFoundation

Side by Side Diff: media/base/mac/coremedia_glue.h

Issue 860333003: Mac Video Capture: Add support for pixel format NV12 for AVFoundation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 months 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 unified diff | Download patch

« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_avfoundation_mac.mm » ('j') | media/video/capture/mac/video_capture_device_avfoundation_mac.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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',
	mcasas 2015/01/28 20:17:01 \|kCMPixelFormat_422YpCbCr8_yuvs\| comes from CMForm \|kCMPixelFormat_422YpCbCr8_yuvs\| comes from CMFormatDescription.h but the formats in l.51 and 52 don't , they are called \|kCVPixelFormat_...\| and come from CVPixelBuffer, which is part of another framework, the CoreVideo. Please correct and move to [1], as matter of fact half the work is done [2]. [1] https://code.google.com/p/chromium/codesearch#chromium/src/media/base/mac/cor... [2] https://code.google.com/p/chromium/codesearch#chromium/src/media/base/mac/cor... magjed_chromium 2015/01/29 13:42:17 Acknowledged. I changed so that I only add support Show quoted text On 2015/01/28 20:17:01, mcasas wrote: > \|kCMPixelFormat_422YpCbCr8_yuvs\| comes from CMFormatDescription.h > but the formats in l.51 and 52 don't , they are called > \|kCVPixelFormat_...\| and come from CVPixelBuffer, which is part > of another framework, the CoreVideo. Please correct and move to > [1], as matter of fact half the work is done [2]. > > [1] > https://code.google.com/p/chromium/codesearch#chromium/src/media/base/mac/cor... > [2] > https://code.google.com/p/chromium/codesearch#chromium/src/media/base/mac/cor... Acknowledged. I changed so that I only add support for video range in this CL, since I haven't found any device that enumerates '420f' to test with.
	52 kCMPixelFormat_420YpCbCr8BiPlanarFullRange = '420f',

51 };	53 };

52 enum {	54 enum {

53 kCMVideoCodecType_JPEG_OpenDML = 'dmb1',	55 kCMVideoCodecType_JPEG_OpenDML = 'dmb1',

54 kCMVideoCodecType_H264 = 'avc1',	56 kCMVideoCodecType_H264 = 'avc1',

55 };	57 };

56	58

57 // Originally from CMFormatDescriptionBridge.h	59 // Originally from CMFormatDescriptionBridge.h

58 enum {	60 enum {

59 kCMFormatDescriptionBridgeError_InvalidParameter = -12712,	61 kCMFormatDescriptionBridgeError_InvalidParameter = -12712,

60 };	62 };

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 size_t* parameterSetSizeOut,	110 size_t* parameterSetSizeOut,

109 size_t* parameterSetCountOut,	111 size_t* parameterSetCountOut,

110 int* NALUnitHeaderLengthOut)	112 int* NALUnitHeaderLengthOut)

111 /__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)/;	113 /__OSX_AVAILABLE_STARTING(__MAC_10_9,__IPHONE_7_0)/;

112	114

113 private:	115 private:

114 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue);	116 DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue);

115 };	117 };

116	118

117 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_	119 #endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_

OLD	NEW