dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[utils] Support 'dur' field in TTML

This commit is contained in:
Yen Chi Hsuan 2015-05-12 12:47:37 +08:00
parent 5332fd91bf
commit 7dff03636a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_utils.py
View File

@ -600,7 +600,7 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4')
<div xml:lang="en"> <div xml:lang="en">
<p begin="0" end="1">The following line contains Chinese characters and special symbols</p> <p begin="0" end="1">The following line contains Chinese characters and special symbols</p>
<p begin="1" end="2">第二行<br/>♪♪</p> <p begin="1" end="2">第二行<br/>♪♪</p>
<p begin="2" end="3"><span>Third<br/>Line</span></p> <p begin="2" dur="1"><span>Third<br/>Line</span></p>
</div> </div>
</body> </body>
</tt>''' </tt>'''

8
youtube_dl/utils.py
View File

@ -1866,10 +1866,14 @@ def dfxp2srt(dfxp_data):
paras = dfxp.findall(_x('.//ttml:p')) paras = dfxp.findall(_x('.//ttml:p'))
for para, index in zip(paras, itertools.count(1)): for para, index in zip(paras, itertools.count(1)):
begin_time = parse_dfxp_time_expr(para.attrib['begin'])
end_time = parse_dfxp_time_expr(para.attrib.get('end'))
if not end_time:
end_time = begin_time + parse_dfxp_time_expr(para.attrib['dur'])
out.append('%d\n%s --> %s\n%s\n\n' % ( out.append('%d\n%s --> %s\n%s\n\n' % (
index, index,
format_srt_time(parse_dfxp_time_expr(para.attrib.get('begin'))), format_srt_time(begin_time),
format_srt_time(parse_dfxp_time_expr(para.attrib.get('end'))), format_srt_time(end_time),
parse_node(para))) parse_node(para)))
return ''.join(out) return ''.join(out)