gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[adn] fix subtitle compatibility with ffmpeg

Browse source
This commit is contained in:
Remita Amine 2019-04-04 17:59:20 +01:00
parent b966740cf7
commit 2bbde1d09a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
youtube_dl/extractor/adn.py
View file

@ -81,10 +81,10 @@ class ADNIE(InfoExtractor):
ssa = '''[Script Info] ssa = '''[Script Info]
ScriptType:V4.00 ScriptType:V4.00
[V4 Styles] [V4 Styles]
Format:Name,Fontname,Fontsize,PrimaryColour,Bold,BorderStyle,Outline,Alignment,MarginL,MarginR,MarginV Format: Name,Fontname,Fontsize,PrimaryColour,SecondaryColour,TertiaryColour,BackColour,Bold,Italic,BorderStyle,Outline,Shadow,Alignment,MarginL,MarginR,MarginV,AlphaLevel,Encoding
Style:Default,Arial,18,16777215,-1,1,1,2,20,20,20 Style: Default,Arial,18,16777215,16777215,16777215,0,-1,0,1,1,0,2,20,20,20,0,0
[Events] [Events]
Format:Marked,Start,End,Style,Text''' Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
for current in sub: for current in sub:
start, end, text, line_align, position_align = ( start, end, text, line_align, position_align = (
float_or_none(current.get('startTime')), float_or_none(current.get('startTime')),
@ -94,7 +94,7 @@ Format:Marked,Start,End,Style,Text'''
if start is None or end is None or text is None: if start is None or end is None or text is None:
continue continue
alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0) alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0)
ssa += os.linesep + 'Dialogue:Marked=0,%s,%s,Default,%s%s' % ( ssa += os.linesep + 'Dialogue: Marked=0,%s,%s,Default,,0,0,0,,%s%s' % (
self._ass_subtitles_timecode(start), self._ass_subtitles_timecode(start),
self._ass_subtitles_timecode(end), self._ass_subtitles_timecode(end),
'{\\a%d}' % alignment if alignment != 2 else '', '{\\a%d}' % alignment if alignment != 2 else '',