R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

migrate everything to run_ffmpeg_multiple_files instead of rebuilding the wheel

Browse Source
This commit is contained in:
Anthony Weems 2014-05-02 03:22:37 -05:00
parent 8aac00e085
commit 712464e1e8
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
youtube_dl/postprocessor/ffmpeg.py
View File

@ -40,21 +40,29 @@ 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, via_stdin=False):
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.')
files_cmd = [] files_cmd = []
stdin_cmd = u''
for path in input_paths: for path in input_paths:
files_cmd.extend(['-i', encodeFilename(path, True)]) if via_stdin:
stdin_cmd += u"file '%s'\n" % encodeFilename(path, True)
else:
files_cmd.extend(['-i', encodeFilename(path, True)])
cmd = ([self._get_executable(), '-y'] + files_cmd cmd = ([self._get_executable(), '-y'] + files_cmd
+ opts + + 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))
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate() if via_stdin:
stdout, stderr = p.communicate(input=bytes(stdin_cmd, 'utf-8'))
else:
stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
stderr = stderr.decode('utf-8', 'replace') stderr = stderr.decode('utf-8', 'replace')
msg = stderr.strip().split('\n')[-1] msg = stderr.strip().split('\n')[-1]
@ -492,31 +500,9 @@ class FFmpegConcatPP(FFmpegPostProcessor):
filename = info['filepath'] filename = info['filepath']
args = ['-f', 'concat', '-i', '-', '-c', 'copy'] args = ['-f', 'concat', '-i', '-', '-c', 'copy']
self._downloader.to_screen(u'[ffmpeg] Concatenating files into "%s"' % filename) self._downloader.to_screen(u'[ffmpeg] Concatenating files into "%s"' % filename)
self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args, via_stdin=True)
if not self._get_executable(): for path in info['__files_to_merge']:
raise FFmpegPostProcessorError(u'ffmpeg or avconv not found. Please install one.')
cmd = ([self._get_executable(), '-y'] + args +
[encodeFilename(self._ffmpeg_filename_argument(filename), True)])
files = info['__files_to_merge']
if self._downloader.params.get('verbose', False):
self._downloader.to_screen(u'[debug] ffmpeg command line: %s' % shell_quote(cmd))
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
files_cmd = u''
for path in files:
encoded_path = encodeFilename(path, True)
files_cmd += u'file \'%s\'\n' % encoded_path
stdout, stderr = p.communicate(input=bytes(files_cmd, 'utf-8'))
if p.returncode != 0:
stderr = stderr.decode('utf-8', 'replace')
msg = stderr.strip().split('\n')[-1]
raise FFmpegPostProcessorError(msg)
for path in files:
os.remove(encodeFilename(path)) os.remove(encodeFilename(path))
return True, info return True, info
class FFmpegAudioFixPP(FFmpegPostProcessor): class FFmpegAudioFixPP(FFmpegPostProcessor):