diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 20:18:29 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 20:18:29 +0200 |
| commit | 234e230c8781ed46013a6a26d56c4b1dcbe57e69 (patch) | |
| tree | 711b462a8a59d31fbc830d523a029c021742f8ea /youtube_dl | |
| parent | 34ae0f9d2019c043f86cb31d37ba30fea9c2faf2 (diff) | |
| parent | 3a68d7b467d59e6df4d8473989dcd9edb460dd75 (diff) | |
| download | youtube-dl-234e230c8781ed46013a6a26d56c4b1dcbe57e69.tar.xz | |
Merge remote-tracking branch 'FiloSottille/vbr'
Conflicts:
youtube-dl
youtube-dl.exe
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/PostProcessor.py | 10 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index 527dc3a3d..375da1aa3 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -142,14 +142,20 @@ class FFmpegExtractAudioPP(PostProcessor): extension = 'mp3' more_opts = [] if self._preferredquality is not None: - more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] + if int(self._preferredquality) < 10: + more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality] + else: + more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] else: # We convert the audio (lossy) acodec = {'mp3': 'libmp3lame', 'aac': 'aac', 'm4a': 'aac', 'vorbis': 'libvorbis', 'wav': None}[self._preferredcodec] extension = self._preferredcodec more_opts = [] if self._preferredquality is not None: - more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] + if int(self._preferredquality) < 10: + more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality] + else: + more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] if self._preferredcodec == 'aac': more_opts += ['-f', 'adts'] if self._preferredcodec == 'm4a': diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 180a0707d..3b3a9a4f4 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -298,8 +298,8 @@ def parseOpts(): help='convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe)') postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best', help='"best", "aac", "vorbis", "mp3", "m4a", or "wav"; best by default') - postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='128K', - help='ffmpeg/avconv audio bitrate specification, 128k by default') + postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='5', + help='ffmpeg/avconv audio quality specification, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default 5)') postproc.add_option('-k', '--keep-video', action='store_true', dest='keepvideo', default=False, help='keeps the video file on disk after the post-processing; the video is erased by default') @@ -451,6 +451,10 @@ def _real_main(): if opts.extractaudio: if opts.audioformat not in ['best', 'aac', 'mp3', 'vorbis', 'm4a', 'wav']: parser.error(u'invalid audio format specified') + if opts.audioquality: + opts.audioquality = opts.audioquality.strip('k').strip('K') + if not opts.audioquality.isdigit(): + parser.error(u'invalid audio quality specified') # File downloader fd = FileDownloader({ |