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

Make GetZoomFactor a public function

Browse source
This commit is contained in:
Star Brilliant 2013-12-07 18:27:17 +08:00
parent 65ca48d184
commit 6efd7a4987
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
danmaku2ass.py
View file

@ -216,31 +216,7 @@ CommentFormatMap = {None: None, 'Niconico': ReadCommentsNiconico, 'Acfun': ReadC
def WriteCommentBilibiliPositioned(f, c, width, height, styleid): def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
BiliPlayerSize = (672, 438) BiliPlayerSize = (672, 438)
ZoomFactor = GetZoomFactor(BiliPlayerSize, (width, height))
def GetZoomFactor(TargetSize):
try:
if TargetSize == GetZoomFactor.Cached_TargetSize:
return GetZoomFactor.Cached_Result
except AttributeError:
pass
GetZoomFactor.Cached_TargetSize = TargetSize
try:
BiliPlayerAspect = BiliPlayerSize[0]/BiliPlayerSize[1]
TargetAspect = TargetSize[0]/TargetSize[1]
if TargetAspect < BiliPlayerAspect: # narrower
ScaleFactor = TargetSize[0]/BiliPlayerSize[0]
GetZoomFactor.Cached_Result = (ScaleFactor, 0, (TargetSize[1]-TargetSize[0]/BiliPlayerAspect)/2)
elif TargetAspect > BiliPlayerAspect: # wider
ScaleFactor = TargetSize[1]/BiliPlayerSize[1]
GetZoomFactor.Cached_Result = (ScaleFactor, (TargetSize[0]-TargetSize[1]*BiliPlayerAspect)/2, 0)
else:
GetZoomFactor.Cached_Result = (TargetSize[0]/BiliPlayerSize[0], 0, 0)
return GetZoomFactor.Cached_Result
except ZeroDivisionError:
GetZoomFactor.Cached_Result = (1, 0, 0)
return GetZoomFactor.Cached_Result
ZoomFactor = GetZoomFactor((width, height))
def GetPosition(InputPos, isHeight): def GetPosition(InputPos, isHeight):
isHeight = int(isHeight) # True -> 1 isHeight = int(isHeight) # True -> 1
@ -318,6 +294,32 @@ def WriteCommentBilibiliPositioned(f, c, width, height, styleid):
logging.warning(_('Invalid comment: %r') % c) logging.warning(_('Invalid comment: %r') % c)
# Result: (f, dx, dy)
# To convert: NewX = f*x+dx, NewY = f*y+dy
def GetZoomFactor(SourceSize, TargetSize):
try:
if (SourceSize, TargetSize) == GetZoomFactor.Cached_Size:
return GetZoomFactor.Cached_Result
except AttributeError:
pass
GetZoomFactor.Cached_Size = (SourceSize, TargetSize)
try:
SourceAspect = SourceSize[0]/SourceSize[1]
TargetAspect = TargetSize[0]/TargetSize[1]
if TargetAspect < SourceAspect: # narrower
ScaleFactor = TargetSize[0]/SourceSize[0]
GetZoomFactor.Cached_Result = (ScaleFactor, 0, (TargetSize[1]-TargetSize[0]/SourceAspect)/2)
elif TargetAspect > SourceAspect: # wider
ScaleFactor = TargetSize[1]/SourceSize[1]
GetZoomFactor.Cached_Result = (ScaleFactor, (TargetSize[0]-TargetSize[1]*SourceAspect)/2, 0)
else:
GetZoomFactor.Cached_Result = (TargetSize[0]/SourceSize[0], 0, 0)
return GetZoomFactor.Cached_Result
except ZeroDivisionError:
GetZoomFactor.Cached_Result = (1, 0, 0)
return GetZoomFactor.Cached_Result
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)