fix bugs & add more motions.

one video track can only use one motion

Author: RenZhu Macro

Examples/SimpleVideoAnimation/SimpleVIdeoAnimation.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		6A874BB924C5462C00ADFD8A /* MetalVideoProcess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A874BB824C545CC00ADFD8A /* MetalVideoProcess.framework */; };
 		6A874BBA24C5462C00ADFD8A /* MetalVideoProcess.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6A874BB824C545CC00ADFD8A /* MetalVideoProcess.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6A874BDA24C6FDE200ADFD8A /* 853.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 6A874BD824C6FDE200ADFD8A /* 853.mp4 */; };
+		AB59B95124C9717600943BE2 /* NavigateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB59B94F24C9717600943BE2 /* NavigateViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -58,6 +59,7 @@
 		6A874BB324C545CC00ADFD8A /* MetalVideoProcess.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MetalVideoProcess.xcodeproj; path = ../../MetalVideoProcess.xcodeproj; sourceTree = "<group>"; };
 		6A874BD824C6FDE200ADFD8A /* 853.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = 853.mp4; path = SimpleVIdeoAnimation/853.mp4; sourceTree = SOURCE_ROOT; };
 		A512CD4DD2F5AB414CF01FE6 /* Pods-SimpleVideoAnimation.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SimpleVideoAnimation.release.xcconfig"; path = "Target Support Files/Pods-SimpleVideoAnimation/Pods-SimpleVideoAnimation.release.xcconfig"; sourceTree = "<group>"; };
+		AB59B94F24C9717600943BE2 /* NavigateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NavigateViewController.swift; path = SimpleVIdeoAnimation/NavigateViewController.swift; sourceTree = SOURCE_ROOT; };
 		D107CF0887B69DDEA376CBEA /* Pods-SimpleVideoAnimation.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SimpleVideoAnimation.debug.xcconfig"; path = "Target Support Files/Pods-SimpleVideoAnimation/Pods-SimpleVideoAnimation.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -109,6 +111,7 @@
 				6A874B9F24C53EF700ADFD8A /* AppDelegate.swift */,
 				6A874BA124C53EF700ADFD8A /* SceneDelegate.swift */,
 				6A874BA324C53EF700ADFD8A /* ViewController.swift */,
+				AB59B94F24C9717600943BE2 /* NavigateViewController.swift */,
 				6A874BA524C53EF700ADFD8A /* Main.storyboard */,
 				6A874BA824C53EF800ADFD8A /* Assets.xcassets */,
 				6A874BAA24C53EF800ADFD8A /* LaunchScreen.storyboard */,
@@ -269,6 +272,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6A874BA424C53EF700ADFD8A /* ViewController.swift in Sources */,
+				AB59B95124C9717600943BE2 /* NavigateViewController.swift in Sources */,
 				6A874BA024C53EF700ADFD8A /* AppDelegate.swift in Sources */,
 				6A874BA224C53EF700ADFD8A /* SceneDelegate.swift in Sources */,
 			);

Examples/SimpleVideoAnimation/SimpleVIdeoAnimation/Base.lproj/Main.storyboard

@@ -1,50 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Sjl-30-bHq">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="SimpleVideoAnimation" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ViewController" id="BYZ-38-t0r" customClass="ViewController" customModule="SimpleVideoAnimation" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FXj-LY-59h" customClass="MetalVideoProcessRenderView" customModule="MetalVideoProcess">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="375"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FXj-LY-59h" customClass="MetalVideoProcessRenderView" customModule="MetalVideoProcess">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="438"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="FXj-LY-59h" secondAttribute="height" id="iBP-Gu-Wj9"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gLe-Zn-niL">
-                                <rect key="frame" x="166.5" y="515" width="42" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gLe-Zn-niL">
+                                <rect key="frame" x="231" y="562" width="42" height="30"/>
                                 <state key="normal" title="Pause"/>
                                 <connections>
                                     <action selector="pause:" destination="BYZ-38-t0r" eventType="touchUpInside" id="jXA-Ko-2E5"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9lP-KN-D4J">
