From 46ff95e4f8678b841e9c9f08a87ee576fef8be0a Mon Sep 17 00:00:00 2001 From: gevorg94 Date: Fri, 25 Nov 2016 12:47:45 +0400 Subject: [PATCH] fix(VideoPlayer): Rotate, Show video properly fixed bug with video showing #15 --- ios/RNVideoProcessing/RNVideoPlayer.swift | 33 ++++++++----------- .../RNVideoProcessingBridge.m | 1 + 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ios/RNVideoProcessing/RNVideoPlayer.swift b/ios/RNVideoProcessing/RNVideoPlayer.swift index 96af372d..6919d4a1 100644 --- a/ios/RNVideoProcessing/RNVideoPlayer.swift +++ b/ios/RNVideoProcessing/RNVideoPlayer.swift @@ -13,9 +13,6 @@ import AVFoundation class RNVideoPlayer: RCTView { let processingFilters: VideoProcessingGPUFilters = VideoProcessingGPUFilters() - let EVENTS = ( - SEND_PREVIEWS: "VIDEO_PROCESSING:PREVIEWS" - ) var playerVolume: NSNumber = 0 var player: AVPlayer! = nil @@ -54,6 +51,7 @@ class RNVideoPlayer: RCTView { set(val) { if val != nil { self._playerHeight = val as! CGFloat + self.frame.size.height = self._playerHeight filterView.frame.size.height = self._playerHeight print("CHANGED HEIGHT \(val)") } @@ -67,6 +65,7 @@ class RNVideoPlayer: RCTView { set(val) { if val != nil { self._playerWidth = val as! CGFloat + self.frame.size.width = self._playerWidth filterView.frame.size.width = self._playerWidth print("CHANGED WIDTH \(val)") } @@ -192,20 +191,18 @@ class RNVideoPlayer: RCTView { var rotate: NSNumber? { set(val) { if val != nil { - if RCTConvert.bool(val!) != self._rotate { - self._rotate = RCTConvert.bool(val!) - var rotationAngle: CGFloat = 0 - if self._rotate { - filterView.frame.size.width = self._playerHeight - filterView.frame.size.height = self._playerWidth - rotationAngle = CGFloat(M_PI_2) - } else { - filterView.frame.size.width = self._playerWidth - filterView.frame.size.height = self._playerHeight - } - self.filterView.transform = CGAffineTransform(rotationAngle: rotationAngle) - self.layoutIfNeeded() + self._rotate = RCTConvert.bool(val!) + var rotationAngle: CGFloat = 0 + if self._rotate { + filterView.frame.size.width = self._playerHeight + filterView.frame.size.height = self._playerWidth + rotationAngle = CGFloat(M_PI_2) + } else { + filterView.frame.size.width = self._playerWidth + filterView.frame.size.height = self._playerHeight } + self.filterView.transform = CGAffineTransform(rotationAngle: rotationAngle) + self.layoutIfNeeded() } } get { @@ -306,7 +303,6 @@ class RNVideoPlayer: RCTView { print("CHANGED playerEndTime \(self._playerEndTime)") } - gpuMovie = GPUImageMovie(playerItem: playerItem) // gpuMovie.runBenchmark = true gpuMovie.playAtActualSpeed = true @@ -314,9 +310,6 @@ class RNVideoPlayer: RCTView { filterView.frame = self.frame - filterView.frame.size.width = self._playerWidth - filterView.frame.size.height = self._playerHeight - gpuMovie.addTarget(self.filterView) self.addSubview(filterView) gpuMovie.playAtActualSpeed = true diff --git a/ios/RNVideoProcessing/RNVideoProcessingBridge.m b/ios/RNVideoProcessing/RNVideoProcessingBridge.m index 08e7f44d..9a8c62b1 100644 --- a/ios/RNVideoProcessing/RNVideoProcessingBridge.m +++ b/ios/RNVideoProcessing/RNVideoProcessingBridge.m @@ -18,6 +18,7 @@ @interface RCT_EXTERN_MODULE(RNVideoProcessingManager, RCTViewManager) RCT_EXPORT_VIEW_PROPERTY(playerHeight, NSNumber) RCT_EXPORT_VIEW_PROPERTY(play, NSNumber) RCT_EXPORT_VIEW_PROPERTY(replay, NSNumber) +RCT_EXPORT_VIEW_PROPERTY(rotate, NSNumber) RCT_EXPORT_VIEW_PROPERTY(volume, NSNumber) RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)