增加跑马灯

Author: qianjianeng

README.md

@@ -18,6 +18,7 @@
 * [x] [7. 去除水印] 
 * [x] [8. 调整视频分辨率] 
 * [x] [9. 添加文字水印] 
+* [x] [9_1. 添加跑马灯文字水印] 
 * [x] [10. 添加图片水印]
 * [x] [11. 倍速播放(加速减速)]
 * [x] [12. 添加片头] 
@@ -26,7 +27,6 @@
 * TODO
 * [ ] [1. 去掉视频原有的配音] 
 * [ ] [2. 添加自己的配音] 
-* [ ] [3. 跑马灯水印]
 * [ ] [4. 添加字幕]
 
 
@@ -100,6 +100,9 @@ cd mac 进入到mac 文件夹下
 #### 1.3
 链接:https://pan.baidu.com/s/1n0VdfU7vW8q_jrPMK1VrqQ 密码:x4dn
 
+#### 1.4
+链接:https://pan.baidu.com/s/1bbBdaYNm5XsBjuZ_Vvb5Og 密码:yf0d
+
 ## 版本更新记录
 
 #### 1.0
@@ -128,6 +131,10 @@ windows `./vm.exe -f config1.toml`
 #### 1.3
 * 增加倍速播放，可以将视频加速或者减速
 
+#### 1.4 
+* 文字水印，图片水印增加4种样式，一共9种
+* 增加文字水印跑马灯效果
+
 ## 其他说明
 
 自媒体创作者可以加我微信，备注自媒体，拉你进交流群。

config.toml

@@ -9,29 +9,29 @@ videoPath = "./video"
 system = 0
 ## 1. 视频格式转换
 [format]
- switch = true
+ switch = false
  form = "mp4"
 
 ## 2. 帧率设置
 ## eg: +5 在原来的基础上+5 -5 在原来的基础上-5 20 修改为20
 [frameRate]
- switch = true
+ switch = false
  value = "+5"
 
 ## 3. 码率设置
 ## eg: +5 在原来的基础上+5 -5 在原来的基础上-5 20 修改为20
 [bitRate]
- switch = true
+ switch = false
  value = "+5"
 
 ## 4. 减掉视频前几秒
 [cutFront]
- switch = true
+ switch = false
  value = 2
 
 ## 5. 减掉视频最后几秒
 [cutBack]
- switch = true
+ switch = false
  value = 2
 
 # 6. 视频剪裁
@@ -48,7 +48,7 @@ system = 0
 
 ## 7. 去除水印
 [clearWater]
- switch = true
+ switch = false
  x = 10
  y = 10
  w = 100
@@ -62,39 +62,51 @@ system = 0
  h = 1920
 
 ## 9. 文字水印
-## eg: +5 在原来的基础上+5 -5 在原来的基础上-5 20 修改为20
 [waterText]
  switch = true
  content = "测试文字"
  path = "./source/simsun.ttc"
  size = 50
  color = "black"
  alpha = 0.8
- style = 1
+ style = 8
  sp1 = 50
  sp2 = 100
 
+## 9.1 滚动文字
+# isTop 顶部还是底部 sp 距离顶部或者底部的距离
+# leftToRight 是否从坐到右
+[runWaterText]
+ switch = false
+ content = "测试文字"
+ path = "./source/simsun.ttc"
+ size = 50
+ color = "black"
+ isTop = true
+ leftToRight = true
+ sp = 50
+
 
 ## 10. 图片水印
 [waterImage]
- switch = true
+ switch = false
  path = "./source/item.jpg"
  style = 2
  sp1 = 50
  sp2 = 100
 
 # 11. 倍速播放（取值范围 0.5~2）0.5 速度减慢一倍，2 速度加快一倍，1 速度不变
 [speed]
- switch = true
+ switch = false
  v = "2"
 
 ## 12. 片头
 [filmTitle]
- switch = true
+ switch = false
  path = "./source/film.mp4"
 
 ## 13. 片尾
 [filmEnd]