-                                <rect key="frame" x="172.5" y="475" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9lP-KN-D4J">
+                                <rect key="frame" x="136" y="562" width="30" height="30"/>
                                 <state key="normal" title="Play"/>
                                 <connections>
                                     <action selector="play:" destination="BYZ-38-t0r" eventType="touchUpInside" id="BxN-gS-f9o"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JkB-hg-7A6" customClass="TrimmerView" customModule="PryntTrimmerView">
-                                <rect key="frame" x="0.0" y="385" width="375" height="80"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JkB-hg-7A6" customClass="TrimmerView" customModule="PryntTrimmerView">
+                                <rect key="frame" x="0.0" y="470" width="375" height="80"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="80" id="9zr-ar-gfx"/>
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="9lP-KN-D4J" firstAttribute="top" secondItem="JkB-hg-7A6" secondAttribute="bottom" constant="10" id="EVm-H0-xCG"/>
                             <constraint firstItem="FXj-LY-59h" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="Hbb-9e-X3i"/>
@@ -57,7 +60,6 @@
                             <constraint firstItem="JkB-hg-7A6" firstAttribute="top" secondItem="FXj-LY-59h" secondAttribute="bottom" constant="10" id="rCV-zQ-Eyi"/>
                             <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="FXj-LY-59h" secondAttribute="trailing" id="rUK-5t-TAP"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                     <connections>
                         <outlet property="progressView" destination="JkB-hg-7A6" id="eky-zy-L0Z"/>
@@ -66,7 +68,27 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="132" y="138"/>
+            <point key="canvasLocation" x="132" y="137.18140929535232"/>
+        </scene>
+        <!--NavigateView-->
+        <scene sceneID="XBJ-QK-b6X">
+            <objects>
+                <viewController id="Sjl-30-bHq" userLabel="NavigateView" customClass="NavigateViewController" customModule="SimpleVideoAnimation" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="aeg-zc-cBS">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="qlq-zn-i27"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Aj9-BM-fNL" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-906" y="137"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

Examples/SimpleVideoAnimation/SimpleVIdeoAnimation/NavigateViewController.swift

@@ -0,0 +1,75 @@
+//
+//  NavigateViewController.swift
+//  SimpleVideoTransition
+//
+//  Created by Ruanshengqiang Macro on 2020/7/2.
+//  Copyright © 2020 Ruanshengqiang Macro. All rights reserved.
+//
+
+import UIKit
+import MetalVideoProcess
+import AVFoundation
+import MetalVideoProcess
+
+class NavigateViewController: UIViewController {
+    @IBOutlet weak var naviStackView: UIStackView!
+
+    var transitionTimeRange = CMTimeRange.init()
+    
+    let N = 3
+    private func getTransition(index: Int) -> (titleName: String, transObject: MetalVideoProcessMotion) {
+        switch index {
+        case 0:
+        return (titleName: "向上滑动", transObject: MetalVideoProcessMoveUpMotion())
+        case 1:
+        return (titleName: "放大", transObject: MetalVideoProcessMoveInMotion())
+        case 2:
+        return (titleName: "旋转", transObject: MetalVideoProcessRotateMotion())
+        case 3:
+        return (titleName: "渐显", transObject: MetalVideoProcessFadeInMotion())
+        default:
+        return (titleName: "放大", transObject: MetalVideoProcessMoveInMotion())
+        
+        }
+    }
+    private func getButton(index: Int) -> UIButton {
+        let splitNum = 5.0
+        let pieceWidth = Double(self.view.frame.width) / splitNum
+        let buttonWidth = pieceWidth * 0.8
+        let dIndex = Double(index)
+        let indexX = fmod(dIndex, splitNum) * pieceWidth
+        let indexY = (floor(dIndex / splitNum)) * pieceWidth + 100.0
+        
+        let buttonFrame = CGRect(x: indexX, y: indexY, width: buttonWidth, height: buttonWidth)
+        
+        let but = UIButton(frame: buttonFrame)
+        but.backgroundColor = UIColor(red: 0.3, green: 0.4, blue: 0.3, alpha: 0.7)
+        but.setTitle(getTransition(index: index).titleName, for: .normal)
+       
+        but.titleLabel?.adjustsFontSizeToFitWidth = true
+        but.addTarget(self, action: #selector(self.swithController(_:)), for: .touchUpInside)
+        
+        but.tag = index
+        return but
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        for index in 0...N - 1 {
+            self.view.addSubview(getButton(index: index))
+        }
+    }
+    
+    @IBAction func swithController(_ sender: UIButton) {
+        
+        let viewController = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "ViewController")  as! ViewController
+        
+        let trans = getTransition(index: sender.tag)
+        
+        viewController.motionIn = trans.transObject
+        
+        self.present(viewController, animated: true, completion: nil)
+    }
+}
+
+

Examples/SimpleVideoAnimation/SimpleVIdeoAnimation/ViewController.swift

@@ -35,37 +35,29 @@ class ViewController: UIViewController {
             let fadeIn = MetalVideoProcessFadeInMotion()
             fadeIn.timingType = .quadraticEaseOut
 
-            let fadeOut = MetalVideoProcessFadeOutMotion()
-            fadeOut.timingType = .quarticEaseOut
- 
             let fadeInTimeRange = CMTimeRangeMake(start: CMTime(seconds: 2.0), duration: CMTime(seconds: 2.0))
             fadeIn.saveUniformSettings(forTimelineRange: fadeInTimeRange, trackID: item1.trackID)
 
-            let fadeOutTimeRange = CMTimeRange(start: item1.timeRange.end - CMTime(seconds: 4.0), duration: CMTime(seconds: 1.5))
-            fadeOut.saveUniformSettings(forTimelineRange: fadeOutTimeRange, trackID: item1.trackID)
- 
             let player = try MetalVideoProcessPlayer(playerItem: playerItem)
             player.playerDelegate = self
 
             let background = MetalVideoProcessBackground(trackID: 0)
             background.aspectRatioType = .Ratio9_16
             background.canvasSizeType = .Type720p
-            background.setBackgroundType(type: .Blur)
+            background.setBackgroundType(type: .Black)
 
             let transform = MetalVideoProcessTransformFilter()
                        transform.saveUniformSettings(forTimelineRange: item1.timeRange, trackID: item1.trackID)
             transform.roi = CGRect(x: 0.25, y: 0.25, width: 0.5, height: 0.5)
 
             player.addTarget(background, atTargetIndex: 0, trackID: item1.trackID, targetTrackId: 0)
-             
+            
+            
             background --> fadeIn //source 0
             player.addTarget(transform, atTargetIndex: nil, trackID: item1.trackID, targetTrackId: 0) //source 1
 
-            transform --> fadeIn //source 1
+            transform --> fadeIn --> renderView//source 1
 
-            background --> fadeOut //source 0
-            fadeIn --> fadeOut --> renderView //source 1
-
             self.player = player
         } catch {
 

Examples/SimpleVideoEditor/SimpleVideoEditor/ViewController+UIGestureRecognizerDelegate.swift

@@ -58,7 +58,7 @@ extension ViewController: UIGestureRecognizerDelegate {
             let tanl = ges.translation(in: ges.view)
 
             // have to content the view scaleFactor and the vertex to texture scale.
-            transformFilter.translation = Position(currentPostion.x + Float(tanl.x * self.renderView.contentScaleFactor * 2.0) / Float(self.renderView.drawableSize.width), currentPostion.y - Float(tanl.y * self.renderView.contentScaleFactor * 2.0) / Float(self.renderView.drawableSize.height))
+            transformFilter.translation = Position(currentPostion.x + Float(tanl.x * self.renderView.contentScaleFactor * 2.0) / Float(self.renderView.drawableSize.width), 1.0 - currentPostion.y - Float(tanl.y * self.renderView.contentScaleFactor * 2.0) / Float(self.renderView.drawableSize.height))
 
         } else if ges.state == .ended {
             currentPostion = (transformFilter.translation)