From a709b01f0f1b0808310745a9815530ced841219b Mon Sep 17 00:00:00 2001 From: Charlie Gillespie Date: Fri, 12 Mar 2021 16:45:14 -0500 Subject: [PATCH] A candidate fix --- youtube_dl/options.py | 2 +- youtube_dl/postprocessor/ffmpeg.py | 31 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 241cf110f..d918e2f44 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -792,7 +792,7 @@ def parseOpts(overrideArguments=None): help='Specify audio format: "best", "aac", "flac", "mp3", "m4a", "opus", "vorbis", or "wav"; "%default" by default; No effect without -x') postproc.add_option( '--audio-quality', metavar='QUALITY', - dest='audioquality', default='5', + dest='audioquality', default=None, help='Specify ffmpeg/avconv audio quality, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default %default)') postproc.add_option( '--recode-video', diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 8e841b255..48471bd65 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -274,10 +274,10 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): raise PostProcessingError('WARNING: unable to obtain file audio codec with ffprobe') more_opts = [] - if (self._preferredcodec == 'best' - or (self._preferredquality is None + if (self._preferredcodec == 'best' + or (self._preferredquality is None and (self._preferredcodec == filecodec - or (self._preferredcodec == 'm4a' and filecodec == 'aac')))): + or (self._preferredcodec == 'm4a' and filecodec == 'aac')))): if filecodec == 'aac' and self._preferredcodec in ['m4a', 'best']: # Lossless, but in another container acodec = 'copy' @@ -296,22 +296,22 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): acodec = 'libmp3lame' extension = 'mp3' more_opts = [] - if self._preferredquality is not None: - if int(self._preferredquality) < 10: - more_opts += ['-q:a', self._preferredquality] - else: - more_opts += ['-b:a', self._preferredquality + 'k'] + self._preferredquality = self._preferredquality if self._preferredquality else "5" + if int(self._preferredquality) < 10: + more_opts += ['-q:a', self._preferredquality] + else: + more_opts += ['-b:a', self._preferredquality + 'k'] else: # We convert the audio (lossy if codec is lossy) acodec = ACODECS[self._preferredcodec] extension = self._preferredcodec more_opts = [] - if self._preferredquality is not None: - # The opus codec doesn't support the -aq option - if int(self._preferredquality) < 10 and extension != 'opus': - more_opts += ['-q:a', self._preferredquality] - else: - more_opts += ['-b:a', self._preferredquality + 'k'] + self._preferredquality = self._preferredquality if self._preferredquality else "5" + # The opus codec doesn't support the -aq option + if int(self._preferredquality) < 10 and extension != 'opus': + more_opts += ['-q:a', self._preferredquality] + else: + more_opts += ['-b:a', self._preferredquality + 'k'] if self._preferredcodec == 'aac': more_opts += ['-f', 'adts'] if self._preferredcodec == 'm4a': @@ -330,8 +330,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): # Don't overwrite files if the nopostoverwrites option is active or if # ffmpeg would just copy them anyway - if ((new_path == path and acodec == 'copy') - or (self._nopostoverwrites and os.path.exists(encodeFilename(new_path)))): + if (new_path == path and acodec == 'copy') or (self._nopostoverwrites and os.path.exists(encodeFilename(new_path))): self._downloader.to_screen('[ffmpeg] Post-process file %s exists, skipping' % new_path) return [], information