Merge remote-tracking branch 'origin/master' into update-sources

+55 -9

src/frameworks/AVFoundation/constants.m

··· 18 18 */ 19 19 20 20 #import <Foundation/NSString.h> 21 + #import <AVFoundation/AVFoundation.h> 21 22 23 + NSString *const AVAssetExportPresetHighestQuality = @"AVAssetExportPresetHighestQuality"; 24 + NSString *const AVAssetExportPresetMediumQuality = @"AVAssetExportPresetMediumQuality"; 25 + NSString *const AVAssetExportPresetLowQuality = @"AVAssetExportPresetLowQuality"; 26 + NSString *const AVCaptureDeviceWasConnectedNotification = @"AVCaptureDeviceWasConnectedNotification"; 27 + NSString *const AVCaptureDeviceWasDisconnectedNotification = @"AVCaptureDeviceWasDisconnectedNotification"; 28 + NSString *const AVCaptureSessionDidStartRunningNotification = @"AVCaptureSessionDidStartRunningNotification"; 29 + NSString *const AVCaptureSessionDidStopRunningNotification = @"AVCaptureSessionDidStopRunningNotification"; 30 + NSString *const AVCaptureSessionErrorKey = @"AVCaptureSessionErrorKey"; 31 + NSString *const AVCaptureSessionRuntimeErrorNotification = @"AVCaptureSessionRuntimeErrorNotification"; 32 + NSString *const AVChannelLayoutKey = @"AVChannelLayoutKey"; 33 + NSString *const AVEncoderBitRateChannelKey = @"AVEncoderBitRatePerChannelKey"; 22 34 NSString *const AVErrorDeviceKey = @"AVErrorDeviceKey"; 23 35 NSString *const AVErrorFileSizeKey = @"AVErrorFileSizeKey"; 24 36 NSString *const AVErrorMediaSubTypeKey = @"AVErrorMediaSubTypeKey"; ··· 29 41 NSString *const AVErrorPresentationTimeStampKey = @"AVErrorPresentationTimeStampKey"; 30 42 NSString *const AVErrorPersistentTrackIDKey = @"AVErrorPersistentTrackIDKey"; 31 43 NSString *const AVErrorFileTypeKey = @"AVErrorFileTypeKey"; 32 - NSString *const AVFoundationErrorDomain = @"AVFoundationErrorDomain"; 33 - NSString *const AVCaptureDeviceWasConnectedNotification = @"AVCaptureDeviceWasConnectedNotification"; 34 - NSString *const AVCaptureDeviceWasDisconnectedNotification = @"AVCaptureDeviceWasDisconnectedNotification"; 35 - NSString *const AVCaptureSessionPreset1280x720 = @"AVCaptureSessionPreset1280x720"; 36 - NSString *const AVCaptureSessionPreset352x288 = @"AVCaptureSessionPreset352x288"; 37 - NSString *const AVCaptureSessionPreset640x480 = @"AVCaptureSessionPreset640x480"; 38 - NSString *const AVCaptureSessionPresetLow = @"AVCaptureSessionPresetLow"; 39 - NSString *const AVMediaTypeAudio = @"soun"; 40 - NSString *const AVMediaTypeVideo = @"vide"; 44 + NSString *const AVFormatIDKey = @"AVFormatIDKey"; 45 + NSString *const AVLinearPCMBitDepthKey = @"AVLinearPCMBitDepthKey"; 46 + NSString *const AVNumberOfChannelsKey = @"AVNumberOfChannelsKey"; 47 + NSString *const AVPlayerItemDidPlayToEndTimeNotification = @"AVPlayerItemFailedToPlayToEndTimeNotification"; 48 + NSString *const AVPlayerItemFailedToPlayToEndTimeNotification = @"AVPlayerItemPlaybackStalledNotification"; 49 + NSString *const AVSampleRateKey = @"AVSampleRateKey"; 50 + NSString *const AVURLAssetPreferPreciseDurationAndTimingKey = @"AVURLAssetPreferPreciseDurationAndTimingKey"; 51 + NSString *const AVVideoAverageBitRateKey = @"AverageBitRate"; 52 + NSString *const AVVideoCodecAppleProRes422 = @"apcn"; 53 + NSString *const AVVideoCodecAppleProRes4444 = @"ap4h"; 54 + NSString *const AVVideoCodecH264 = @"avc1"; 55 + NSString *const AVVideoCodecHEVC = @"hvc1"; 56 + NSString *const AVVideoCodecJPEG = @"jpeg"; 57 + NSString *const AVVideoCodecKey = @"AVVideoCodecKey"; 58 + NSString *const AVVideoCompressionPropertiesKey = @"AVVideoCompressionPropertiesKey"; 59 + NSString *const AVVideoHeightKey = @"AVVideoHeightKey"; 60 + NSString *const AVVideoMaxKeyFrameIntervalKey = @"MaxKeyFrameInterval"; 61 + NSString *const AVVideoWidthKey = @"AVVideoWidthKey"; 62 + 63 + const AVCaptureSessionPreset AVCaptureSessionPreset3840x2160 = @"AVCaptureSessionPreset3840x2160"; 64 + const AVCaptureSessionPreset AVCaptureSessionPreset1920x1080 = @"AVCaptureSessionPreset1920x1080"; 65 + const AVCaptureSessionPreset AVCaptureSessionPreset1280x720 = @"AVCaptureSessionPreset1280x720"; 66 + const AVCaptureSessionPreset AVCaptureSessionPreset960x540 = @"AVCaptureSessionPreset960x540"; 67 + const AVCaptureSessionPreset AVCaptureSessionPreset640x480 = @"AVCaptureSessionPreset640x480"; 68 + const AVCaptureSessionPreset AVCaptureSessionPreset352x288 = @"AVCaptureSessionPreset352x288"; 69 + const AVCaptureSessionPreset AVCaptureSessionPreset320x240 = @"AVCaptureSessionPreset320x240"; 70 + const AVCaptureSessionPreset AVCaptureSessionPresetiFrame1280x720 = @"AVCaptureSessionPresetiFrame1280x720"; 71 + const AVCaptureSessionPreset AVCaptureSessionPresetiFrame960x540 = @"AVCaptureSessionPresetiFrame960x540"; 72 + const AVCaptureSessionPreset AVCaptureSessionPresetHigh = @"AVCaptureSessionPresetHigh"; 73 + const AVCaptureSessionPreset AVCaptureSessionPresetLow = @"AVCaptureSessionPresetLow"; 74 + const AVCaptureSessionPreset AVCaptureSessionPresetMedium = @"AVCaptureSessionPresetMedium"; 75 + 76 + const NSErrorDomain AVFoundationErrorDomain = @"AVFoundationErrorDomain"; 77 + 78 + const AVFileType AVFileTypeMPEG4 = @"public.mpeg-4"; 79 + const AVFileType AVFileTypeQuickTimeMovie = @"com.apple.quicktime-movie"; 80 + 81 + const AVLayerVideoGravity AVLayerVideoGravityResize = @"AVLayerVideoGravityResize"; 82 + const AVLayerVideoGravity AVLayerVideoGravityResizeAspect = @"AVLayerVideoGravityResizeAspect"; 83 + const AVLayerVideoGravity AVLayerVideoGravityResizeAspectFill = @"AVLayerVideoGravityResizeAspectFill"; 84 + 85 + const AVMediaType AVMediaTypeAudio = @"soun"; 86 + const AVMediaType AVMediaTypeVideo = @"vide";

