From 5857807e7c9629bbd7d967fa631140f541d343f5 Mon Sep 17 00:00:00 2001
From: huangjx <freefallbenson@gmail.com>
Date: Sun, 10 Oct 2021 13:48:45 +0800
Subject: [PATCH] convert audio to  mp3 when ffmpeg is available, otherwise
 default to m4a;

---
 lib/Tools/Youtube.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/Tools/Youtube.php b/lib/Tools/Youtube.php
index 207f8e7..9fc486a 100644
--- a/lib/Tools/Youtube.php
+++ b/lib/Tools/Youtube.php
@@ -10,7 +10,7 @@ class Youtube
 {
     private $ipv4Only;
     public $audioOnly = 0;
-    private $audioFormat = 'm4a', $videoFormat;
+    public $audioFormat = 'm4a', $videoFormat;
     private $format = 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best';
     private $options = [];
     private $downloadDir;
@@ -62,9 +62,9 @@ class Youtube
             $this->addOption('--add-metadata');
             $this->addOption('--metadata-from-title');
             $this->addOption("%(artist)s - %(title)s");
-            $this->addOption('--audio-format');
-            $this->addOption($this->audioFormat);
+            $this->audioFormat = 'mp3';
         }
+        $this->setAudioFormat($this->audioFormat);
         $this->addOption('--extract-audio');
         return $this;
     }
@@ -74,6 +74,16 @@ class Youtube
         $this->setOption('--audio-quality', $value);
     }
 
+    public function setAudioFormat($format)
+    {
+        $this->setOption('--audio-format',$format);
+    }
+
+    public function setvideoFormat($format)
+    {
+        $this->videoFormat = $format;
+    }
+
     public function GetUrlOnly()
     {
         $this->addOption('--get-filename');
@@ -201,16 +211,6 @@ class Youtube
         return $this;
     }
 
-    public function setAudioFormat($format)
-    {
-        $this->audioFormat = $format;
-    }
-
-    public function setvideoFormat($format)
-    {
-        $this->videoFormat = $format;
-    }
-
     private function buildCMD()
     {
         $this->cmd = $this->bin; //. " 2>&1";