优化视频导出格式，删除3gp格式

longitachi · Dec 13, 2017 · 7325169 · 7325169 · chuankelpf · Dec 17, 2017
1 parent ef1c119
commit 7325169
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 34 deletions.
diff --git a/PhotoBrowser/ZLCustomCamera.m b/PhotoBrowser/ZLCustomCamera.m
@@ -10,6 +10,7 @@
 #import <AVFoundation/AVFoundation.h>
 #import <CoreMotion/CoreMotion.h>
 #import "ZLPlayer.h"
+#import "ZLPhotoManager.h"
 
 
 #define kTopViewScale .5
@@ -777,7 +778,7 @@ - (void)onStartRecord
     movieConnection.videoOrientation = self.orientation;
     [movieConnection setVideoScaleAndCropFactor:1.0];
     if (![self.movieFileOutPut isRecording]) {
-        NSURL *url = [self getVideoFileUrl];
+        NSURL *url = [NSURL fileURLWithPath:[ZLPhotoManager getVideoExportFilePath:self.videoType]];
         [self.movieFileOutPut startRecordingToOutputFileURL:url recordingDelegate:self];
     }
 }
@@ -817,30 +818,6 @@ - (void)onDismiss
     });
 }
 
-- (NSURL *)getVideoFileUrl
-{
-    NSString *filePath = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, NO).firstObject;
-    NSString *format = self.videoType == ZLExportVideoTypeMov ? @"mov" : self.videoType == ZLExportVideoTypeMp4 ? @"mp4" : @"3gp";
-
-    filePath = [NSTemporaryDirectory() stringByAppendingString:[NSString stringWithFormat:@"%@.%@", [self getUniqueStrByUUID], format]];
-    return [NSURL fileURLWithPath:filePath];
-}
-
-- (NSString *)getUniqueStrByUUID
-{
-    CFUUIDRef uuidObj = CFUUIDCreate(nil);//create a new UUID
-
-    //get the string representation of the UUID
-    CFStringRef uuidString = CFUUIDCreateString(nil, uuidObj);
-
-    NSString *str = [NSString stringWithString:(__bridge NSString *)uuidString];
-
-    CFRelease(uuidObj);
-    CFRelease(uuidString);
-
-    return [str lowercaseString];
-}
-
 - (void)playVideo
 {
     if (!_playerView) {

diff --git a/PhotoBrowser/ZLDefine.h b/PhotoBrowser/ZLDefine.h
@@ -116,9 +116,9 @@ typedef NS_ENUM(NSUInteger, ZLCaptureSessionPreset) {
 };
 
 typedef NS_ENUM(NSUInteger, ZLExportVideoType) {
+    //default
     ZLExportVideoTypeMov,
     ZLExportVideoTypeMp4,
-    ZLExportVideoType3gp,
 };
 
 static inline void SetViewWidth(UIView *view, CGFloat width) {

diff --git a/PhotoBrowser/ZLPhotoActionSheet.h b/PhotoBrowser/ZLPhotoActionSheet.h
@@ -5,7 +5,7 @@
 //  Created by long on 15/11/25.
 //  Copyright © 2015年 long. All rights reserved.
 //
-//pods version 2.5.4 - 2017.12.5 update
+//pods version 2.5.5 - 2017.12.13 update
 
 #import <UIKit/UIKit.h>
 #import "ZLPhotoConfiguration.h"

diff --git a/PhotoBrowser/ZLPhotoManager.h b/PhotoBrowser/ZLPhotoManager.h
@@ -176,6 +176,13 @@
  */
 + (void)exportVideoForAsset:(PHAsset *)asset type:(ZLExportVideoType)type presetName:(NSString *)presetName complete:(void (^)(NSString *exportFilePath, NSError *error))complete;
 
+
+/**
+ 获取保存视频的路径
+ */
++ (NSString *)getVideoExportFilePath:(ZLExportVideoType)type;
+
+
 #pragma mark - 相册、相机、麦克风权限相关
 /**
  是否有相册访问权限

diff --git a/PhotoBrowser/ZLPhotoManager.m b/PhotoBrowser/ZLPhotoManager.m
@@ -833,7 +833,7 @@ + (void)export:(AVAsset *)asset range:(CMTimeRange)range type:(ZLExportVideoType
     NSURL *exportFileUrl = [NSURL fileURLWithPath:exportFilePath];
 
     exportSession.outputURL = exportFileUrl;
-    exportSession.outputFileType = AVFileTypeQuickTimeMovie;
+    exportSession.outputFileType = (type == ZLExportVideoTypeMov ? AVFileTypeQuickTimeMovie : AVFileTypeMPEG4);
     exportSession.timeRange = range;
 
     [exportSession exportAsynchronouslyWithCompletionHandler:^{
@@ -865,15 +865,28 @@ + (void)export:(AVAsset *)asset range:(CMTimeRange)range type:(ZLExportVideoType
 
 + (NSString *)getVideoExportFilePath:(ZLExportVideoType)type
 {
-    NSTimeInterval interval = [[[NSDate alloc] init] timeIntervalSince1970];
+    NSString *format = (type == ZLExportVideoTypeMov ? @"mov" : @"mp4");
 
-    NSString *format = type == ZLExportVideoTypeMov ? @"mov" : type == ZLExportVideoTypeMp4 ? @"mp4" : @"3gp";
-
-    NSString *exportFilePath = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%f.%@", interval, format]];
+    NSString *exportFilePath = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [self getUniqueStrByUUID], format]];
 
     return exportFilePath;
 }
 
++ (NSString *)getUniqueStrByUUID
+{
+    CFUUIDRef uuidObj = CFUUIDCreate(nil);//create a new UUID
+
+    //get the string representation of the UUID
+    CFStringRef uuidString = CFUUIDCreateString(nil, uuidObj);
+
+    NSString *str = [NSString stringWithString:(__bridge NSString *)uuidString];
+
+    CFRelease(uuidObj);
+    CFRelease(uuidString);
+
+    return [str lowercaseString];
+}
+
 #pragma mark - 权限相关
 + (BOOL)havePhotoLibraryAuthority
 {

diff --git a/PhotoBrowser/resource/ZLPhotoBrowser.bundle/btn_selected.png b/PhotoBrowser/resource/ZLPhotoBrowser.bundle/btn_selected.png
diff --git a/PhotoBrowser/resource/ZLPhotoBrowser.bundle/[email protected] b/PhotoBrowser/resource/ZLPhotoBrowser.bundle/[email protected]
diff --git a/PhotoBrowser/resource/ZLPhotoBrowser.bundle/[email protected] b/PhotoBrowser/resource/ZLPhotoBrowser.bundle/[email protected]
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@
  
 ### 更新日志
 ```
-● 2.5.5: 视频导出方法中添加压缩设置参数; 支持app名字国际化的获取; fix #157;
+● 2.5.5: 视频导出方法中添加压缩设置参数; 支持app名字国际化的获取; 删除视频导出3gp格式; fix #157;
 ● 2.5.4: 新增视频导出功能; 新增获取图片路径api; 优化自定义相机，当相机消失后恢复其他音乐软件的播放;
 ● 2.5.3: 拍摄视频及编辑视频支持多种格式(mov, mp4, 3gp); 新增相册名字等多语言，以完善手动设置语言时相册名字跟随系统的问题; 简化相册调用，configuration 由必传参数修改为非必传参数;
 ● 2.5.2: 提取相册配置参数独立为'ZLPhotoConfiguration'对象; 新增状态栏样式api; 优化部分代码;

diff --git a/ZLPhotoBrowser/Info.plist b/ZLPhotoBrowser/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.4</string>
+	<string>2.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>