aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorAurélio A. Heckert <aurelio@colivre.coop.br>2015-06-09 22:08:16 -0300
committerAurélio A. Heckert <aurelio@colivre.coop.br>2015-06-09 22:08:16 -0300
commitd84f1d14b526c4a5359117a58f25691a3da4c97e (patch)
tree29b71297494ac80da38a4f0a047a9cebbfafa1df /youtube_dl
parent70219b0f4371fe54cc72d025ce06fc4691ba12fa (diff)
Adds support for XviD output with extra parametrization
As the "LG Time Machine" (a (not so) smart TV) has a limitation for video dimensions (as for codecs), I take to implement an extra parameter `--pp-params` where we can send extra parameterization for the video converter (post-processor). Example: ``` $ youtube-dl --recode-video=xvid --pp-params='-s 720x480' -c https://www.youtube.com/watch?v=BE7Qoe2ZiXE ``` That works fine on a 4yo LG Time Machine. Closes #5733
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/__init__.py5
-rw-r--r--youtube_dl/options.py6
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py14
3 files changed, 19 insertions, 6 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index ace17857c..5b28e4817 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -169,8 +169,10 @@ def _real_main(argv=None):
if not opts.audioquality.isdigit():
parser.error('invalid audio quality specified')
if opts.recodevideo is not None:
- if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv']:
+ if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv', 'xvid']:
parser.error('invalid video recode format specified')
+ if opts.pp_params is not None:
+ opts.pp_params = opts.pp_params.split()
if opts.convertsubtitles is not None:
if opts.convertsubtitles not in ['srt', 'vtt', 'ass']:
parser.error('invalid subtitle format specified')
@@ -227,6 +229,7 @@ def _real_main(argv=None):
postprocessors.append({
'key': 'FFmpegVideoConvertor',
'preferedformat': opts.recodevideo,
+ 'extra_params': opts.pp_params
})
if opts.convertsubtitles:
postprocessors.append({
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 689fa7595..ceb4b5f38 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -686,7 +686,11 @@ def parseOpts(overrideArguments=None):
postproc.add_option(
'--recode-video',
metavar='FORMAT', dest='recodevideo', default=None,
- help='Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv)')
+ help='Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv|xvid)')
+ postproc.add_option(
+ '--pp-params',
+ dest='pp_params', default=None,
+ help='Extra parameters for video post-processor. The params will be splited on spaces.')
postproc.add_option(
'-k', '--keep-video',
action='store_true', dest='keepvideo', default=False,
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index cc65b34e7..a696b12b4 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -287,22 +287,28 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
class FFmpegVideoConvertorPP(FFmpegPostProcessor):
- def __init__(self, downloader=None, preferedformat=None):
+ def __init__(self, downloader=None, preferedformat=None, extra_params=[]):
super(FFmpegVideoConvertorPP, self).__init__(downloader)
self._preferedformat = preferedformat
+ self._extra_params = extra_params
def run(self, information):
path = information['filepath']
prefix, sep, ext = path.rpartition('.')
- outpath = prefix + sep + self._preferedformat
+ ext = self._preferedformat
+ options = self._extra_params
+ if self._preferedformat == 'xvid':
+ ext = 'avi'
+ options.extend(['-c:v', 'libxvid', '-vtag', 'XVID'])
+ outpath = prefix + sep + ext
if information['ext'] == self._preferedformat:
self._downloader.to_screen('[ffmpeg] Not converting video file %s - already is in target format %s' % (path, self._preferedformat))
return [], information
self._downloader.to_screen('[' + 'ffmpeg' + '] Converting video from %s to %s, Destination: ' % (information['ext'], self._preferedformat) + outpath)
- self.run_ffmpeg(path, outpath, [])
+ self.run_ffmpeg(path, outpath, options)
information['filepath'] = outpath
information['format'] = self._preferedformat
- information['ext'] = self._preferedformat
+ information['ext'] = ext
return [path], information