From cd2064b69a7138956b4decfbb155a27719038fd5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 12 Jun 2018 11:39:58 +0200
Subject: Revert "Prefer h264"

This reverts commit 80713a492f6936866ce1331d27b429105ead558f.
---
 odin/strm/download_youtube | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'odin/strm/download_youtube')

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}"
       exit 1
   fi
 
-  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'
+  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'
 
   if [[ ${msgTags[(i)tv]} -le $#msgTags ]]; then
       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}"
             if [[ ${cType} == "video" ]]; then
                 if [[ ${ext} == "mkv" ]]; then
                     case ${cName} in
-                        h264|png)
+                        h264|vp9|png)
                             cargs+=(-c:${i} copy)
                             ;;
                         *)
@@ -259,8 +259,7 @@ printf ">>> %s <<<\n  %s\n" "${msgId}" "${message}"
                             # prePass+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33)
                             # p2args+=(-pass 2 -threads 8 -speed 2 -tile-columns 6 -frame-parallel 1 -auto-alt-ref 1 -lag-in-frames 25)
                             # cargs+=(-c:${i} libvpx-vp9 -b:${i} 0 -crf:${i} 33)
-                            # cargs+=(-c:${i} libvpx-vp9 -b:${i} 2M -threads 8 -tile-columns 6 -frame-parallel 1)
-                            cargs+=(-c:${i} libx264)
+                            cargs+=(-c:${i} libvpx-vp9 -b:${i} 2M -threads 8 -tile-columns 6 -frame-parallel 1)
                             ;;
                     esac
                 elif [[ ${ext} == "mp4" ]]; then
-- 
cgit v1.2.3