Skip to content

Commit 39612f7

Browse files
committed
Merge pull request #7 from phracker/MacOSX10.11_15A278
Update MacOSX10.11.sdk to 15A278
2 parents b995db1 + 493e2f9 commit 39612f7

File tree

4,054 files changed

+37393
-47740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,054 files changed

+37393
-47740
lines changed

MacOSX10.11.sdk/System/Library/CoreServices/SystemVersion.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>ProductBuildVersion</key>
6-
<string>15A178w</string>
6+
<string>15A278</string>
77
<key>ProductCopyright</key>
88
<string>1983-2015 Apple Inc.</string>
99
<key>ProductName</key>

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/AVFoundation.tbd

Lines changed: 160 additions & 129 deletions
Large diffs are not rendered by default.

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAsset.h

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
#import <Foundation/Foundation.h>
1212
#import <AVFoundation/AVAsynchronousKeyValueLoading.h>
1313

14-
#if TARGET_OS_IPHONE
1514
#import <CoreGraphics/CGAffineTransform.h>
16-
#else // ! TARGET_OS_IPHONE
17-
#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h>
18-
#endif // ! TARGET_OS_IPHONE
1915

2016
#import <CoreMedia/CMTime.h>
2117

@@ -156,7 +152,9 @@ typedef NS_OPTIONS(NSUInteger, AVAssetReferenceRestrictions) {
156152

157153
@interface AVAsset (AVAssetTrackInspection)
158154

159-
/* provides the array of AVAssetTracks contained by the asset
155+
/*!
156+
@property tracks
157+
@abstract Provides the array of AVAssetTracks contained by the asset
160158
*/
161159
@property (nonatomic, readonly) NSArray<AVAssetTrack *> *tracks;
162160

@@ -603,6 +601,7 @@ AVF_EXPORT NSString *const AVAssetMediaSelectionGroupsDidChangeNotification NS_A
603601
NS_CLASS_AVAILABLE_MAC(10_11)
604602
@interface AVFragmentedAsset : AVURLAsset <AVFragmentMinding>
605603
{
604+
@private
606605
AVFragmentedAssetInternal *_fragmentedAsset;
607606
}
608607

@@ -626,6 +625,40 @@ NS_CLASS_AVAILABLE_MAC(10_11)
626625

627626
@end
628627

628+
@interface AVFragmentedAsset (AVFragmentedAssetTrackInspection)
629+
630+
/*!
631+
@method trackWithTrackID:
632+
@abstract Provides an instance of AVFragmentedAssetTrack that represents the track of the specified trackID.
633+
@param trackID
634+
The trackID of the requested AVFragmentedAssetTrack.
635+
@result An instance of AVFragmentedAssetTrack; may be nil if no track of the specified trackID is available.
636+
@discussion Becomes callable without blocking when the key @"tracks" has been loaded
637+
*/
638+
- (nullable AVFragmentedAssetTrack *)trackWithTrackID:(CMPersistentTrackID)trackID;
639+
640+
/*!
641+
@method tracksWithMediaType:
642+
@abstract Provides an array of AVFragmentedAssetTracks of the asset that present media of the specified media type.
643+
@param mediaType
644+
The media type according to which the receiver filters its AVFragmentedAssetTracks. (Media types are defined in AVMediaFormat.h)
645+
@result An NSArray of AVFragmentedAssetTracks; may be empty if no tracks of the specified media type are available.
646+
@discussion Becomes callable without blocking when the key @"tracks" has been loaded
647+
*/
648+
- (NSArray<AVFragmentedAssetTrack *> *)tracksWithMediaType:(NSString *)mediaType;
649+
650+
/*!
651+
@method tracksWithMediaCharacteristic:
652+
@abstract Provides an array of AVFragmentedAssetTracks of the asset that present media with the specified characteristic.
653+
@param mediaCharacteristic
654+
The media characteristic according to which the receiver filters its AVFragmentedAssetTracks. (Media characteristics are defined in AVMediaFormat.h)
655+
@result An NSArray of AVFragmentedAssetTracks; may be empty if no tracks with the specified characteristic are available.
656+
@discussion Becomes callable without blocking when the key @"tracks" has been loaded
657+
*/
658+
- (NSArray<AVFragmentedAssetTrack *> *)tracksWithMediaCharacteristic:(NSString *)mediaCharacteristic;
659+
660+
@end
661+
629662
#pragma mark --- AVFragmentedAssetMinder ---
630663
/*!
631664
@class AVFragmentedAssetMinder

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAssetExportSession.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
#import <CoreMedia/CMTimeRange.h>
1515

1616
// for CGSize
17-
#if TARGET_OS_IPHONE
1817
#import <CoreGraphics/CoreGraphics.h>
19-
#else // ! TARGET_OS_IPHONE
20-
#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CoreGraphics.h>
21-
#endif // ! TARGET_OS_IPHONE
2218

2319
NS_ASSUME_NONNULL_BEGIN
2420

@@ -56,17 +52,13 @@ NS_ASSUME_NONNULL_BEGIN
5652
// -- Export Preset Names --
5753

5854

59-
#if TARGET_OS_IPHONE
60-
6155
/* These export options can be used to produce movie files with video size appropriate to the device.
6256
The export will not scale the video up from a smaller size. The video will be compressed using
6357
H.264 and the audio will be compressed using AAC. */
6458

65-
AVF_EXPORT NSString *const AVAssetExportPresetLowQuality NS_AVAILABLE_IOS(4_0);
66-
AVF_EXPORT NSString *const AVAssetExportPresetMediumQuality NS_AVAILABLE_IOS(4_0);
67-
AVF_EXPORT NSString *const AVAssetExportPresetHighestQuality NS_AVAILABLE_IOS(4_0);
68-
69-
#endif // TARGET_OS_IPHONE
59+
AVF_EXPORT NSString *const AVAssetExportPresetLowQuality NS_AVAILABLE(10_11, 4_0);
60+
AVF_EXPORT NSString *const AVAssetExportPresetMediumQuality NS_AVAILABLE(10_11, 4_0);
61+
AVF_EXPORT NSString *const AVAssetExportPresetHighestQuality NS_AVAILABLE(10_11, 4_0);
7062

7163
/* These export options can be used to produce movie files with the specified video size.
7264
The export will not scale the video up from a smaller size. The video will be compressed using
@@ -75,7 +67,7 @@ AVF_EXPORT NSString *const AVAssetExportPreset640x480 NS_AVAILABLE(10_7, 4_0);
7567
AVF_EXPORT NSString *const AVAssetExportPreset960x540 NS_AVAILABLE(10_7, 4_0);
7668
AVF_EXPORT NSString *const AVAssetExportPreset1280x720 NS_AVAILABLE(10_7, 4_0);
7769
AVF_EXPORT NSString *const AVAssetExportPreset1920x1080 NS_AVAILABLE(10_7, 5_0);
78-
AVF_EXPORT NSString *const AVAssetExportPreset3840x2160 NS_AVAILABLE(10_10, NA);
70+
AVF_EXPORT NSString *const AVAssetExportPreset3840x2160 NS_AVAILABLE(10_10, 9_0);
7971

8072
/* This export option will produce an audio-only .m4a file with appropriate iTunes gapless playback data */
8173
AVF_EXPORT NSString *const AVAssetExportPresetAppleM4A NS_AVAILABLE(10_7, 4_0);

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAssetImageGenerator.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
#import <Foundation/Foundation.h>
2323
#import <CoreMedia/CMTime.h>
2424

25-
#if TARGET_OS_IPHONE
2625
#import <CoreGraphics/CoreGraphics.h>
27-
#else // ! TARGET_OS_IPHONE
28-
#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CoreGraphics.h>
29-
#endif // ! TARGET_OS_IPHONE
3026

3127
@class AVAsset;
3228
@class AVVideoComposition;

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAssetResourceLoader.h

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/*!
1111
@class AVAssetResourceLoader
1212
13-
@abstract An AVAssetResourceLoader mediates requests to load resources required by an AVURLAsset by asking a delegate object that you provide for assistance. When a resource is required that cannot be loaded by the AVURLAsset itself, the resource loader makes a request of its delegate to load it and proceeds according to the delegates response.
13+
@abstract An AVAssetResourceLoader mediates requests to load resources required by an AVURLAsset by asking a delegate object that you provide for assistance. When a resource is required that cannot be loaded by the AVURLAsset itself, the resource loader makes a request of its delegate to load it and proceeds according to the delegate's response.
1414
1515
@discussion
1616
You should not create resource loader objects. Instead, you should retrieve a resource loader from the resourceLoader property of an AVURLAsset and use it to assign your delegate object for resource loading.
@@ -208,7 +208,7 @@ AV_INIT_UNAVAILABLE
208208
/*!
209209
@method finishLoading
210210
@abstract Causes the receiver to treat the processing of the request as complete.
211-
@discussion If a dataRequest is present and the resource does not contain the full extent of the data that has been requested according to the values of the requestedOffset and requestedLength properties of the dataRequest, you may invoke -finishLoading after you have provided as much of the requested data as the resource contains.
211+
@discussion If a dataRequest is present and the resource does not contain the full extent of the data that has been requested according to the values of the requestedOffset and requestedLength properties of the dataRequest, or if requestsAllDataToEndOfResource has a value of YES, you may invoke -finishLoading after you have provided as much of the requested data as the resource contains.
212212
*/
213213
- (void)finishLoading NS_AVAILABLE(10_9, 7_0);
214214

@@ -244,7 +244,7 @@ NS_CLASS_AVAILABLE(10_10, 8_0)
244244
@discussion
245245
When a resource loading delegate accepts responsibility for loading a resource by returning YES from its implementation of resourceLoader:shouldWaitForLoadingOfRequestedResource:, it must check whether the contentInformationRequest property of the AVAssetResourceLoadingRequest is not nil. Whenever the value is not nil, the request includes a query for the information that AVAssetResourceLoadingContentInformationRequest encapsulates. In response to such queries, the resource loading delegate should set the values of the content information request's properties appropriately before invoking the AVAssetResourceLoadingRequest method finishLoading.
246246
247-
When finishLoading is invoked, the values of the properties of its contentInformationRequest property will, in part, determine how the requested resource is processed. For example, if the requested resources URL is the URL of an AVURLAsset and contentType is set by the resource loading delegate to a value that the underlying media system doesnt recognize as a supported media file type, operations on the AVURLAsset, such as playback, are likely to fail.
247+
When finishLoading is invoked, the values of the properties of its contentInformationRequest property will, in part, determine how the requested resource is processed. For example, if the requested resource's URL is the URL of an AVURLAsset and contentType is set by the resource loading delegate to a value that the underlying media system doesn't recognize as a supported media file type, operations on the AVURLAsset, such as playback, are likely to fail.
248248
*/
249249

250250
@class AVAssetResourceLoadingContentInformationRequestInternal;
@@ -317,10 +317,19 @@ AV_INIT_UNAVAILABLE
317317
/*!
318318
@property requestedLength
319319
@abstract The length of the data requested.
320-
@discussion If the content length of the resource is not precisely known, the sum of requestedLength and requestedOffset may be greater than the actual content length of the resource. When this occurs, you should attempt to provide as much of the requested data from the requestedOffset as the resource contains before invoking either -finishLoading (if you succeed) or -finishLoadingWithError: (if you encounter a failure in the course of providing the data).
320+
@discussion Note that requestsAllDataToEndOfResource will be set to YES when the entire remaining length of the resource is being requested from requestedOffset to the end of the resource. This can occur even when the content length has not yet been reported by you via a prior finished loading request.
321+
When requestsAllDataToEndOfResource has a value of YES, you should disregard the value of requestedLength and incrementally provide as much data starting from the requestedOffset as the resource contains, until you have provided all of the available data successfully and invoked -finishLoading, until you have encountered a failure and invoked -finishLoadingWithError:, or until you have received -resourceLoader:didCancelLoadingRequest: for the AVAssetResourceLoadingRequest from which the AVAssetResourceLoadingDataRequest was obtained.
322+
When requestsAllDataToEndOfResource is YES and the content length has not yet been provided by you via a prior finished loading request, the value of requestedLength is set to NSIntegerMax. Starting in OS X 10.11 and iOS 9.0, in 32-bit applications requestedLength is also set to NSIntegerMax when all of the remaining resource data is being requested and the known length of the remaining data exceeds NSIntegerMax.
321323
*/
322324
@property (nonatomic, readonly) NSInteger requestedLength;
323325

326+
/*!
327+
@property requestsAllDataToEndOfResource
328+
@abstract Specifies that the entire remaining length of the resource from requestedOffset to the end of the resource is being requested.
329+
@discussion When requestsAllDataToEndOfResource has a value of YES, you should disregard the value of requestedLength and incrementally provide as much data starting from the requestedOffset as the resource contains, until you have provided all of the available data successfully and invoked -finishLoading, until you have encountered a failure and invoked -finishLoadingWithError:, or until you have received -resourceLoader:didCancelLoadingRequest: for the AVAssetResourceLoadingRequest from which the AVAssetResourceLoadingDataRequest was obtained.
330+
*/
331+
@property (nonatomic, readonly) BOOL requestsAllDataToEndOfResource NS_AVAILABLE(10_11, 9_0);
332+
324333
/*!
325334
@property currentOffset
326335
@abstract The position within the resource of the next byte within the resource following the bytes that have already been provided via prior invocations of -respondWithData.

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAssetTrack.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,11 @@ AV_INIT_UNAVAILABLE
132132

133133
@interface AVAssetTrack (AVAssetTrackPropertiesForFrameBasedCharacteristic)
134134

135-
/* indicates the frame rate of the track, in units of frames per second */
135+
/*!
136+
@property nominalFrameRate
137+
@abstract For tracks that carry a full frame per media sample, indicates the frame rate of the track in units of frames per second.
138+
@discussion For field-based video tracks that carry one field per media sample, the value of this property is the field rate, not the frame rate.
139+
*/
136140
@property (nonatomic, readonly) float nominalFrameRate;
137141

138142
/* indicates the minimum duration of the track's frames; the value will be kCMTimeInvalid if the minimum frame duration is not known or cannot be calculated */
@@ -355,6 +359,7 @@ AVF_EXPORT NSString *const AVAssetTrackTrackAssociationsDidChangeNotification NS
355359
NS_CLASS_AVAILABLE_MAC(10_11)
356360
@interface AVFragmentedAssetTrack : AVAssetTrack
357361
{
362+
@private
358363
AVFragmentedAssetTrackInternal *_fragmentedAssetTrack;
359364
}
360365

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAudioEngine.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ _player = [[AVAudioPlayerNode alloc] init];
124124
Note that any pre-existing connection involving the destination's input bus will be
125125
broken. And, any pre-existing connection on source node which is not a part of the
126126
specified destination connection array will also be broken.
127+
128+
Also note that when the output of a node is split into multiple paths, all the paths
129+
must render at the same rate until they reach a common mixer.
130+
In other words, starting from the split node until the common mixer node where all split
131+
paths terminate, you cannot have:
132+
- any AVAudioUnitTimeEffect
133+
- any sample rate conversion
127134
*/
128135
- (void)connect:(AVAudioNode *)sourceNode toConnectionPoints:(NSArray<AVAudioConnectionPoint *> *)destNodes fromBus:(AVAudioNodeBus)sourceBus format:(AVAudioFormat * __nullable)format NS_AVAILABLE(10_11, 9_0);
129136

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAudioMixing.h

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
NS_ASSUME_NONNULL_BEGIN
1111

12+
@class AVAudioNode, AVAudioConnectionPoint, AVAudioMixingDestination;
13+
@protocol AVAudioStereoMixing;
14+
@protocol AVAudio3DMixing;
15+
1216
/*! @protocol AVAudioMixing
1317
@abstract Protocol that defines properties applicable to the input bus of a mixer
1418
node
@@ -17,21 +21,27 @@ NS_ASSUME_NONNULL_BEGIN
1721
specifically of type AVAudioMixerNode or AVAudioEnvironmentNode. The properties defined
1822
by this protocol apply to the respective input bus of the mixer node that the source node is
1923
connected to. Note that effect nodes cannot talk to their downstream mixer.
20-
21-
The state of properties that are set via this protocol before the source node is connected
22-
to mixer node(s) are cached and then applied on the mixer(s) once the physical connection is
23-
made. Similarly, on disconnection, the state of the properties of last mixer to be
24-
disconnected are cached.
25-
26-
Source nodes that are connected to a single mixer downstream can be disconnected from
27-
one mixer and connected to another mixer with their mixing settings intact.
24+
25+
Properties can be set either on the source node, or directly on individual mixer connections.
26+
Source node properties are:
27+
- applied to all existing mixer connections when set
28+
- applied to new mixer connections
29+
- preserved upon disconnection from mixers
30+
- not affected by connections/disconnections to/from mixers
31+
- not affected by any direct changes to properties on individual mixer connections
32+
33+
Individual mixer connection properties, when set, will override any values previously derived
34+
from the corresponding source node properties. However, if a source node property is
35+
subsequently set, it will override the corresponding property value of all individual mixer
36+
connections.
37+
Unlike source node properties, individual mixer connection properties are not preserved upon
38+
disconnection (see `AVAudioMixing(destinationForMixer:bus:)` and `AVAudioMixingDestination`).
39+
40+
Source nodes that are connected to a mixer downstream can be disconnected from
41+
one mixer and connected to another mixer with source node's mixing settings intact.
2842
For example, an AVAudioPlayerNode that is being used in a gaming scenario can set up its
2943
3D mixing settings and then move from one environment to another.
3044
*/
31-
@class AVAudioNode, AVAudioConnectionPoint, AVAudioMixingDestination;
32-
@protocol AVAudioStereoMixing;
33-
@protocol AVAudio3DMixing;
34-
3545
NS_CLASS_AVAILABLE(10_10, 8_0)
3646
@protocol AVAudioMixing <AVAudioStereoMixing, AVAudio3DMixing>
3747

@@ -46,8 +56,7 @@ NS_CLASS_AVAILABLE(10_10, 8_0)
4656
4757
Note:
4858
- Properties set on individual AVAudioMixingDestination instances will not reflect at the
49-
source node level, except when the node is disconnected from all its downstream mixers,
50-
at which point the state of the last disconnected mixer is cached at the node level.
59+
source node level.
5160
5261
- AVAudioMixingDestination reference returned by this method could become invalid when
5362
there is any disconnection between the source and the mixer node. Hence this reference

MacOSX10.11.sdk/System/Library/Frameworks/AVFoundation.framework/Versions/A/Headers/AVAudioSequencer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ NS_CLASS_AVAILABLE(10_11, 9_0)
255255
@abstract A collection of music events which will be sent to a given destination, and which can be
256256
offset, muted, etc. independently of events in other tracks.
257257
*/
258+
NS_CLASS_AVAILABLE(10_11, 9_0)
258259
@interface AVMusicTrack : NSObject {
259260
@protected
260261
void *_impl;

0 commit comments

Comments
 (0)