Skip to content

Commit e0400f9

Browse files
kishikawakatsumikishikawakatsumi
committed
Convert CFType to id.
1 parent 151bb14 commit e0400f9

File tree

71 files changed

+136
-136
lines changed

Some content is hidden

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

71 files changed

+136
-136
lines changed

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAsset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1818

1919
@property (nonatomic, readonly) CMPersistentTrackID passthroughTrackID;
20-
@property (nonatomic, retain) __attribute__ ((NSObject)) CGColorRef backgroundColor;
20+
@property (nonatomic, retain) id backgroundColor;
2121
@property (nonatomic, readonly) float renderScale;
2222
@property (nonatomic, retain, readonly) AVVideoCompositionCoreAnimationTool *animationTool;
2323
@property (nonatomic, readonly) CGSize renderSize;

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAssetImageGenerator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
+ (AVAssetImageGenerator *)assetImageGeneratorWithAsset:(AVAsset *)asset;
2626

2727
- (id)initWithAsset:(AVAsset *)asset;
28-
- (CGImageRef)copyCGImageAtTime:(CMTime)requestedTime actualTime:(CMTime *)actualTime error:(NSError **)outError;
28+
- (id)copyCGImageAtTime:(CMTime)requestedTime actualTime:(CMTime *)actualTime error:(NSError **)outError;
2929
- (void)generateCGImagesAsynchronouslyForTimes:(NSArray *)requestedTimes completionHandler:(AVAssetImageGeneratorCompletionHandler)handler;
3030
- (void)cancelAllCGImageGeneration;
3131

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAssetReaderOutput.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@property (nonatomic, readonly) NSDictionary *audioSettings;
2727
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
2828

29-
- (CMSampleBufferRef)copyNextSampleBuffer;
29+
- (id)copyNextSampleBuffer;
3030

3131
#pragma clang diagnostic pop
3232

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAssetWriterInput.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
@property (nonatomic, copy) NSString *languageCode;
2626
@property (nonatomic) CGAffineTransform transform;
2727
@property (nonatomic, readonly) NSDictionary *outputSettings;
28-
@property (nonatomic, readonly) CVPixelBufferPoolRef pixelBufferPool;
28+
@property (nonatomic, readonly) id pixelBufferPool;
2929
@property (nonatomic, readonly) NSDictionary *sourcePixelBufferAttributes;
3030
@property (nonatomic, copy) NSString *extendedLanguageTag;
3131
@property (nonatomic) CGSize naturalSize;
32-
@property (nonatomic, readonly) __attribute__ ((NSObject)) CMFormatDescriptionRef sourceFormatHint;
32+
@property (nonatomic, readonly) id sourceFormatHint;
3333
@property (nonatomic, readonly) AVAssetWriterInput *assetWriterInput;
3434

3535
+ (AVAssetWriterInput *)assetWriterInputWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings;
36-
+ (AVAssetWriterInput *)assetWriterInputWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings sourceFormatHint:(CMFormatDescriptionRef)sourceFormatHint;
36+
+ (AVAssetWriterInput *)assetWriterInputWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings sourceFormatHint:(id)sourceFormatHint;
3737

3838
- (id)initWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings;
39-
- (id)initWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings sourceFormatHint:(CMFormatDescriptionRef)sourceFormatHint;
39+
- (id)initWithMediaType:(NSString *)mediaType outputSettings:(NSDictionary *)outputSettings sourceFormatHint:(id)sourceFormatHint;
4040
- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
41-
- (BOOL)appendSampleBuffer:(CMSampleBufferRef)sampleBuffer;
41+
- (BOOL)appendSampleBuffer:(id)sampleBuffer;
4242
- (void)markAsFinished;
4343
- (BOOL)canAddTrackAssociationWithTrackOfInput:(AVAssetWriterInput *)input type:(NSString *)trackAssociationType;
4444
- (void)addTrackAssociationWithTrackOfInput:(AVAssetWriterInput *)input type:(NSString *)trackAssociationType;

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAssetWriterInputPixelBufferAdaptor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
@property (nonatomic, copy) NSString *languageCode;
2626
@property (nonatomic) CGAffineTransform transform;
2727
@property (nonatomic, readonly) NSDictionary *outputSettings;
28-
@property (nonatomic, readonly) CVPixelBufferPoolRef pixelBufferPool;
28+
@property (nonatomic, readonly) id pixelBufferPool;
2929
@property (nonatomic, readonly) NSDictionary *sourcePixelBufferAttributes;
3030
@property (nonatomic, copy) NSString *extendedLanguageTag;
3131
@property (nonatomic) CGSize naturalSize;
32-
@property (nonatomic, readonly) __attribute__ ((NSObject)) CMFormatDescriptionRef sourceFormatHint;
32+
@property (nonatomic, readonly) id sourceFormatHint;
3333
@property (nonatomic, readonly) AVAssetWriterInput *assetWriterInput;
3434

