pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-01-28 06:10:11 +09:00
Code Issues Projects Releases Wiki Activity

Partial fix for 8366 (still not fully fixed)

Browse Source
This commit is contained in:
Charlie Gillespie 2021-03-12 06:36:56 -05:00
parent fc2c6d5323
commit 30d833a9f4
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/postprocessor/ffmpeg.py
View File

@ -274,7 +274,10 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
raise PostProcessingError('WARNING: unable to obtain file audio codec with ffprobe') raise PostProcessingError('WARNING: unable to obtain file audio codec with ffprobe')
more_opts = [] 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']: if filecodec == 'aac' and self._preferredcodec in ['m4a', 'best']:
# Lossless, but in another container # Lossless, but in another container
acodec = 'copy' acodec = 'copy'
@ -325,15 +328,22 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
information['filepath'] = new_path information['filepath'] = new_path
information['ext'] = extension information['ext'] = extension
# If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly. # Don't overwrite files if the nopostoverwrites option is active or if
if (new_path == path # ffmpeg would just copy them anyway
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) self._downloader.to_screen('[ffmpeg] Post-process file %s exists, skipping' % new_path)
return [], information return [], information
try: try:
self._downloader.to_screen('[ffmpeg] Destination: ' + new_path) 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: except AudioConversionError as e:
raise PostProcessingError( raise PostProcessingError(
'audio conversion failed: ' + e.msg) 'audio conversion failed: ' + e.msg)
@ -346,7 +356,10 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
new_path, time.time(), information['filetime'], new_path, time.time(), information['filetime'],
errnote='Cannot update utime of audio file') errnote='Cannot update utime of audio file')
return [path], information if new_path == path:
return [], information
else:
return [path], information
class FFmpegVideoConvertorPP(FFmpegPostProcessor): class FFmpegVideoConvertorPP(FFmpegPostProcessor):