PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-03-13 03:17:44 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

quick & dirty fix #61, default to use FFmpeg for merging flv files

Browse Source
This commit is contained in:
Mort Yao 2013-03-14 23:17:06 +01:00
parent b8087a8ad4
commit 00cd5b1bbc
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/you_get/common.py
View File

@ -409,10 +409,20 @@ def download_urls(urls, title, ext, total_size, output_dir = '.', refer = None,
print()
return
if ext == 'flv':
from .processor.join_flv import concat_flv
concat_flv(parts, os.path.join(output_dir, title + '.flv'))
for part in parts:
os.remove(part)
try:
from .processor.ffmpeg import has_ffmpeg_installed
if has_ffmpeg_installed():
from .processor.ffmpeg import ffmpeg_concat_flv_to_mp4
ffmpeg_concat_flv_to_mp4(parts, os.path.join(output_dir, title + '.mp4'))
else:
from .processor.join_flv import concat_flv
concat_flv(parts, os.path.join(output_dir, title + '.flv'))
except:
raise
else:
for part in parts:
os.remove(part)
elif ext == 'mp4':
try:
from .processor.join_mp4 import concat_mp4
@ -428,6 +438,7 @@ def download_urls(urls, title, ext, total_size, output_dir = '.', refer = None,
os.remove(part)
else:
print('No ffmpeg is found. Merging aborted.')
else:
print("Can't merge %s files" % ext)

25
src/you_get/processor/ffmpeg.py
View File

@ -60,3 +60,28 @@ def ffmpeg_concat_ts_to_mkv(files, output = 'output.mkv'):
return False
except:
return False
def ffmpeg_concat_flv_to_mp4(files, output = 'output.mp4'):
for file in files:
if os.path.isfile(file):
params = ['ffmpeg', '-i']
params.append(file)
params += ['-map', '0', '-c', 'copy', '-f', 'mpegts', '-bsf:v', 'h264_mp4toannexb']
params.append(file + '.ts')
subprocess.call(params)
params = ['ffmpeg', '-i']
params.append('concat:')
for file in files:
f = file + '.ts'
if os.path.isfile(f):
params[-1] += f + '|'
params += ['-c', 'copy', '-absf', 'aac_adtstoasc', output]
if subprocess.call(params) == 0:
for file in files:
os.remove(file + '.ts')
return True
else:
raise