@picsa/capacitor-video-player 7.1.0 → 7.2.2

package/ios/Plugin/Info.plist

@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

package/ios/Plugin/VideoPicker/VideoHelper.swift

@@ -1,127 +1,127 @@
-//
-//  VideoHelper.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 28/05/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-//  Copyright (c) 2021 Razeware LLC
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
-//  distribute, sublicense, create a derivative work, and/or sell copies of the
-//  Software in any work that is designed, intended, or marketed for pedagogical or
-//  instructional purposes related to programming, coding, application development,
-//  or information technology.  Permission for such use, copying, modification,
-//  merger, publication, distribution, sublicensing, creation of derivative works,
-//  or sale is expressly withheld.
-//
-//  This project and source code may use libraries or frameworks that are
-//  released under various Open-Source licenses. Use of those libraries and
-//  frameworks are governed by their own individual licenses.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-
-import AVFoundation
-import MobileCoreServices
-import UIKit
-
-enum VideoHelper {
-    static func orientationFromTransform(
-        _ transform: CGAffineTransform
-    ) -> (orientation: UIImage.Orientation, isPortrait: Bool) {
-        var assetOrientation = UIImage.Orientation.up
-        var isPortrait = false
-        let tfA = transform.a
-        let tfB = transform.b
-        let tfC = transform.c
-        let tfD = transform.d
-
-        if tfA == 0 && tfB == 1.0 && tfC == -1.0 && tfD == 0 {
-            assetOrientation = .right
-            isPortrait = true
-        } else if tfA == 0 && tfB == -1.0 && tfC == 1.0 && tfD == 0 {
-            assetOrientation = .left
-            isPortrait = true
-        } else if tfA == 1.0 && tfB == 0 && tfC == 0 && tfD == 1.0 {
-            assetOrientation = .up
-        } else if tfA == -1.0 && tfB == 0 && tfC == 0 && tfD == -1.0 {
-            assetOrientation = .down
-        }
-        return (assetOrientation, isPortrait)
-    }
-
-    static func startMediaBrowser(
-        delegate: UIViewController & UINavigationControllerDelegate & UIImagePickerControllerDelegate,
-        sourceType: UIImagePickerController.SourceType
-    ) {
-        guard UIImagePickerController.isSourceTypeAvailable(sourceType)
-        else { return }
-
-        let mediaUI = UIImagePickerController()
-        mediaUI.sourceType = sourceType
-        mediaUI.mediaTypes = [kUTTypeMovie as String]
-        mediaUI.allowsEditing = false
-        mediaUI.delegate = delegate
-        delegate.present(mediaUI, animated: true, completion: nil)
-    }
-
-    static func videoCompositionInstruction(
-        _ track: AVCompositionTrack,
-        asset: AVAsset
-    ) -> AVMutableVideoCompositionLayerInstruction {
-        let instruction = AVMutableVideoCompositionLayerInstruction(assetTrack: track)
-        let assetTrack = asset.tracks(withMediaType: AVMediaType.video)[0]
-
-        let transform = assetTrack.preferredTransform
-        let assetInfo = orientationFromTransform(transform)
-
-        var scaleToFitRatio = UIScreen.main.bounds.width / assetTrack.naturalSize.width
-        if assetInfo.isPortrait {
-            scaleToFitRatio = UIScreen.main.bounds.width / assetTrack.naturalSize.height
-            let scaleFactor = CGAffineTransform(
-                scaleX: scaleToFitRatio,
-                y: scaleToFitRatio)
-            instruction.setTransform(
-                assetTrack.preferredTransform.concatenating(scaleFactor),
-                at: .zero)
-        } else {
-            let scaleFactor = CGAffineTransform(
-                scaleX: scaleToFitRatio,
-                y: scaleToFitRatio)
-            var concat = assetTrack.preferredTransform.concatenating(scaleFactor)
-                .concatenating(CGAffineTransform(
-                                translationX: 0,
-                                y: UIScreen.main.bounds.width / 2))
-            if assetInfo.orientation == .down {
-                let fixUpsideDown = CGAffineTransform(rotationAngle: CGFloat(Double.pi))
-                let windowBounds = UIScreen.main.bounds
-                let yFix = assetTrack.naturalSize.height + windowBounds.height
-                let centerFix = CGAffineTransform(
-                    translationX: assetTrack.naturalSize.width,
-                    y: yFix)
-                concat = fixUpsideDown.concatenating(centerFix).concatenating(scaleFactor)
-            }
-            instruction.setTransform(concat, at: .zero)
-        }
-
-        return instruction
-    }
-}
-
-import Foundation
+//
+//  VideoHelper.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 28/05/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+//  Copyright (c) 2021 Razeware LLC
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+//  distribute, sublicense, create a derivative work, and/or sell copies of the
+//  Software in any work that is designed, intended, or marketed for pedagogical or
+//  instructional purposes related to programming, coding, application development,
+//  or information technology.  Permission for such use, copying, modification,
+//  merger, publication, distribution, sublicensing, creation of derivative works,
+//  or sale is expressly withheld.
+//
+//  This project and source code may use libraries or frameworks that are
+//  released under various Open-Source licenses. Use of those libraries and
+//  frameworks are governed by their own individual licenses.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import AVFoundation
+import MobileCoreServices
+import UIKit
+
+enum VideoHelper {
+    static func orientationFromTransform(
+        _ transform: CGAffineTransform
+    ) -> (orientation: UIImage.Orientation, isPortrait: Bool) {
+        var assetOrientation = UIImage.Orientation.up
+        var isPortrait = false
+        let tfA = transform.a
+        let tfB = transform.b
+        let tfC = transform.c
+        let tfD = transform.d
+
+        if tfA == 0 && tfB == 1.0 && tfC == -1.0 && tfD == 0 {
+            assetOrientation = .right
+            isPortrait = true
+        } else if tfA == 0 && tfB == -1.0 && tfC == 1.0 && tfD == 0 {
+            assetOrientation = .left
+            isPortrait = true
+        } else if tfA == 1.0 && tfB == 0 && tfC == 0 && tfD == 1.0 {
+            assetOrientation = .up
+        } else if tfA == -1.0 && tfB == 0 && tfC == 0 && tfD == -1.0 {
+            assetOrientation = .down
+        }
+        return (assetOrientation, isPortrait)
+    }
+
+    static func startMediaBrowser(
+        delegate: UIViewController & UINavigationControllerDelegate & UIImagePickerControllerDelegate,
+        sourceType: UIImagePickerController.SourceType
+    ) {
+        guard UIImagePickerController.isSourceTypeAvailable(sourceType)
+        else { return }
+
+        let mediaUI = UIImagePickerController()
+        mediaUI.sourceType = sourceType
+        mediaUI.mediaTypes = [kUTTypeMovie as String]
+        mediaUI.allowsEditing = false
+        mediaUI.delegate = delegate
+        delegate.present(mediaUI, animated: true, completion: nil)
+    }
+
+    static func videoCompositionInstruction(
+        _ track: AVCompositionTrack,
+        asset: AVAsset
+    ) -> AVMutableVideoCompositionLayerInstruction {
+        let instruction = AVMutableVideoCompositionLayerInstruction(assetTrack: track)
+        let assetTrack = asset.tracks(withMediaType: AVMediaType.video)[0]
+
+        let transform = assetTrack.preferredTransform
+        let assetInfo = orientationFromTransform(transform)
+
+        var scaleToFitRatio = UIScreen.main.bounds.width / assetTrack.naturalSize.width
+        if assetInfo.isPortrait {
+            scaleToFitRatio = UIScreen.main.bounds.width / assetTrack.naturalSize.height
+            let scaleFactor = CGAffineTransform(
+                scaleX: scaleToFitRatio,
+                y: scaleToFitRatio)
+            instruction.setTransform(
+                assetTrack.preferredTransform.concatenating(scaleFactor),
+                at: .zero)
+        } else {
+            let scaleFactor = CGAffineTransform(
+                scaleX: scaleToFitRatio,
+                y: scaleToFitRatio)
+            var concat = assetTrack.preferredTransform.concatenating(scaleFactor)
+                .concatenating(CGAffineTransform(
+                                translationX: 0,
+                                y: UIScreen.main.bounds.width / 2))
+            if assetInfo.orientation == .down {
+                let fixUpsideDown = CGAffineTransform(rotationAngle: CGFloat(Double.pi))
+                let windowBounds = UIScreen.main.bounds
+                let yFix = assetTrack.naturalSize.height + windowBounds.height
+                let centerFix = CGAffineTransform(
+                    translationX: assetTrack.naturalSize.width,
+                    y: yFix)
+                concat = fixUpsideDown.concatenating(centerFix).concatenating(scaleFactor)
+            }
+            instruction.setTransform(concat, at: .zero)
+        }
+
+        return instruction
+    }
+}
+
+import Foundation

package/ios/Plugin/VideoPicker/VideoPickerViewController.swift

@@ -1,144 +1,144 @@
-//
-//  VideoPickerViewController.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 11/08/2020.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import AVKit
-import MobileCoreServices
-import UIKit
-
-open class VideoPickerViewController: UIViewController {
-    private var _videoRate: Float = 1.0
-    private var _exitOnEnd: Bool = true
-    private var _loopOnEnd: Bool = false
-    private var _pipEnabled: Bool = true
-    private var _backModeEnabled: Bool = true
-    private var _showControls: Bool = true
-    private var _displayMode: String = "all"
-
-    // MARK: - Set-up rate
-
-    var rate: Float {
-        get {
-            return self._videoRate
-        }
-        set {
-            self._videoRate = newValue
-        }
-    }
-
-    // MARK: - Set-up exitOnEnd
-
-    var exitOnEnd: Bool {
-        get {
-            return self._exitOnEnd
-        }
-        set {
-            self._exitOnEnd = newValue
-        }
-    }
-
-    // MARK: - Set-up loopOnEnd
-
-    var loopOnEnd: Bool {
-        get {
-            return self._loopOnEnd
-        }
-        set {
-            self._loopOnEnd = newValue
-        }
-    }
-
-    // MARK: - Set-up pipEnabled
-
-    var pipEnabled: Bool {
-        get {
-            return self._pipEnabled
-        }
-        set {
-            self._pipEnabled = newValue
-        }
-    }
-
-    // MARK: - Set-up backModeEnabled
-
-    var backModeEnabled: Bool {
-        get {
-            return self._backModeEnabled
-        }
-        set {
-            self._backModeEnabled = newValue
-        }
-    }
-    // MARK: - Set-up showControls
-
-    var showControls: Bool {
-        get {
-            return self._showControls
-        }
-        set {
-            self._showControls = newValue
-        }
-    }
-
-    // MARK: - Set-up displayMode
-
-    var displayMode: String {
-        get {
-            return self._displayMode
-        }
-        set {
-            self._displayMode = newValue
-        }
-    }
-
-    override open func viewDidLoad() {
-        super.viewDidLoad()
-        VideoHelper.startMediaBrowser(delegate: self,
-                                      sourceType: .savedPhotosAlbum)
-    }
-
-}
-
-// MARK: - UIImagePickerControllerDelegate
-extension VideoPickerViewController: UIImagePickerControllerDelegate {
-    public func imagePickerController(
-        _ picker: UIImagePickerController,
-        didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]
-    ) {
-        guard
-            let mediaType = info[UIImagePickerController.InfoKey.mediaType] as? String,
-            mediaType == (kUTTypeMovie as String),
-            let url = info[UIImagePickerController.InfoKey.mediaURL] as? URL
-        else {
-            return
-        }
-        let vId: [String: Any] = [
-            "videoUrl": url, "videoRate": rate,
-            "exitOnEnd": exitOnEnd, "loopOnEnd": loopOnEnd,
-            "pipEnabled": pipEnabled,
-            "backModeEnabled": backModeEnabled,
-            "showControls": showControls,
-            "displayMode": displayMode]
-        NotificationCenter.default.post(name: .videoPathInternalReady, object: nil, userInfo: vId)
-    }
-    public func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
-        let vId: [String: Any] = [
-            "videoUrl": "", "videoRate": rate,
-            "exitOnEnd": exitOnEnd, "loopOnEnd": loopOnEnd,
-            "pipEnabled": pipEnabled,
-            "backModeEnabled": backModeEnabled,
-            "showControls": showControls,
-            "displayMode": displayMode
-        ]
-        NotificationCenter.default.post(name: .videoPathInternalReady,
-                                        object: nil, userInfo: vId)
-    }
-}
-
-// MARK: - UINavigationControllerDelegate
-extension VideoPickerViewController: UINavigationControllerDelegate {
-}
+//
+//  VideoPickerViewController.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 11/08/2020.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import AVKit
+import MobileCoreServices
+import UIKit
+
+open class VideoPickerViewController: UIViewController {
+    private var _videoRate: Float = 1.0
+    private var _exitOnEnd: Bool = true
+    private var _loopOnEnd: Bool = false
+    private var _pipEnabled: Bool = true
+    private var _backModeEnabled: Bool = true
+    private var _showControls: Bool = true
+    private var _displayMode: String = "all"
+
+    // MARK: - Set-up rate
+
+    var rate: Float {
+        get {
+            return self._videoRate
+        }
+        set {
+            self._videoRate = newValue
+        }
+    }
+
+    // MARK: - Set-up exitOnEnd
+
+    var exitOnEnd: Bool {
+        get {
+            return self._exitOnEnd
+        }
+        set {
+            self._exitOnEnd = newValue
+        }
+    }
+
+    // MARK: - Set-up loopOnEnd
+
+    var loopOnEnd: Bool {
+        get {
+            return self._loopOnEnd
+        }
+        set {
+            self._loopOnEnd = newValue
+        }
+    }
+
+    // MARK: - Set-up pipEnabled
+
+    var pipEnabled: Bool {
+        get {
+            return self._pipEnabled
+        }
+        set {
+            self._pipEnabled = newValue
+        }
+    }
+
+    // MARK: - Set-up backModeEnabled
+
+    var backModeEnabled: Bool {
+        get {
+            return self._backModeEnabled
+        }
+        set {
+            self._backModeEnabled = newValue
+        }
+    }
+    // MARK: - Set-up showControls
+
+    var showControls: Bool {
+        get {
+            return self._showControls
+        }
+        set {
+            self._showControls = newValue
+        }
+    }
+
+    // MARK: - Set-up displayMode
+
+    var displayMode: String {
+        get {
+            return self._displayMode
+        }
+        set {
+            self._displayMode = newValue
+        }
+    }
+
+    override open func viewDidLoad() {
+        super.viewDidLoad()
+        VideoHelper.startMediaBrowser(delegate: self,
+                                      sourceType: .savedPhotosAlbum)
+    }
+
+}
+
+// MARK: - UIImagePickerControllerDelegate
+extension VideoPickerViewController: UIImagePickerControllerDelegate {
+    public func imagePickerController(
+        _ picker: UIImagePickerController,
+        didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]
+    ) {
+        guard
+            let mediaType = info[UIImagePickerController.InfoKey.mediaType] as? String,
+            mediaType == (kUTTypeMovie as String),
+            let url = info[UIImagePickerController.InfoKey.mediaURL] as? URL
+        else {
+            return
+        }
+        let vId: [String: Any] = [
+            "videoUrl": url, "videoRate": rate,
+            "exitOnEnd": exitOnEnd, "loopOnEnd": loopOnEnd,
+            "pipEnabled": pipEnabled,
+            "backModeEnabled": backModeEnabled,
+            "showControls": showControls,
+            "displayMode": displayMode]
+        NotificationCenter.default.post(name: .videoPathInternalReady, object: nil, userInfo: vId)
+    }
+    public func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+        let vId: [String: Any] = [
+            "videoUrl": "", "videoRate": rate,
+            "exitOnEnd": exitOnEnd, "loopOnEnd": loopOnEnd,
+            "pipEnabled": pipEnabled,
+            "backModeEnabled": backModeEnabled,
+            "showControls": showControls,
+            "displayMode": displayMode
+        ]
+        NotificationCenter.default.post(name: .videoPathInternalReady,
+                                        object: nil, userInfo: vId)
+    }
+}
+
+// MARK: - UINavigationControllerDelegate
+extension VideoPickerViewController: UINavigationControllerDelegate {
+}

