0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

joined audio timelines

Browse source
This commit is contained in:
j 2015-12-09 18:29:18 +00:00
parent d23a6eb317
commit f47febb09c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandora/item/models.py
View file

@ -1401,6 +1401,9 @@ class Item(models.Model):
frame = self.get_poster_frame_path() frame = self.get_poster_frame_path()
timeline = '%stimelineantialias64p.jpg' % self.timeline_prefix timeline = '%stimelineantialias64p.jpg' % self.timeline_prefix
audio_timeline = '%stimelineaudio64p.jpg' % self.timeline_prefix
if not os.path.exists(timeline) and os.path.exists(audio_timeline):
timeline = audio_timeline
cmd = [settings.ITEM_POSTER, cmd = [settings.ITEM_POSTER,
'-d', '-', '-d', '-',

7
pandora/item/timelines.py
View file

@ -83,7 +83,7 @@ def join_tiles(source_paths, target_path):
) )
data['target_images']['small'].save(image_file) data['target_images']['small'].save(image_file)
#print image_file #print image_file
if mode == 'antialias': if mode == full_tile_mode:
# render full tile # render full tile
resized = data['target_images']['large'].resize(( resized = data['target_images']['large'].resize((
data['full_tile_widths'][0], large_tile_h data['full_tile_widths'][0], large_tile_h
@ -127,6 +127,7 @@ def join_tiles(source_paths, target_path):
large_tile_last_w = frame_n % large_tile_w or 60 large_tile_last_w = frame_n % large_tile_w or 60
small_tile_n = int(math.ceil(frame_n / fps / small_tile_w)) small_tile_n = int(math.ceil(frame_n / fps / small_tile_w))
small_tile_last_w = int(math.ceil(frame_n / fps)) % small_tile_w or small_tile_w small_tile_last_w = int(math.ceil(frame_n / fps)) % small_tile_w or small_tile_w
full_tile_mode = modes[0]
# open full timeline # open full timeline
if large_tile_n == 1: if large_tile_n == 1:
@ -168,10 +169,10 @@ def join_tiles(source_paths, target_path):
save_and_open(data) save_and_open(data)
# save full timelines # save full timelines
image_file = '%stimelineantialias%dp.jpg' % (target_path, large_tile_h) image_file = '%stimeline%s%dp.jpg' % (target_path, full_tile_mode, large_tile_h)
data['target_images']['full'].save(image_file) data['target_images']['full'].save(image_file)
#print image_file #print image_file
image_file = '%stimelineantialias%dp.jpg' % (target_path, small_tile_h) image_file = '%stimeline%s%dp.jpg' % (target_path, full_tile_mode, small_tile_h)
data['target_images']['full'].resize( data['target_images']['full'].resize(
(full_tile_w, small_tile_h), Image.ANTIALIAS (full_tile_w, small_tile_h), Image.ANTIALIAS
).save(image_file) ).save(image_file)