pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-04-08 08:07:26 +09:00
Code Issues Projects Releases Wiki Activity

A candidate fix

Browse Source
This commit is contained in:
Charlie Gillespie 2021-03-12 16:45:14 -05:00
parent 30d833a9f4
commit a709b01f0f
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/options.py
View File

@ -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') 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',

27
youtube_dl/postprocessor/ffmpeg.py
View File

@ -277,7 +277,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
if (self._preferredcodec == 'best' if (self._preferredcodec == 'best'
or (self._preferredquality is None or (self._preferredquality is None
and (self._preferredcodec == filecodec 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']: if filecodec == 'aac' and self._preferredcodec in ['m4a', 'best']:
# Lossless, but in another container # Lossless, but in another container
acodec = 'copy' acodec = 'copy'
@ -296,22 +296,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':
@ -330,8 +330,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
# Don't overwrite files if the nopostoverwrites option is active or if # Don't overwrite files if the nopostoverwrites option is active or if
# ffmpeg would just copy them anyway # ffmpeg would just copy them anyway
if ((new_path == path and acodec == 'copy') if (new_path == path and acodec == 'copy') or (self._nopostoverwrites and os.path.exists(encodeFilename(new_path))):
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