- switch = true
+ switch = false
  path = "./source/film.mp4"
 

deal/config/config.go

@@ -20,6 +20,7 @@ type Config struct {
 ClearWater ClearWater
 Resolution Resolution
 WaterText WaterText
+RunWaterText RunWaterText `toml:"RunWaterText"`
 WaterImage WaterImage
 Speed Speed
 FilmTitle FilmTitle
@@ -89,6 +90,17 @@ type WaterText struct {
 Sp2 int
 }
 
+type RunWaterText struct {
+Switch bool
+Content string
+Path string
+Size int
+Color string
+IsTop bool `toml:"isTop"`
+LeftToRight bool `toml:"leftToRight"`
+Sp int
+}
+
 type WaterImage struct {
 Switch bool
 Path string

deal/factory/factory.go

@@ -136,17 +136,17 @@ func deal(f string, con *config.Config)string {
 f = ffmpeg.CropVideo(fCmd,f,con.Crop.Start,con.Crop.Duration,con.Crop.X,con.Crop.Y,con.Crop.W,con.Crop.H)
 }
 
-// 6. clear water
+// 7. clear water
 if con.ClearWater.Switch {
 f = ffmpeg.ClearWater(fCmd,f,con.ClearWater.X,con.ClearWater.Y,con.ClearWater.W,con.ClearWater.H)
 }
 
-//7. Resolution
+//8. Resolution
 if con.Resolution.Switch {
 f = ffmpeg.UpdateResolution(fCmd, f, con.Resolution.W, con.Resolution.H)
 }
 
-//8. water text
+//9. water text
 if con.WaterText.Switch {
 info, err := ffmpeg.GetVideoInfo(fCmd, f)
 if err != nil {
@@ -166,7 +166,25 @@ func deal(f string, con *config.Config)string {
 )
 }
 
-//9. water image
+// 9.1 runtext
+if con.RunWaterText.Switch {
+info, err := ffmpeg.GetVideoInfo(fCmd, f)
+if err != nil {
+return f
+}
+f = info.AddScrollTextWater(
+fCmd,
+f,
+con.RunWaterText.Path,
+con.RunWaterText.Content,
+con.RunWaterText.Color,
+con.RunWaterText.Size,
+con.RunWaterText.IsTop,
+con.RunWaterText.LeftToRight,
+con.RunWaterText.Sp,
+)
+}
+//10. water image
 if con.WaterImage.Switch {
 info, err := ffmpeg.GetVideoInfo(fCmd, f)
 if err != nil {

deal/factory/util.go

@@ -14,11 +14,11 @@ func GetFCmd(system int) string {
 system = info.PlatForm
 }
 if system == sys.MacOS {
-return "./source/mac/ffmpeg"
+return "./source/mac/tool"
 } else if system == sys.Win64{
-return "./source/win/64/ffmpeg.exe"
+return "./source/win/64/tool.exe"
 } else if system == sys.Win32 {
-return "./source/win/32/ffmpeg.exe"
+return "./source/win/32/tool.exe"
 }
 
 fmt.Println("系统类型无法识别，请在配置中指定：1:mac 3: win32 4:win64")

main.go

@@ -11,6 +11,7 @@ import (
 "time"
 )
 var conFile = flag.String("f", "", "config file")
+var videoPath = flag.String("v", "", "config file")
 func main() {
 Run()
 }
@@ -23,10 +24,14 @@ func Run() {
 return
 }
 
-
 con := config.ReadConfig(*conFile)
 fmt.Println(con)
 
+if len(*videoPath) > 0 {
+con.VideoPath = *videoPath
+fmt.Println(*videoPath)
+}
+
 factory.DoFactory(con)
 
 }
@@ -84,7 +89,8 @@ type Message struct {
 func check() bool {
 
 url := "https://api.github.com/repos/suifengqjn/videoWater/issues"
-resp, err := http.Get(url)
+client := http.Client{Timeout:time.Second*20}
+resp, err := client.Get(url)
 if err != nil {
 fmt.Println("请检查网络")
 return false