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

Merge d4a4d9b188 into c5098961b0

Browse Source
This commit is contained in:
Charlie Gillespie 2024-08-21 22:33:22 -04:00 committed by GitHub
commit b2d5e86811
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/options.py
View File

@ -800,7 +800,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') help='Specify audio format: "best", "aac", "flac", "mp3", "m4a", "opus", "vorbis", or "wav"; "%default" by default; No effect without -x')
postproc.add_option( postproc.add_option(
'--audio-quality', metavar='QUALITY', '--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)') 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( postproc.add_option(
'--recode-video', '--recode-video',

46
youtube_dl/postprocessor/ffmpeg.py
View File

@ -270,7 +270,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'
@ -289,22 +292,22 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
acodec = 'libmp3lame' acodec = 'libmp3lame'
extension = 'mp3' extension = 'mp3'
more_opts = [] more_opts = []
if self._preferredquality is not None: self._preferredquality = self._preferredquality if self._preferredquality else "5"
if int(self._preferredquality) < 10: if int(self._preferredquality) < 10:
more_opts += ['-q:a', self._preferredquality] more_opts += ['-q:a', self._preferredquality]
else: else:
more_opts += ['-b:a', self._preferredquality + 'k'] more_opts += ['-b:a', self._preferredquality + 'k']
else: else:
# We convert the audio (lossy if codec is lossy) # We convert the audio (lossy if codec is lossy)
acodec = ACODECS[self._preferredcodec] acodec = ACODECS[self._preferredcodec]
extension = self._preferredcodec extension = self._preferredcodec
more_opts = [] more_opts = []
if self._preferredquality is not None: self._preferredquality = self._preferredquality if self._preferredquality else "5"
# The opus codec doesn't support the -aq option # The opus codec doesn't support the -aq option
if int(self._preferredquality) < 10 and extension != 'opus': if int(self._preferredquality) < 10 and extension != 'opus':
more_opts += ['-q:a', self._preferredquality] more_opts += ['-q:a', self._preferredquality]
else: else:
more_opts += ['-b:a', self._preferredquality + 'k'] more_opts += ['-b:a', self._preferredquality + 'k']
if self._preferredcodec == 'aac': if self._preferredcodec == 'aac':
more_opts += ['-f', 'adts'] more_opts += ['-f', 'adts']
if self._preferredcodec == 'm4a': if self._preferredcodec == 'm4a':
@ -321,15 +324,21 @@ 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' 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) 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)
@ -342,7 +351,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):