Skip to content

Commit 76e0b68

Browse files
kishikawakatsumikishikawakatsumi
committed
Merge pull request #18 from kishikawakatsumi/fix_duplication
Fix duplications.
2 parents 74fd250 + 1244afe commit 76e0b68

38 files changed

+5
-452
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property (nonatomic, readonly) NSArray *videoTracks;
17-
@property (nonatomic, readonly) NSString *mediaType;
18-
@property (nonatomic, copy) AVVideoComposition *videoComposition;
19-
@property (nonatomic) BOOL alwaysCopiesSampleData;
20-
@property (nonatomic, readonly) NSArray *audioTracks;
21-
@property (nonatomic, copy) AVAudioMix *audioMix;
22-
@property (nonatomic, readonly) NSDictionary *outputSettings;
23-
@property (nonatomic, readonly) AVAssetTrack *track;
24-
@property (nonatomic, readonly) NSDictionary *videoSettings;
25-
@property (nonatomic, readonly) id customVideoCompositor;
26-
@property (nonatomic, readonly) NSDictionary *audioSettings;
27-
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
28-
2916
+ (AVAssetReaderAudioMixOutput *)assetReaderAudioMixOutputWithAudioTracks:(NSArray *)audioTracks audioSettings:(NSDictionary *)audioSettings;
3017

3118
- (id)initWithAudioTracks:(NSArray *)audioTracks audioSettings:(NSDictionary *)audioSettings;

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property (nonatomic, readonly) NSArray *videoTracks;
17-
@property (nonatomic, readonly) NSString *mediaType;
18-
@property (nonatomic, copy) AVVideoComposition *videoComposition;
19-
@property (nonatomic) BOOL alwaysCopiesSampleData;
20-
@property (nonatomic, readonly) NSArray *audioTracks;
21-
@property (nonatomic, copy) AVAudioMix *audioMix;
22-
@property (nonatomic, readonly) NSDictionary *outputSettings;
23-
@property (nonatomic, readonly) AVAssetTrack *track;
24-
@property (nonatomic, readonly) NSDictionary *videoSettings;
25-
@property (nonatomic, readonly) id customVideoCompositor;
26-
@property (nonatomic, readonly) NSDictionary *audioSettings;
27-
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
28-
2916
+ (AVAssetReaderTrackOutput *)assetReaderTrackOutputWithTrack:(AVAssetTrack *)track outputSettings:(NSDictionary *)outputSettings;
3017

3118
- (id)initWithTrack:(AVAssetTrack *)track outputSettings:(NSDictionary *)outputSettings;

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property (nonatomic, readonly) NSArray *videoTracks;
17-
@property (nonatomic, readonly) NSString *mediaType;
18-
@property (nonatomic, copy) AVVideoComposition *videoComposition;
19-
@property (nonatomic) BOOL alwaysCopiesSampleData;
20-
@property (nonatomic, readonly) NSArray *audioTracks;
21-
@property (nonatomic, copy) AVAudioMix *audioMix;
22-
@property (nonatomic, readonly) NSDictionary *outputSettings;
23-
@property (nonatomic, readonly) AVAssetTrack *track;
24-
@property (nonatomic, readonly) NSDictionary *videoSettings;
25-
@property (nonatomic, readonly) id customVideoCompositor;
26-
@property (nonatomic, readonly) NSDictionary *audioSettings;
27-
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
28-
2916
+ (AVAssetReaderVideoCompositionOutput *)assetReaderVideoCompositionOutputWithVideoTracks:(NSArray *)videoTracks videoSettings:(NSDictionary *)videoSettings;
3017

3118
- (id)initWithVideoTracks:(NSArray *)videoTracks videoSettings:(NSDictionary *)videoSettings;

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
- (void)setSampleBufferDelegate:(id <AVCaptureAudioDataOutputSampleBufferDelegate>)sampleBufferDelegate queue:(dispatch_queue_t)sampleBufferCallbackQueue;
4919
- (NSDictionary *)recommendedAudioSettingsForAssetWriterWithOutputFileType:(NSString *)outputFileType;
5020

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property (nonatomic, readonly) AVCaptureDevice *device;
17-
@property (nonatomic, readonly) NSString *mediaType;
18-
@property (nonatomic, readonly) AVCaptureInput *input;
19-
@property (nonatomic, getter = isEnabled) BOOL enabled;
20-
@property (nonatomic, readonly) NSArray *ports;
21-
@property (nonatomic, readonly) id formatDescription;
22-
@property (nonatomic, readonly) id clock;
23-
2416
+ (id)deviceInputWithDevice:(AVCaptureDevice *)device error:(NSError **)outError;
2517

