WaterMark Update

fork4jm · Jan 11, 2019 · 73270dc · 73270dc
1 parent 1617c63
commit 73270dc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/huangruihao.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/huangruihao.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/WAVideoBox/ViewController.m b/WAVideoBox/ViewController.m
@@ -92,7 +92,7 @@ - (IBAction)addWaterMark:(id)sender {
     __weak typeof(self) wself = self;
 
     [_videoBox appendVideoByPath:_videoPath];
-    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.7, 0.2, 0.12)];
+    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.2, 0.2, 0)];
 
     [_videoBox asyncFinishEditByFilePath:filePath complete:^(NSError *error) {
         if (!error) {
@@ -192,7 +192,7 @@ - (IBAction)composeEdit:(id)sender {
     [_videoBox appendVideoByPath:_videoPath];
     [_videoBox appendVideoByPath:_testThreePath];
     [_videoBox replaceSoundBySoundPath:_testTwoPath];
-    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.7, 0.2, 0.1)];
+    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.2, 0.2, 0)];
 
     [_videoBox rotateVideoByDegress:180];
     [_videoBox dubbedSoundBySoundPath:_testOnePath];
@@ -228,7 +228,7 @@ - (IBAction)magicEdit:(id)sender {
     [_videoBox rangeVideoByTimeRange:CMTimeRangeMake(kCMTimeZero, CMTimeMake(3600, 600))];
 
     [_videoBox appendVideoByPath:_testOnePath];
-    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.7, 0.2, 0.12)];
+    [_videoBox appendWaterMark:[UIImage imageNamed:@"waterMark"] relativeRect:CGRectMake(0.7, 0.2, 0.2, 0)];
     [_videoBox rangeVideoByTimeRange:CMTimeRangeMake(CMTimeMake(3600, 600), CMTimeMake(3600, 600))];
 
     [_videoBox appendVideoByPath:_testTwoPath];

diff --git a/WAVideoBox/WAVideoBox/WAAVSeCommand/WAAVSERotateCommand.m b/WAVideoBox/WAVideoBox/WAAVSeCommand/WAAVSERotateCommand.m
@@ -110,13 +110,11 @@ - (NSUInteger)degressFromTransform:(CGAffineTransform)transForm
 
 - (void)converRect:(CALayer *)layer naturalRenderSize:(CGSize)size renderSize:(CGSize)renderSize{
 
-
-
     if (!CGSizeEqualToSize(size, renderSize)) {
         // 还原绝对位置
-        CGRect relativeRect = CGRectMake(layer.frame.origin.x / size.width, 1 - (layer.frame.origin.y + layer.bounds.size.height) / size.height, layer.bounds.size.width / size.width, layer.bounds.size.height / size.height);
+        CGRect relativeRect = CGRectMake(layer.frame.origin.x / size.width, layer.frame.origin.y / size.height, layer.bounds.size.width / size.width, layer.bounds.size.height / size.height);
 
-        layer.frame = CGRectMake(renderSize.width * relativeRect.origin.x,renderSize.height * (1 - relativeRect.origin.y) - renderSize.height * relativeRect.size.height,renderSize.width * relativeRect.size.width, renderSize.height * relativeRect.size.height);
+        layer.frame = CGRectMake(renderSize.width * relativeRect.origin.x,renderSize.height * relativeRect.origin.y,renderSize.width * relativeRect.size.width, renderSize.height * relativeRect.size.height);
 
     }
 }

diff --git a/WAVideoBox/WAVideoBox/WAVideoBox.h b/WAVideoBox/WAVideoBox/WAVideoBox.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-#import "WAAVSEGearboxCommand.h"
+#import "WAAVSEGearboxCommandModel.h"
 typedef NS_ENUM(NSUInteger,WAVideoExportRatio) {
     WAVideoExportRatioLowQuality,// 自动分辩率
     WAVideoExportRatioMediumQuality,// 自动分辩率
@@ -81,7 +81,6 @@ typedef NS_ENUM(NSUInteger,WAVideoExportRatio) {
  */
 - (BOOL)rangeVideoByTimeRange:(CMTimeRange)range;
 
-
 /**
  视频截取
 
@@ -102,7 +101,7 @@ typedef NS_ENUM(NSUInteger,WAVideoExportRatio) {
 /**
  为视频加入水印
  @param waterImg 图片
- @param relativeRect 相对尺寸 x ,y , width , height值均为 (0 ~ 1)
+ @param relativeRect 相对视频尺寸对比(0~1)), x(与视频左部的距离为VideoWidth * x) ,y (与视频底部的距离为VideoHeight * y), width (图片宽度为VideoWidth * width),height(图片高度为VideoHeight * height)，height可以直接设为零即为等比缩放
  @return 操作状态
  */
 - (BOOL)appendWaterMark:(UIImage *)waterImg relativeRect:(CGRect)relativeRect;

diff --git a/WAVideoBox/WAVideoBox/WAVideoBox.m b/WAVideoBox/WAVideoBox/WAVideoBox.m
@@ -252,8 +252,17 @@ - (BOOL)appendWaterMark:(UIImage *)waterImg relativeRect:(CGRect)relativeRect{
             WAAVSEImageMixCommand *command = [[WAAVSEImageMixCommand alloc] initWithComposition:composition];
             command.imageBg = NO;
             command.image = waterImg;
+
+
             [command imageLayerRectWithVideoSize:^CGRect(CGSize videoSize) {
-                return CGRectMake(videoSize.width * relativeRect.origin.x,videoSize.height * (1 - relativeRect.origin.y) - videoSize.height * relativeRect.size.height,videoSize.width * relativeRect.size.width, videoSize.height * relativeRect.size.height);
+
+                CGFloat height = 0;
+                if (relativeRect.size.height) {
+                    height = videoSize.height * relativeRect.size.height;
+                }else{
+                    height = videoSize.width * relativeRect.size.width * waterImg.size.height / waterImg.size.width;
+                }
+                return CGRectMake(videoSize.width * relativeRect.origin.x,videoSize.height * relativeRect.origin.y,videoSize.width * relativeRect.size.width, height);
             }];
             [command performWithAsset:composition.mutableComposition];
         }