Skip to content

Commit

Permalink
1.5.7 #5
Browse files Browse the repository at this point in the history
  • Loading branch information
@Datt1994
Datt1994 committed Jul 11, 2020
1 parent 5aee5c3 commit 619313c
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 17 deletions.
2 changes: 1 addition & 1 deletion DPVideoMerger-Swift.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "DPVideoMerger-Swift"
s.version = "1.5.5"
s.version = "1.5.7"
s.summary = "Multiple videos merge in one video with manage scale & aspect ratio and also merge 4 videos to grid layout for Swift."

# This description is used to generate tags and improve search results.
Expand Down
10 changes: 6 additions & 4 deletions DPVideoMerger/DPVideoMerger.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Datt.DPVideoMerger;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -446,6 +447,7 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Datt.DPVideoMerger;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -469,9 +471,9 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "DPVideoMerger-Swift/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 1.5.5;
MARKETING_VERSION = 1.5.7;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.datt.DPVideoMerger-Swift";
Expand Down Expand Up @@ -499,9 +501,9 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "DPVideoMerger-Swift/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 1.5.5;
MARKETING_VERSION = 1.5.7;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.datt.DPVideoMerger-Swift";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
51 changes: 39 additions & 12 deletions DPVideoMerger/DPVideoMerger/DPVideoMerger.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,26 @@
import UIKit
import AVKit

