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
This commit is contained in:
		
							parent
							
								
									70219b0f43
								
							
						
					
					
						commit
						d84f1d14b5
					
				
					 4 changed files with 21 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -213,7 +213,8 @@ which means you can modify it, redistribute it or use it however you like.
 | 
			
		|||
    --audio-format FORMAT            Specify audio format: "best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; "best" by default
 | 
			
		||||
    --audio-quality QUALITY          Specify ffmpeg/avconv audio quality, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default
 | 
			
		||||
                                     5)
 | 
			
		||||
    --recode-video FORMAT            Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv)
 | 
			
		||||
    --recode-video FORMAT            Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv|xvid)
 | 
			
		||||
    --pp-params                      Extra parameters for video post-processor. The params will be splited on spaces.
 | 
			
		||||
    -k, --keep-video                 Keep the video file on disk after the post-processing; the video is erased by default
 | 
			
		||||
    --no-post-overwrites             Do not overwrite post-processed files; the post-processed files are overwritten by default
 | 
			
		||||
    --embed-subs                     Embed subtitles in the video (only for mkv and mp4 videos)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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({
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue