From d3f96386c0a0cca88a76134d49bdaea9fbe42d43 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 28 Dec 2011 18:05:10 +0530 Subject: [PATCH] default to frames --- pandora/archive/extract.py | 2 +- pandora/item/models.py | 1 + pandora/padma.jsonc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index fc841b721..45d013d63 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -61,6 +61,7 @@ def stream(video, target, profile, info): H264, should bitrates be a bit lower? other stuff possible? ''' profile, format = profile.split('.') + bpp = 0.17 if profile == '1080p': height = 1080 @@ -105,7 +106,6 @@ def stream(video, target, profile, info): audiobitrate = '22k' audiochannels = 1 - bpp = 0.17 if info['video'] and 'display_aspect_ratio' in info['video'][0]: fps = AspectRatio(info['video'][0]['framerate']) diff --git a/pandora/item/models.py b/pandora/item/models.py index b399c177a..d2c4f3678 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -1086,6 +1086,7 @@ class Item(models.Model): cmd += ['-f', frame] p = subprocess.Popen(cmd) p.wait() + #remove cached versions icons = os.path.abspath(os.path.join(settings.MEDIA_ROOT, icon)) icons = glob(icons.replace('.jpg', '*.jpg')) for f in filter(lambda p: not p.endswith('/icon.jpg'), icons): diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index ea1f4fc5b..5e662aec3 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -482,7 +482,7 @@ ], "filtersSize": 176, "find": {"conditions": [], "operator": "&"}, - "icons": "posters", + "icons": "frames", "infoIconSize": 256, "item": "", "itemFind": {"conditions": [], "operator": "&"},