ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/images: fix transaprent background for JPEG

Browse source
This commit is contained in:
rr- 2016-06-02 11:52:54 +02:00
parent 0743721d06
commit accb5a9187
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/szurubooru/func/images.py
View file

@ -48,20 +48,26 @@ class Image(object):
assert self.content assert self.content
self._reload_info() self._reload_info()
def _to_image(self, codec): def to_png(self):
return self._execute([ return self._execute([
'-i', '{path}', '-i', '{path}',
'-f', 'image2', '-f', 'image2',
'-vframes', '1', '-vframes', '1',
'-vcodec', codec, '-vcodec', 'png',
'-', '-',
]) ])
def to_png(self):
return self._to_image('png')
def to_jpeg(self): def to_jpeg(self):
return self._to_image('mjpeg') return self._execute([
'-f', 'lavfi',
'-i', 'color=white:s=%dx%d' % (self.width, self.height),
'-i', '{path}',
'-f', 'image2',
'-filter_complex', 'overlay',
'-vframes', '1',
'-vcodec', 'mjpeg',
'-',
])
def _execute(self, cli, program='ffmpeg'): def _execute(self, cli, program='ffmpeg'):
extension = mime.get_extension(mime.get_mime_type(self.content)) extension = mime.get_extension(mime.get_mime_type(self.content))