package/ios/Plugin/VideoPlayer/Extensions/AVURLAsset.swift

@@ -1,18 +1,18 @@
-//
-//  AVURLAsset.swift
-//  Plugin
-//
-//  Created by  Quéau Jean Pierre on 02/04/2021.
-//  Copyright © 2021 Max Lynch. All rights reserved.
-//
-
-import AVKit
-
-extension AVURLAsset {
-
-    var videoSize: CGSize? {
-        tracks(withMediaType: .video).first.flatMap {
-            tracks.count > 0 ? $0.naturalSize.applying($0.preferredTransform) : nil
-        }
-    }
-}
+//
+//  AVURLAsset.swift
+//  Plugin
+//
+//  Created by  Quéau Jean Pierre on 02/04/2021.
+//  Copyright © 2021 Max Lynch. All rights reserved.
+//
+
+import AVKit
+
+extension AVURLAsset {
+
+    var videoSize: CGSize? {
+        tracks(withMediaType: .video).first.flatMap {
+            tracks.count > 0 ? $0.naturalSize.applying($0.preferredTransform) : nil
+        }
+    }
+}

package/ios/Plugin/VideoPlayer/Extensions/AllOrientationAVPlayerController.swift

@@ -1,12 +1,12 @@
-//
-//  AllOrientationAVPlayerController.swift
-//  CapacitorVideoPlayer
-//
-//  Created by Manuel Garcia Marin on 24-05-23.
-//
-
-import AVKit
-class AllOrientationAVPlayerController: AVPlayerViewController {
-    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
-        return .all    }
-}
+//
+//  AllOrientationAVPlayerController.swift
+//  CapacitorVideoPlayer
+//
+//  Created by Manuel Garcia Marin on 24-05-23.
+//
+
+import AVKit
+class AllOrientationAVPlayerController: AVPlayerViewController {
+    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        return .all    }
+}