public final class DPVideoMerger: NSObject {
//videoQuality : AVAssetExportPresetMediumQuality(default) , AVAssetExportPresetLowQuality , AVAssetExportPresetHighestQuality
public func mergeVideos(withFileURLs


@objc protocol VideoMerger {
func mergeVideos(withFileURLs videoFileURLs: [URL], videoResolution:CGSize, videoQuality:String, completion: @escaping (_ mergedVideoURL: URL?, _ error: Error?) -> Void)
func gridMergeVideos(withFileURLs videoFileURLs: [URL], videoResolution: CGSize, isRepeatVideo: Bool, videoDuration: Int, videoQuality: String, completion: @escaping (_ mergedVideoURL: URL?, _ error: Error?) -> Void)
}

@objc open class DPVideoMerger : NSObject {
}

extension DPVideoMerger : VideoMerger {
/// Multiple videos merge in one video with manage scale & aspect ratio
/// - Parameters:
/// - videoFileURLs: Video file path URLs, Array of videos that going to merge
/// - videoResolution: Output video resolution, (defult: CGSize(width: -1, height: -1), find max width and height from provided videos)
/// - videoQuality: AVAssetExportPresetMediumQuality(default) , AVAssetExportPresetLowQuality , AVAssetExportPresetHighestQuality
/// - completion: Completion give 2 optional values, 1)mergedVideoURL: URL path of successfully merged video 2)error: Gives Error object if some error occur in videos merging process
/// - mergedVideoURL: URL path of successfully merged video
/// - error: Gives Error object if some error occur in videos merging process
open func mergeVideos(withFileURLs
videoFileURLs: [URL],
videoResolution:CGSize = CGSize(width: -1, height: -1),
videoQuality:String = AVAssetExportPresetMediumQuality,
Expand Down Expand Up @@ -154,7 +171,7 @@ public final class DPVideoMerger: NSObject {
switch videoAssetOrientation_ {
case UIImage.Orientation.right:
Move = CGAffineTransform(translationX: (videoAssetWidth * factor) + CGFloat(tx) , y: CGFloat(ty))
transform = CGAffineTransform(rotationAngle:degreeToRadian(90))
transform = CGAffineTransform(rotationAngle: degreeToRadian(90))
layerInstruction.setTransform(transform.concatenating(Scale.concatenating(Move)), at: .zero)
case UIImage.Orientation.left:
Move = CGAffineTransform(translationX: CGFloat(tx), y: videoSize.height - CGFloat(ty))
Expand Down Expand Up @@ -225,26 +242,36 @@ public final class DPVideoMerger: NSObject {
}
}
}
func videoTarckError() -> Error {
fileprivate func videoTarckError() -> Error {
let userInfo: [AnyHashable : Any] =
[ NSLocalizedDescriptionKey : NSLocalizedString("error", value: "Provide correct video file", comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("error", value: "No video track available", comment: "")]
return NSError(domain: "DPVideoMerger", code: 404, userInfo: (userInfo as! [String : Any]))
}
func audioTarckError() -> Error {
fileprivate func audioTarckError() -> Error {
let userInfo: [AnyHashable : Any] =
[ NSLocalizedDescriptionKey : NSLocalizedString("error", value: "Video file had no Audio track", comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("error", value: "No Audio track available", comment: "")]
return NSError(domain: "DPVideoMerger", code: 404, userInfo: (userInfo as! [String : Any]))
}
func videoSizeError() -> Error {
fileprivate func videoSizeError() -> Error {
let userInfo: [AnyHashable : Any] =
[ NSLocalizedDescriptionKey : NSLocalizedString("error", value: "videoSize height/width should grater than equal to 100", comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("error", value: "videoSize too small", comment: "")]
return NSError(domain: "DPVideoMerger", code: 404, userInfo: (userInfo as! [String : Any]))
}

public func gridMergeVideos(withFileURLs
/// Merge 4 videos to grid layout
/// - Parameters:
/// - videoFileURLs: Video file path URLs, Array of 4 videos that going to grid merge
/// - videoResolution: Output video resolution
/// - isRepeatVideo: Repeat Video on grid if one or more video have shorter duartion time then output video duration
/// - videoDuration: Output video duration (defult: -1, find max duration from provided 4 videos)
/// - videoQuality: AVAssetExportPresetMediumQuality(default) , AVAssetExportPresetLowQuality , AVAssetExportPresetHighestQuality
/// - completion: completion give 2 optional values, 1)mergedVideoURL: URL path of successfully grid merged video 2)error: gives Error object if some error occur in videos merging process
/// - mergedVideoURL: URL path of successfully grid merged video
/// - error: gives Error object if some error occur in videos merging process
open func gridMergeVideos(withFileURLs
videoFileURLs: [URL],
videoResolution: CGSize,
isRepeatVideo: Bool = false,
Expand Down Expand Up @@ -421,24 +448,24 @@ public final class DPVideoMerger: NSObject {

}

func videoCountError() -> Error {
fileprivate func videoCountError() -> Error {
let userInfo: [AnyHashable : Any] =
[ NSLocalizedDescriptionKey : NSLocalizedString("error", value: "Provide 4 Videos", comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("error", value: "gridMerge required 4 videos to merge", comment: "")]
return NSError(domain: "DPVideoMerger", code: 404, userInfo: (userInfo as! [String : Any]))
}

func videoDurationError() -> Error {
fileprivate func videoDurationError() -> Error {
let userInfo: [AnyHashable : Any] =
[ NSLocalizedDescriptionKey : NSLocalizedString("error", value: "videoDuration should grater than equal to logest video duration from all videoes.", comment: "") ,
NSLocalizedFailureReasonErrorKey : NSLocalizedString("error", value: "videoDuration is small to complete videoes", comment: "")]
return NSError(domain: "DPVideoMerger", code: 404, userInfo: (userInfo as! [String : Any]))
}

func generateMergedVideoFilePath() -> String {
fileprivate func generateMergedVideoFilePath() -> String {
return URL(fileURLWithPath: ((FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last)?.path)!).appendingPathComponent("\(UUID().uuidString)-mergedVideo.mp4").path
}
func degreeToRadian(_ degree: CGFloat) -> CGFloat {
fileprivate func degreeToRadian(_ degree: CGFloat) -> CGFloat {
return (.pi * degree / 180.0)
}
}
Expand Down
Binary file modified DPVideoMerger_Swift.framework.zip
View file
Binary file not shown.

0 comments on commit 619313c

Please sign in to comment.