+7

src/frameworks/AVFoundation/include/AVFoundation/AVAnimation.h

··· 1 + #import <Foundation/Foundation.h> 2 + 3 + typedef NSString *AVLayerVideoGravity; 4 + 5 + const AVLayerVideoGravity AVLayerVideoGravityResize; 6 + const AVLayerVideoGravity AVLayerVideoGravityResizeAspect; 7 + const AVLayerVideoGravity AVLayerVideoGravityResizeAspectFill;

+2

src/frameworks/AVFoundation/include/AVFoundation/AVAsset.h

··· 19 19 20 20 #include <Foundation/Foundation.h> 21 21 22 + NSString *const AVURLAssetPreferPreciseDurationAndTimingKey; 23 + 22 24 @interface AVAsset : NSObject 23 25 24 26 @end

+4

src/frameworks/AVFoundation/include/AVFoundation/AVAssetExportSession.h

··· 19 19 20 20 #include <Foundation/Foundation.h> 21 21 22 + NSString *const AVAssetExportPresetHighestQuality; 23 + NSString *const AVAssetExportPresetMediumQuality; 24 + NSString *const AVAssetExportPresetLowQuality; 25 + 22 26 @interface AVAssetExportSession : NSObject 23 27 24 28 @end

+8

src/frameworks/AVFoundation/include/AVFoundation/AVAudioSettings.h

··· 1 + #import <Foundation/Foundation.h> 2 + 3 + NSString *const AVChannelLayoutKey; 4 + NSString *const AVEncoderBitRateChannelKey; 5 + NSString *const AVFormatIDKey; 6 + NSString *const AVLinearPCMBitDepthKey; 7 + NSString *const AVNumberOfChannelsKey; 8 + NSString *const AVSampleRateKey;

+22

src/frameworks/AVFoundation/include/AVFoundation/AVCaptureSession.h