2618
- (id)initWithDevice:(AVCaptureDevice *)device error:(NSError **)outError;

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
- (void)startRecordingToOutputFileURL:(NSURL *)outputFileURL recordingDelegate:(id <AVCaptureFileOutputRecordingDelegate>)delegate;
4919
- (void)stopRecording;
5020

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
- (void)setMetadataObjectsDelegate:(id <AVCaptureMetadataOutputObjectsDelegate>)objectsDelegate queue:(dispatch_queue_t)objectsCallbackQueue;
4919

5020
#pragma clang diagnostic pop

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
#pragma clang diagnostic pop
4919

5020
@end

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
+ (NSData *)jpegStillImageNSDataRepresentation:(id)jpegSampleBuffer;
4919

5020
- (void)captureStillImageAsynchronouslyFromConnection:(AVCaptureConnection *)connection completionHandler:(void (^)(CMSampleBufferRef imageDataSampleBuffer , NSError *error))handler;

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
#pragma clang diagnostic push
1616
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1717

18-
@property (nonatomic, readonly) NSArray *availableImageDataCVPixelFormatTypes;
19-
@property (nonatomic, readonly, getter = isStillImageStabilizationSupported) BOOL stillImageStabilizationSupported;
20-
@property (nonatomic, readonly, readonly) dispatch_queue_t sampleBufferCallbackQueue;
21-
@property (nonatomic) CMTime maxRecordedDuration;
22-
@property (nonatomic, readonly) NSArray *connections;
23-
@property (nonatomic, copy) NSArray *metadata;
24-
@property (nonatomic) int64_t maxRecordedFileSize;
25-
@property (nonatomic, readonly) CMTime recordedDuration;
26-
@property (nonatomic, copy) NSDictionary *outputSettings;
27-
@property (nonatomic) int64_t minFreeDiskSpaceLimit;
28-
@property (nonatomic, readonly) NSArray *availableMetadataObjectTypes;
29-
@property (nonatomic, readonly, getter = isStillImageStabilizationActive) BOOL stillImageStabilizationActive;
30-
@property (nonatomic, readonly) int64_t recordedFileSize;
31-
@property (nonatomic, readonly) dispatch_queue_t metadataObjectsCallbackQueue;
32-
@property (readonly, getter = isCapturingStillImage) BOOL capturingStillImage;
33-
@property (nonatomic) BOOL automaticallyEnablesStillImageStabilizationWhenAvailable;
34-
@property (nonatomic, readonly) NSURL *outputFileURL;
35-
@property (nonatomic) BOOL alwaysDiscardsLateVideoFrames;
36-
@property (nonatomic, copy) NSArray *metadataObjectTypes;
37-
@property (nonatomic, readonly) id metadataObjectsDelegate;
38-
@property (nonatomic, copy) NSDictionary *videoSettings;
39-
@property (nonatomic) CGRect rectOfInterest;
40-
@property (nonatomic, readonly) NSArray *availableVideoCodecTypes;
41-
@property (nonatomic) CMTime movieFragmentInterval;
42-
@property (nonatomic) CMTime minFrameDuration;
43-
@property (nonatomic, readonly) NSArray *availableImageDataCodecTypes;
44-
@property (nonatomic, readonly, getter = isRecording) BOOL recording;
45-
@property (nonatomic, readonly) NSArray *availableVideoCVPixelFormatTypes;
46-
@property (nonatomic, readonly, readonly) id sampleBufferDelegate;
47-
4818
- (void)setSampleBufferDelegate:(id <AVCaptureVideoDataOutputSampleBufferDelegate>)sampleBufferDelegate queue:(dispatch_queue_t)sampleBufferCallbackQueue;
4919
- (NSDictionary *)recommendedVideoSettingsForAssetWriterWithOutputFileType:(NSString *)outputFileType;
5020

0 commit comments

Comments
 (0)