3535
+ (AVAssetWriterInputPixelBufferAdaptor *)assetWriterInputPixelBufferAdaptorWithAssetWriterInput:(AVAssetWriterInput *)input sourcePixelBufferAttributes:(NSDictionary *)sourcePixelBufferAttributes;
3636

3737
- (id)initWithAssetWriterInput:(AVAssetWriterInput *)input sourcePixelBufferAttributes:(NSDictionary *)sourcePixelBufferAttributes;
38-
- (BOOL)appendPixelBuffer:(CVPixelBufferRef)pixelBuffer withPresentationTime:(CMTime)presentationTime;
38+
- (BOOL)appendPixelBuffer:(id)pixelBuffer withPresentationTime:(CMTime)presentationTime;
3939

4040
#pragma clang diagnostic pop
4141

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAsynchronousVideoCompositionRequest.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
@property (nonatomic, readonly) BOOL enablePostProcessing;
3333
@property (nonatomic, readonly) AVEdgeWidths edgeWidths;
3434

35-
- (CVPixelBufferRef)sourceFrameByTrackID:(CMPersistentTrackID)trackID;
36-
- (void)finishWithComposedVideoFrame:(CVPixelBufferRef)composedVideoFrame;
35+
- (id)sourceFrameByTrackID:(CMPersistentTrackID)trackID;
36+
- (void)finishWithComposedVideoFrame:(id)composedVideoFrame;
3737
- (void)finishWithError:(NSError *)error;
3838
- (void)finishCancelledRequest;
3939

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAudioMix.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@property (nonatomic, readonly) CMPersistentTrackID trackID;
1919
@property (nonatomic, copy, readonly) NSArray *inputParameters;
2020
@property (nonatomic, copy, readonly) NSString *audioTimePitchAlgorithm;
21-
@property (nonatomic, retain, readonly) __attribute__ ((NSObject)) MTAudioProcessingTapRef audioTapProcessor;
21+
@property (nonatomic, retain, readonly) id audioTapProcessor;
2222

2323
#pragma clang diagnostic pop
2424

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVAudioMixInputParameters.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@property (nonatomic, readonly) CMPersistentTrackID trackID;
1919
@property (nonatomic, copy, readonly) NSArray *inputParameters;
2020
@property (nonatomic, copy, readonly) NSString *audioTimePitchAlgorithm;
21-
@property (nonatomic, retain, readonly) __attribute__ ((NSObject)) MTAudioProcessingTapRef audioTapProcessor;
21+
@property (nonatomic, retain, readonly) id audioTapProcessor;
2222

2323
- (BOOL)getVolumeRampForTime:(CMTime)time startVolume:(float *)startVolume endVolume:(float *)endVolume timeRange:(CMTimeRange *)timeRange;
2424

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVCaptureAudioChannel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@property (nonatomic) CMTime videoMaxFrameDuration;
4040
@property (nonatomic, readonly) CGFloat videoMaxScaleAndCropFactor;
4141
@property (nonatomic) BOOL enablesVideoStabilizationWhenAvailable;
42-
@property (nonatomic, readonly) __attribute__ ((NSObject)) CMClockRef masterClock;
42+
@property (nonatomic, readonly) id masterClock;
4343
@property (nonatomic) CGFloat videoScaleAndCropFactor;
4444
@property (nonatomic, readonly, getter = isVideoStabilizationSupported) BOOL supportsVideoStabilization;
4545
@property (nonatomic, readonly) AVCaptureOutput *output;

‎Classes/iOS/FrameworkSupport/AVFoundation/JSBAVCaptureConnection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@property (nonatomic) CMTime videoMaxFrameDuration;
4040
@property (nonatomic, readonly) CGFloat videoMaxScaleAndCropFactor;
4141
@property (nonatomic) BOOL enablesVideoStabilizationWhenAvailable;
42-
@property (nonatomic, readonly) __attribute__ ((NSObject)) CMClockRef masterClock;
42+
@property (nonatomic, readonly) id masterClock;
4343
@property (nonatomic) CGFloat videoScaleAndCropFactor;
4444
@property (nonatomic, readonly, getter = isVideoStabilizationSupported) BOOL supportsVideoStabilization;
4545
@property (nonatomic, readonly) AVCaptureOutput *output;

0 commit comments

Comments
 (0)