··· 19 19 20 20 #include <Foundation/Foundation.h> 21 21 22 + typedef NSString *AVCaptureSessionPreset; 23 + 24 + NSString *const AVCaptureDeviceWasConnectedNotification; 25 + NSString *const AVCaptureDeviceWasDisconnectedNotification; 26 + NSString *const AVCaptureSessionDidStartRunningNotification; 27 + NSString *const AVCaptureSessionDidStopRunningNotification; 28 + NSString *const AVCaptureSessionErrorKey; 29 + NSString *const AVCaptureSessionRuntimeErrorNotification; 30 + 31 + const AVCaptureSessionPreset AVCaptureSessionPreset3840x2160; 32 + const AVCaptureSessionPreset AVCaptureSessionPreset1920x1080; 33 + const AVCaptureSessionPreset AVCaptureSessionPreset1280x720; 34 + const AVCaptureSessionPreset AVCaptureSessionPreset960x540; 35 + const AVCaptureSessionPreset AVCaptureSessionPreset640x480; 36 + const AVCaptureSessionPreset AVCaptureSessionPreset352x288; 37 + const AVCaptureSessionPreset AVCaptureSessionPreset320x240; 38 + const AVCaptureSessionPreset AVCaptureSessionPresetiFrame1280x720; 39 + const AVCaptureSessionPreset AVCaptureSessionPresetiFrame960x540; 40 + const AVCaptureSessionPreset AVCaptureSessionPresetHigh; 41 + const AVCaptureSessionPreset AVCaptureSessionPresetLow; 42 + const AVCaptureSessionPreset AVCaptureSessionPresetMedium; 43 + 22 44 @interface AVCaptureSession : NSObject 23 45 24 46 @end

+14

src/frameworks/AVFoundation/include/AVFoundation/AVError.h

··· 1 + #import <Foundation/Foundation.h> 2 + 3 + const NSErrorDomain AVFoundationErrorDomain; 4 + 5 + NSString *const AVErrorDeviceKey; 6 + NSString *const AVErrorFileSizeKey; 7 + NSString *const AVErrorMediaSubTypeKey; 8 + NSString *const AVErrorMediaTypeKey; 9 + NSString *const AVErrorTimeKey; 10 + NSString *const AVErrorPIDKey; 11 + NSString *const AVErrorRecordingSuccessfullyFinishedKey; 12 + NSString *const AVErrorPresentationTimeStampKey; 13 + NSString *const AVErrorPersistentTrackIDKey; 14 + NSString *const AVErrorFileTypeKey;

+5

src/frameworks/AVFoundation/include/AVFoundation/AVFoundation.h

··· 572 572 #import <AVFoundation/AVCameraCalibrationDataInternal.h> 573 573 #import <AVFoundation/AVCameraCalibrationData.h> 574 574 #import <AVFoundation/AVCaptionOutputSettings.h> 575 + #import <AVFoundation/AVError.h> 576 + #import <AVFoundation/AVMediaFormat.h> 577 + #import <AVFoundation/AVAudioSettings.h> 578 + #import <AVFoundation/AVAnimation.h> 579 + #import <AVFoundation/AVVideoSettings.h> 575 580 576 581 void* AVMakeRectWithAspectRatioInsideRect(void); 577 582 void* AVMediaSubtypesForAC3(void);

+10

src/frameworks/AVFoundation/include/AVFoundation/AVMediaFormat.h

··· 1 + #import <Foundation/Foundation.h> 2 + 3 + typedef NSString *AVMediaType; 4 + typedef NSString *AVFileType; 5 + 6 + const AVMediaType AVMediaTypeAudio; 7 + const AVMediaType AVMediaTypeVideo; 8 + 9 + const AVFileType AVFileTypeMPEG4; 10 + const AVFileType AVFileTypeQuickTimeMovie;

+2

src/frameworks/AVFoundation/include/AVFoundation/AVPlayerItem.h

··· 19 19 20 20 #include <Foundation/Foundation.h> 21 21 22 + NSString *const AVPlayerItemDidPlayToEndTimeNotification; 23 + 22 24 @interface AVPlayerItem : NSObject 23 25 24 26 @end

+12

src/frameworks/AVFoundation/include/AVFoundation/AVVideoSettings.h

··· 1 + #import <Foundation/Foundation.h> 2 + 3 + NSString *const AVVideoAverageBitRateKey; 4 + NSString *const AVVideoCodecAppleProRes422; 5 + NSString *const AVVideoCodecAppleProRes4444; 6 + NSString *const AVVideoCodecH264; 7 + NSString *const AVVideoCodecHEVC; 8 + NSString *const AVVideoCodecJPEG; 9 + NSString *const AVVideoCodecKey; 10 + NSString *const AVVideoCompressionPropertiesKey; 11 + NSString *const AVVideoHeightKey; 12 + NSString *const AVVideoWidthKey;

+1

src/frameworks/AVKit/CMakeLists.txt

··· 179 179 system 180 180 objc 181 181 Foundation 182 + AppKit 182 183 )

+4 -1

src/frameworks/AVKit/include/AVKit/AVPlayerView.h

··· 18 18 */ 19 19 20 20 #include <Foundation/Foundation.h> 21 + #include <AppKit/AppKit.h> 22 + 23 + @interface AVPlayerView : NSView 21 24 22 - @interface AVPlayerView : NSObject 25 + -(id)initWithCoder:(NSCoder *) decoder; 23 26 24 27 @end

+5

src/frameworks/AVKit/src/AVPlayerView.m

··· 21 21 22 22 @implementation AVPlayerView 23 23 24 + -(id)initWithCoder:(NSCoder *) decoder { 25 + self = [super initWithCoder: decoder]; 26 + return self; 27 + } 28 + 24 29 - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector 25 30 { 26 31 return [NSMethodSignature signatureWithObjCTypes: "v@:"];

Configure Feed

Configure Feed