Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-10 09:22:51 +08:00
Code Issues Releases Wiki Activity

Add ffmpeg concat postprocessor

Browse Source 
Code's a bit sloppy, but it seems to work.
This commit is contained in:
AGSPhoenix 2014-04-07 11:52:15 -04:00
parent 650d688d10
commit d94fc760f7
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/postprocessor/__init__.py
View File

@ -1,6 +1,7 @@
from .ffmpeg import ( from .ffmpeg import (
FFmpegMergerPP, FFmpegMergerPP,
FFmpegConcatPP,
FFmpegMetadataPP, FFmpegMetadataPP,
FFmpegVideoConvertor, FFmpegVideoConvertor,
FFmpegExtractAudioPP, FFmpegExtractAudioPP,
@ -10,6 +11,7 @@ from .xattrpp import XAttrMetadataPP
__all__ = [ __all__ = [
'FFmpegMergerPP', 'FFmpegMergerPP',
'FFmpegConcatPP',
'FFmpegMetadataPP', 'FFmpegMetadataPP',
'FFmpegVideoConvertor', 'FFmpegVideoConvertor',
'FFmpegExtractAudioPP', 'FFmpegExtractAudioPP',

23
youtube_dl/postprocessor/ffmpeg.py
View File

@ -40,16 +40,19 @@ class FFmpegPostProcessor(PostProcessor):
def _uses_avconv(self): def _uses_avconv(self):
return self._get_executable() == self._exes['avconv'] return self._get_executable() == self._exes['avconv']
def run_ffmpeg_multiple_files(self, input_paths, out_path, opts): def run_ffmpeg_multiple_files(self, input_paths, out_path, opts, preopts=None):
if not self._get_executable(): if not self._get_executable():
raise FFmpegPostProcessorError(u'ffmpeg or avconv not found. Please install one.') raise FFmpegPostProcessorError(u'ffmpeg or avconv not found. Please install one.')
preopt_cmd = []
if preopts:
preopt_cmd = preopts
files_cmd = [] files_cmd = []
for path in input_paths: for path in input_paths:
files_cmd.extend(['-i', encodeFilename(path, True)]) files_cmd.extend(['-i', encodeFilename(path, True)])
cmd = ([self._get_executable(), '-y'] + files_cmd cmd = ([self._get_executable(), '-y'] +
+ opts + preopt_cmd + files_cmd + opts +
[encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) [encodeFilename(self._ffmpeg_filename_argument(out_path), True)])
if self._downloader.params.get('verbose', False): if self._downloader.params.get('verbose', False):
self._downloader.to_screen(u'[debug] ffmpeg command line: %s' % shell_quote(cmd)) self._downloader.to_screen(u'[debug] ffmpeg command line: %s' % shell_quote(cmd))
@ -484,3 +487,15 @@ class FFmpegMergerPP(FFmpegPostProcessor):
self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args) self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args)
return True, info return True, info
class FFmpegConcatPP(FFmpegPostProcessor):
def run(self, info):
filename = info['filepath']
concatargs = ['-f', 'concat']
args = ['-c', 'copy']
self._downloader.to_screen(u'[ffmpeg] Appending files into "%s"' % filename)
with open(u'youtube-dl_ffmpeg_append_list.txt', 'wb') as f:
for file in info['__files_to_merge']:
f.write("file '" + file + "'\n")
self.run_ffmpeg_multiple_files([u'youtube-dl_ffmpeg_append_list.txt'], filename, args, preopts=concatargs)
os.unlink('youtube-dl_ffmpeg_append_list.txt')
return True, info