diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-06-12 11:39:58 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-06-12 11:39:58 +0200 |
commit | cd2064b69a7138956b4decfbb155a27719038fd5 (patch) | |
tree | 3f9e5edfa7c227a7efbf61ec6530a94c6637a4ef /odin/strm/download_youtube | |
parent | 80713a492f6936866ce1331d27b429105ead558f (diff) | |
download | nixos-cd2064b69a7138956b4decfbb155a27719038fd5.tar nixos-cd2064b69a7138956b4decfbb155a27719038fd5.tar.gz nixos-cd2064b69a7138956b4decfbb155a27719038fd5.tar.bz2 nixos-cd2064b69a7138956b4decfbb155a27719038fd5.tar.xz nixos-cd2064b69a7138956b4decfbb155a27719038fd5.zip |
Revert "Prefer h264"
This reverts commit 80713a492f6936866ce1331d27b429105ead558f.
Diffstat (limited to 'odin/strm/download_youtube')
-rw-r--r-- | odin/strm/download_youtube | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/odin/strm/download_youtube b/odin/strm/download_youtube index c652be27..921a29a7 100644 --- a/odin/strm/download_youtube +++ b/odin/strm/download_youtube | |||
@@ -99,7 +99,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
99 | exit 1 | 99 | exit 1 |
100 | fi | 100 | fi |
101 | 101 | ||
102 | formatString='bestvideo[width<=2560][height<=1440][fps<=60][vcodec=h264]+bestaudio[acodec=aac]/bestvideo[width<=2560][height<=1440][fps<=60]+bestaudio/best[width<=2560][height<=1440][fps<=60]/best' | 102 | formatString='bestvideo[width<=2560][height<=1440][fps<=60][vcodec=vp9]+bestaudio[acodec=opus]/bestvideo[width<=2560][height<=1440][fps<=60]+bestaudio/best[width<=2560][height<=1440][fps<=60]/best' |
103 | 103 | ||
104 | if [[ ${msgTags[(i)tv]} -le $#msgTags ]]; then | 104 | if [[ ${msgTags[(i)tv]} -le $#msgTags ]]; then |
105 | formatString="bestvideo[width<=2560][height<=1440][fps<=60][vcodec=h264]+bestaudio[acodec=aac]/bestvideo[width<=2560][height<=1440][fps<=60][vcodec=mpeg]+bestaudio[acodec=aac]/mp4[width<=2560][height<=1440][fps<=60][vcodec=h264][acodec=aac]/mp4[width<=2560][height<=1440][fps<=60][vcodec=mpeg][acodec=aac]/${formatString}" | 105 | formatString="bestvideo[width<=2560][height<=1440][fps<=60][vcodec=h264]+bestaudio[acodec=aac]/bestvideo[width<=2560][height<=1440][fps<=60][vcodec=mpeg]+bestaudio[acodec=aac]/mp4[width<=2560][height<=1440][fps<=60][vcodec=h264][acodec=aac]/mp4[width<=2560][height<=1440][fps<=60][vcodec=mpeg][acodec=aac]/${formatString}" |
@@ -251,7 +251,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
251 | if [[ ${cType} == "video" ]]; then | 251 | if [[ ${cType} == "video" ]]; then |
252 | if [[ ${ext} == "mkv" ]]; then | 252 | if [[ ${ext} == "mkv" ]]; then |
253 | case ${cName} in | 253 | case ${cName} in |
254 | h264|png) | 254 | h264|vp9|png) |
255 | cargs+=(-c:${i} copy) | 255 | cargs+=(-c:${i} copy) |
256 | ;; | 256 | ;; |
257 | *) | 257 | *) |
@@ -259,8 +259,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
259 | # prePass+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33) | 259 | # prePass+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33) |
260 | # p2args+=(-pass 2 -threads 8 -speed 2 -tile-columns 6 -frame-parallel 1 -auto-alt-ref 1 -lag-in-frames 25) | 260 | # p2args+=(-pass 2 -threads 8 -speed 2 -tile-columns 6 -frame-parallel 1 -auto-alt-ref 1 -lag-in-frames 25) |
261 | # cargs+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33) | 261 | # cargs+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33) |
262 | # cargs+=(-c:${i} libvpx-vp9 -b:${i} 2M -threads 8 -tile-columns 6 -frame-parallel 1) | 262 | cargs+=(-c:${i} libvpx-vp9 -b:${i} 2M -threads 8 -tile-columns 6 -frame-parallel 1) |
263 | cargs+=(-c:${i} libx264) | ||
264 | ;; | 263 | ;; |
265 | esac | 264 | esac |
266 | elif [[ ${ext} == "mp4" ]]; then | 265 | elif [[ ${ext} == "mp4" ]]; then |