Merge branch 'master' of 10.10.14.250:huanghai/dsMin

.gitignore

@@ -39,3 +39,4 @@
 /dsAutoCode/.idea/
 /dsSupport/Source/
 /dsSupport/Target/
+/dsSupport/build/

dsSupport/Shell/install_ffmpeg.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+yum install gcc bzip2 -y
+
+cd /usr/local
+mkdir software 
+cd software
+
+# wget http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz 
+wget https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/ffmpeg/yasm-1.3.0.tar.gz
+tar zxvf yasm-1.3.0.tar.gz
+cd yasm-1.3.0
+./configure
+make && make install
+
+# https://www.videolan.org/developers/x264.html
+# 编译H264库
+cd /usr/local/software
+wget https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/ffmpeg/x264-master.tar.bz2
+
+tar -xjf x264-master.tar.bz2
+cd x264-master/
+./configure --prefix=/usr/local/x264 --enable-shared --enable-static --disable-asm
+make
+make install
+
+# 编译 ffmpeg
+#wget http://www.ffmpeg.org/releases/ffmpeg-4.3.tar.xz
+wget https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/ffmpeg/ffmpeg-4.3.tar.xz
+tar xvJf ffmpeg-4.3.tar.xz
+
+cd /usr/local/software/ffmpeg-4.3
+./configure --prefix=/usr/local/ffmpeg --enable-shared --enable-yasm --enable-libx264 --enable-gpl
+--enable-pthreads --extra-cflags=-I/usr/local/x264/include --extra-ldflags=-L/usr/local/x264/lib
+make -j4 && make install
+
+#配置环境变量
+echo "/usr/local/x264/lib/" >> /etc/ld.so.conf.d/x264.conf
+echo "include ld.so.conf.d/*.conf"  >>  /etc/ld.so.conf
+echo "/usr/local/ffmpeg/lib/"  >>  /etc/ld.so.conf
+ldconfig
+echo "PATH=$PATH:/usr/local/ffmpeg/bin" >> /etc/profile
+echo "export PATH" >> /etc/profile
+source /etc/profile
+echo "/usr/local/x264/lib/" >> /etc/ld.so.conf.d/x264.conf
+
+# 验证安装成果
+ffmpeg -version
+
+# 查看是否有264编码器
+ffmpeg -encoders |grep 264

dsSupport/Utils/ConvertUtil/ConvertUtil.go

@@ -18,7 +18,8 @@ var ffmpeg string
 
 func init() {
 	runDir, _ = os.Getwd()
-	ffmpeg = runDir + `\ffmpeg\ffmpeg.exe`
+	//ffmpeg = runDir + `\ffmpeg\ffmpeg.exe`
+	ffmpeg = `/usr/local/ffmpeg/bin/ffmpeg`
 }
 
 // https://blog.csdn.net/lijinshanba/article/details/95343634

dsSupport/修改关键帧.txt

@@ -1 +0,0 @@
-./ffmpeg/ffmpeg.exe  -i E:\Work\dsMin\dsSupport\Source\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19.wmv -strict -2  -qscale 0 -intra E:\Work\dsMin\dsSupport\Target\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19.wmv

dsSupport/编译Linux版本.cmd

@@ -0,0 +1,5 @@
+:: 创建Linux发布版本
+SET GOOS=linux
+SET GOARCH=amd64
+go build -o ./build/dsSupport main.go
+go build -o ./build/Convert ./ConvertMovie/Convert.go