From 30d833a9f4ff0b81bfc1894042a8b3c29467e42b Mon Sep 17 00:00:00 2001 From: Charlie Gillespie Date: Fri, 12 Mar 2021 06:36:56 -0500 Subject: [PATCH 1/3] Partial fix for 8366 (still not fully fixed) --- youtube_dl/postprocessor/ffmpeg.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 5f7298345..8e841b255 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -274,7 +274,10 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): raise PostProcessingError('WARNING: unable to obtain file audio codec with ffprobe') more_opts = [] - if self._preferredcodec == 'best' or self._preferredcodec == filecodec or (self._preferredcodec == 'm4a' and filecodec == 'aac'): + if (self._preferredcodec == 'best' + or (self._preferredquality is None + and (self._preferredcodec == filecodec + or (self._preferredcodec == 'm4a' and filecodec == 'aac')))): if filecodec == 'aac' and self._preferredcodec in ['m4a', 'best']: # Lossless, but in another container acodec = 'copy' @@ -325,15 +328,22 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): information['filepath'] = new_path information['ext'] = extension - # If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly. - if (new_path == path - or (self._nopostoverwrites and os.path.exists(encodeFilename(new_path)))): + # 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)))): self._downloader.to_screen('[ffmpeg] Post-process file %s exists, skipping' % new_path) return [], information try: self._downloader.to_screen('[ffmpeg] Destination: ' + new_path) - self.run_ffmpeg(path, new_path, acodec, more_opts) + if new_path == path: + temp_filename = prepend_extension(path, 'temp') + self.run_ffmpeg(path, temp_filename, acodec, more_opts) + os.remove(encodeFilename(path)) + os.rename(encodeFilename(temp_filename), encodeFilename(path)) + else: + self.run_ffmpeg(path, new_path, acodec, more_opts) except AudioConversionError as e: raise PostProcessingError( 'audio conversion failed: ' + e.msg) @@ -346,7 +356,10 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): new_path, time.time(), information['filetime'], errnote='Cannot update utime of audio file') - return [path], information + if new_path == path: + return [], information + else: + return [path], information class FFmpegVideoConvertorPP(FFmpegPostProcessor): From a709b01f0f1b0808310745a9815530ced841219b Mon Sep 17 00:00:00 2001 From: Charlie Gillespie Date: Fri, 12 Mar 2021 16:45:14 -0500 Subject: [PATCH 2/3] 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 From d4a4d9b1880a57d1a6c577e5a27422ce1b334fb2 Mon Sep 17 00:00:00 2001 From: Charlie Gillespie Date: Fri, 12 Mar 2021 17:39:27 -0500 Subject: [PATCH 3/3] Now reencodes if custom postprocessor args --- youtube_dl/postprocessor/ffmpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 48471bd65..2e642f547 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -330,7 +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' and not self._configuration_args()) 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