0x2620/pandora_render
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:2680a960724b9b8ae4a7981d63f002b552c27ced
Branches Tags
0x2620:master
..
compare: 0x2620:afd0e519b756c7720218c381ce7d030a9e2dec73
Branches Tags
0x2620:master

2 commits
2680a96072 ... afd0e519b7

Author SHA1 Message Date
j
afd0e519b7 use apsect ratio from video source 2018-11-12 14:42:09 +00:00
j
0aaf1a9263 render from uploaded source 2018-11-12 14:41:02 +00:00
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
edit.py
View file

@ -13,7 +13,6 @@ import ox.web.auth
base_url = None base_url = None
stream_resolution = 480
prefix = '/mnt' prefix = '/mnt'
render = './cache' render = './cache'
pandora_client_config = {} pandora_client_config = {}
@ -101,15 +100,24 @@ def sort_clips(edit, sort):
s = sorted(clips, key=lambda c: ids.index(c['id']) if c['id'] in ids else -1) s = sorted(clips, key=lambda c: ids.index(c['id']) if c['id'] in ids else -1)
return s return s
def cache_clips(api, videos): def cache_clips(api, videos, use_source=False):
for clip in videos: for clip in videos:
out = '%s/%s.mp4' % (render, clip['oshash']) out = '%s/%s.mp4' % (render, clip['oshash'])
if 'path' in clip: if 'path' in clip:
clip['src'] = clip['path'] clip['src'] = clip['path']
clip['path'] = out clip['path'] = out
if not os.path.exists(out): if not os.path.exists(out):
print(clip['url'], out) url = clip['url']
api.save_url(clip['url'], out) if use_source:
name = url.split('/')[-1].split('.')[0]
resolution, part = name.split('p')
if part and part.isdigit():
part = int(part)
else:
part = 1
url = '/'.join(url.split('/')[:-1] + ['download', 'source', str(part)])
print(url, out)
api.save_url(url, out)
if __name__ == '__main__': if __name__ == '__main__':
@ -129,6 +137,7 @@ if __name__ == '__main__':
opts = parser.parse_args() opts = parser.parse_args()
edit_url = opts.url edit_url = opts.url
use_local = opts.source == 'local' use_local = opts.source == 'local'
use_source = opts.source == 'source'
prefix = opts.prefix prefix = opts.prefix
parts = edit_url.split('/') parts = edit_url.split('/')
site = parts[2] site = parts[2]
@ -229,7 +238,7 @@ if __name__ == '__main__':
position = math.ceil(position / (1/25)) * 1/25 position = math.ceil(position / (1/25)) * 1/25
if not use_local: if not use_local:
cache_clips(api, videos) cache_clips(api, videos, use_source)
name = normalize(edit_id) name = normalize(edit_id)
if sort_by != 'year': if sort_by != 'year':

4
ffmpeg.py
View file

@ -70,7 +70,8 @@ for clip in edit:
}) })
position += duration position += duration
continue continue
clip_aspect = clip['resolution'][0] / clip['resolution'][1] src_info = ox.avinfo(clip['path'])
clip_aspect = src_info['video'][0]['width'] / src_info['video'][0]['height']
if clip_aspect < aspect: if clip_aspect < aspect:
x = width x = width
y = int(x / clip_aspect) y = int(x / clip_aspect)
@ -103,7 +104,6 @@ for clip in edit:
print('skip empty clip', clip) print('skip empty clip', clip)
else: else:
files.append(out) files.append(out)
src_info = ox.avinfo(clip['path'])
vid = src_info['video'][0]['id'] vid = src_info['video'][0]['id']
if not src_info['audio']: if not src_info['audio']:
audio = ['-f', 'lavfi', '-i', 'anullsrc=channel_layout=stereo:sample_rate=48000'] audio = ['-f', 'lavfi', '-i', 'anullsrc=channel_layout=stereo:sample_rate=48000']