uohlhv/danmaku2ass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boundary condition

Browse Source
This commit is contained in:
Star Brilliant 2013-12-01 16:48:28 +08:00
parent 7cff52c8e2
commit c667567c01
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
danmaku2ass.py
View File

@ -322,14 +322,14 @@ def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
def ProcessComments(comments, f, width, height, bottomReserved, fontface, fontsize, alpha, lifetime, reduced, progress_callback): def ProcessComments(comments, f, width, height, bottomReserved, fontface, fontsize, alpha, lifetime, reduced, progress_callback):
styleid = 'Danmaku2ASS_%04x' % random.randint(0, 0xffff) styleid = 'Danmaku2ASS_%04x' % random.randint(0, 0xffff)
WriteASSHead(f, width, height, fontface, fontsize, alpha, styleid) WriteASSHead(f, width, height, fontface, fontsize, alpha, styleid)
rows = [[None]*(height-bottomReserved) for i in range(4)] rows = [[None]*(height-bottomReserved+1) for i in range(4)]
for idx, i in enumerate(comments): for idx, i in enumerate(comments):
if progress_callback and idx % 1000 == 0: if progress_callback and idx % 1000 == 0:
progress_callback(idx, len(comments)) progress_callback(idx, len(comments))
if isinstance(i[4], int): if isinstance(i[4], int):
row = 0 row = 0
rowmax = height-bottomReserved-i[7] rowmax = height-bottomReserved-i[7]
while row < rowmax: while row <= rowmax:
freerows = TestFreeRows(rows, i, row, width, height, bottomReserved, lifetime) freerows = TestFreeRows(rows, i, row, width, height, bottomReserved, lifetime)
if freerows >= i[7]: if freerows >= i[7]:
MarkCommentRow(rows, i, row) MarkCommentRow(rows, i, row)
@ -355,7 +355,7 @@ def TestFreeRows(rows, c, row, width, height, bottomReserved, lifetime):
rowmax = height-bottomReserved-c[7] rowmax = height-bottomReserved-c[7]
targetRow = None targetRow = None
if c[4] in (1, 2): if c[4] in (1, 2):
while row < rowmax and res < c[7]: while row <= rowmax and res < c[7]:
if targetRow != rows[c[4]][row]: if targetRow != rows[c[4]][row]:
targetRow = rows[c[4]][row] targetRow = rows[c[4]][row]
if targetRow and targetRow[0]+lifetime > c[0]: if targetRow and targetRow[0]+lifetime > c[0]:
@ -367,7 +367,7 @@ def TestFreeRows(rows, c, row, width, height, bottomReserved, lifetime):
thresholdTime = c[0]-lifetime*(1-width/(c[8]+width)) thresholdTime = c[0]-lifetime*(1-width/(c[8]+width))
except ZeroDivisionError: except ZeroDivisionError:
thresholdTime = c[0]-lifetime thresholdTime = c[0]-lifetime
while row < rowmax and res < c[7]: while row <= rowmax and res < c[7]:
if targetRow != rows[c[4]][row]: if targetRow != rows[c[4]][row]:
targetRow = rows[c[4]][row] targetRow = rows[c[4]][row]
try: try: