diff --git a/DASH-ffmpeg-VP9-encoder.sh b/DASH-ffmpeg-VP9-encoder.sh index 4d70bdc..3ee087b 100644 --- a/DASH-ffmpeg-VP9-encoder.sh +++ b/DASH-ffmpeg-VP9-encoder.sh @@ -66,7 +66,7 @@ encode_360p() { encode_720p() { size="1280x720" size_params_30f="-s ${size} -b:v 1024k -minrate 512k -maxrate 1485k -tile-columns 2 -threads 8 -quality good -crf 32" - encode "size_params_30f" "${prefix}-${size}-30f.webm" + encode "$size_params_30f" "${prefix}-${size}-30f.webm" size_params_60f="-s ${size} -b:v 1800k -minrate 900k -maxrate 2610k -tile-columns 2 -threads 8 -quality good -crf 32" encode "$size_params_60f" "${prefix}-${size}-60f.webm" diff --git a/do-conversion-to-host b/do-conversion-to-host new file mode 100644 index 0000000..daea045 --- /dev/null +++ b/do-conversion-to-host @@ -0,0 +1,53 @@ +#!/bin/bash +#./filter-wmv tree.txt > tree-wmv.txt +rclone lsf -R bscdn:bscdn/CurriculumApp-og --files-only --recursive > log/tree.list +touch log/uploaded.list +touch log/wmv-converted.list +touch log/mp4-converted.list +touch log/rest.list +#filename=$1 +allList=log/tree.list +dstFolder="/mnt/v1/CurriculumApp/one/" +while read p; do + fileog="https://bscdn.sgp1.digitaloceanspaces.com/CurriculumApp-og/${p}" +# filetarget="${dstFolder}${p}" + echo $filetarget + fName="$(basename -- ${fileog})" + fDir="$(dirname -- ${p})" + wget -O "tmp/${fName}" "${fileog}" 2> /dev/null + filetarget="bscdn:bscdn/CurriculumApp1/${fDir}" + +#cp1="curl -o /dev/null --silent --head --write-out '%{http_code}\n'" +resp="$(curl -o /dev/null --silent --head --write-out '%{http_code}' https://bscdn.sgp1.digitaloceanspaces.com/CurriculumApp1/${p})" +#echo $resp +#exit 1 +if [ "$resp" == "200" ];then +echo "$p" >> log/uploaded.list +echo "$p --already there" +else + if [ "${p: -4}" == ".wmv" ]; then + echo "converting ${p} to ${fName}.wmv" + ffmpeg -loglevel error -i "tmp/${fName}" -c:v libvpx-vp9 -c:a libopus "tmp/${fName}.webm" 2> /dev/null + rm "tmp/${fName}" + mv "tmp/${fName}.webm" "tmp/${fName}" + echo "${p}" >> log/wmv-converted.list + rclone copy "tmp/${fName}" "${filetarget}" + rm "tmp/${fName}" + + elif [ "${p: -4}" == ".mp4" ]; then + echo "converting ${p} to ${fName}.wmv" + ffmpeg -loglevel error -i "tmp/${fName}" -c:v libvpx-vp9 -c:a libopus "tmp/${fName}.webm" 2> /dev/null + rm "tmp/${fName}" + mv "tmp/${fName}.webm" "tmp/${fName}" + echo "${p}" >> log/mp4-converted.list + rclone copy "tmp/${fName}" "${filetarget}" + rm "tmp/${fName}" + else + echo "${fName}" "${filetarget}" + echo "${fName}" >> log/rest.list + rclone copy "tmp/${fName}" "${filetarget}" + rm "tmp/${fName}" + fi +fi +echo -e "\n\n" +done < "${allList}" \ No newline at end of file