Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only apply filter if filter is set #1360

Merged
merged 2 commits into from
Dec 13, 2018
Merged

Only apply filter if filter is set #1360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ac687
only apply filter if filter is set
nickgzzjr Dec 2, 2018
a4a0c8a
Refactor setFilter code
cobarx Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions ios/Video/RCTVideo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,39 +1265,29 @@ - (void)videoPlayerViewControllerDidDismiss:(AVPlayerViewController *)playerView
}

- (void)setFilter:(NSString *)filterName {

_filterName = filterName;

AVAsset *asset = _playerItem.asset;

if (asset != nil) {

CIFilter *filter = [CIFilter filterWithName:filterName];

_playerItem.videoComposition = [AVVideoComposition
videoCompositionWithAsset:asset
applyingCIFiltersWithHandler:^(AVAsynchronousCIImageFilteringRequest *_Nonnull request) {

if (filter == nil) {

[request finishWithImage:request.sourceImage context:nil];

} else {

CIImage *image = request.sourceImage.imageByClampingToExtent;

[filter setValue:image forKey:kCIInputImageKey];

CIImage *output = [filter.outputImage imageByCroppingToRect:request.sourceImage.extent];

[request finishWithImage:output context:nil];

}

}];


if (!asset) {
return;
} else if (!_playerItem.videoComposition && (filterName == nil || [filterName isEqualToString:@""])) {
return; // Setting up an empty filter has a cost so avoid whenever possible
}

// TODO: filters don't work for HLS, check & return

CIFilter *filter = [CIFilter filterWithName:filterName];
_playerItem.videoComposition = [AVVideoComposition
videoCompositionWithAsset:asset
applyingCIFiltersWithHandler:^(AVAsynchronousCIImageFilteringRequest *_Nonnull request) {
if (filter == nil) {
[request finishWithImage:request.sourceImage context:nil];
} else {
CIImage *image = request.sourceImage.imageByClampingToExtent;
[filter setValue:image forKey:kCIInputImageKey];
CIImage *output = [filter.outputImage imageByCroppingToRect:request.sourceImage.extent];
[request finishWithImage:output context:nil];
}
}];
}

#pragma mark - React View Management
Expand Down Expand Up @@ -1460,4 +1450,4 @@ - (NSString *)cacheDirectoryPath {
return array[0];
}

@end
@end