增加文字水印和图片水印的显示周期和起始时间。

Author: Administrator

joevideolib/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
  compileSdkVersion 25
- buildToolsVersion "25.0.0"
+ buildToolsVersion '26.0.2'
 
  defaultConfig {
  minSdkVersion 16

joevideolib/src/main/java/VideoHandle/EpDraw.java

@@ -14,6 +14,8 @@ public class EpDraw {
 private float picHeight;//图片的高
 private boolean isAnimation;//是否是动图
 
+private String time = "";//起始结束时间
+
 private String picFilter;//图片滤镜
 
 public EpDraw(String picPath, int picX, int picY, float picWidth, float picHeight, boolean isAnimation) {
@@ -25,6 +27,16 @@ public EpDraw(String picPath, int picX, int picY, float picWidth, float picHeigh
 this.isAnimation = isAnimation;
 }
 
+public EpDraw(String picPath, int picX, int picY, float picWidth, float picHeight, boolean isAnimation,int start,int end) {
+this.picPath = picPath;
+this.picX = picX;
+this.picY = picY;
+this.picWidth = picWidth;
+this.picHeight = picHeight;
+this.isAnimation = isAnimation;
+time = ":enable=between(t\\," + start + "\\," + end + ")";
+}
+
 public String getPicPath() {
 return picPath;
 }
@@ -53,6 +65,10 @@ public String getPicFilter() {
 return picFilter == null ? "" : (picFilter + ",");
 }
 
+public String getTime() {
+return time;
+}
+
 public void setPicFilter(String picFilter) {
 this.picFilter = picFilter;
 }

joevideolib/src/main/java/VideoHandle/EpEditor.java

@@ -72,7 +72,8 @@ public void exec(EpVideo epVideo, OutputOption outputOption, OnEditorListener on
 } else {
 cmd.append("[outo").append(i - 1).append("]").append("[outv").append(i + 1).append("]");
 }
-cmd.append("overlay=").append(epDraws.get(i).getPicX()).append(":").append(epDraws.get(i).getPicY());
+cmd.append("overlay=").append(epDraws.get(i).getPicX()).append(":").append(epDraws.get(i).getPicY())
+.append(epDraws.get(i).getTime());
 if (epDraws.get(i).isAnimation()) {
 cmd.append(":shortest=1");
 }
@@ -184,7 +185,8 @@ public void merge(List<EpVideo> epVideos, OutputOption outputOption, OnEditorLis
 for (int j = 0; j < epVideos.get(i).getEpDraws().size(); j++) {
 cmd.append("[outv").append(i).append("][p").append(i).append("a").append(j).append("]overlay=")
 .append(epVideos.get(i).getEpDraws().get(j).getPicX()).append(":")
-.append(epVideos.get(i).getEpDraws().get(j).getPicY());
+.append(epVideos.get(i).getEpDraws().get(j).getPicY())
+.append(epVideos.get(i).getEpDraws().get(j).getTime());
 if (epVideos.get(i).getEpDraws().get(j).isAnimation()) {
 cmd.append(":shortest=1");
 }

joevideolib/src/main/java/VideoHandle/EpText.java

@@ -0,0 +1,59 @@
+package VideoHandle;
+
+/**
+ * Created by Administrator on 2017/11/8.
+ */
+
+public class EpText {
+
+private String textFitler;
+
+/**
+ * @param x 文字起始位置X
+ * @param y 文字起始位置Y
+ * @param size 文字的大小
+ * @param color 文字的颜色
+ * @param ttf 文字的字体文件路径
+ * @param text 添加文字的内容
+ * @param time 起始结束时间(传null的时候为一直显示)
+ */
+public EpText(int x, int y, float size, Color color, String ttf, String text, Time time) {
+this.textFitler = "drawtext=fontfile=" + ttf + ":fontsize=" + size + ":fontcolor=" + color.getColor() + ":x=" + x + ":y=" + y + ":text='" + text + "'" + (time == null ? "" : time.getTime());
+}
+
+public String getTextFitler() {
+return textFitler;
+}
+
+/**
+ * 起始结束时间的类
+ */
+public static class Time {
+private String time;
+
+public Time(int start, int end) {
+this.time = ":enable=between(t\\," + start + "\\," + end + ")";
+}
+
+public String getTime() {
+return time;
+}
+}
+
+/**
+ * 颜色
+ */
+public enum Color {
+Red("Red"), Blue("Blue"), Yellow("Yellow"), Black("Black"), DarkBlue("DarkBlue"),
+Green("Green"), SkyBlue("SkyBlue"), Orange("Orange"), White("White"), Cyan("Cyan");
+private String color;
+
+Color(String color) {
+this.color = color;
+}
+
+public String getColor() {
+return color;
+}
+}
+}

joevideolib/src/main/java/VideoHandle/EpVideo.java

@@ -173,13 +173,26 @@ public Crop getCrop(){
  * @param y 文字的y坐标
  * @param ttf 文字字体的路径
  * @param text 添加的文字
+ * @deprecated 废弃，采用EpText参数
  */
+@Deprecated
 public EpVideo addText(int x, int y, float size, String color, String ttf, String text) {
 filter = getFilter();
 filter.append("drawtext=fontfile=" + ttf + ":fontsize=" + size + ":fontcolor=" + color + ":x=" + x + ":y=" + y + ":text='" + text + "'");
 return this;
 }
 
+/**
+ * 为视频添加文字(新增可以控制显示周期)
+ *
+ * @param epText 添加文字类
+ */
+public EpVideo addText(EpText epText) {
+filter = getFilter();
+filter.append(epText.getTextFitler());
+return this;
+}
+
 /**
  * 为视频添加时间
  *