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

Compare commits

base: 0x2620:4dcf945a6284a5d350ead373c58377a78252fbd8
Branches Tags
0x2620:master
..
compare: 0x2620:3f603ae1367312dbad420ad37643b089c12c65eb
Branches Tags
0x2620:master

No commits in common. "4dcf945a6284a5d350ead373c58377a78252fbd8" and "3f603ae1367312dbad420ad37643b089c12c65eb" have entirely different histories.
4dcf945a62 ... 3f603ae136

2 changed files with 3 additions and 9 deletions
Show stats Expand all files Collapse all files

2
edit.py
View file

@ -251,8 +251,6 @@ if __name__ == '__main__':
'oshash': clip['streams'][i], 'oshash': clip['streams'][i],
'url': '%s/%s/%sp%s.mp4' % (base_url, clip['item'], stream_resolution, i + 1), 'url': '%s/%s/%sp%s.mp4' % (base_url, clip['item'], stream_resolution, i + 1),
'item': clip['item'], 'item': clip['item'],
'item-in': clip['in'],
'item-out': clip['out'],
'annotation': clip.get('annotation'), 'annotation': clip.get('annotation'),
'resolution': info['resolution'], 'resolution': info['resolution'],
'in': stream_in, 'in': stream_in,

10
ffmpeg.py
View file

@ -122,7 +122,6 @@ for clip in edit:
] ]
cmd = [ cmd = [
'ffmpeg', 'ffmpeg',
'-hide_banner',
'-nostats', '-loglevel', 'error', '-nostats', '-loglevel', 'error',
] + audio + [ ] + audio + [
'-ss', str(clip['in']), '-ss', str(clip['in']),
@ -161,12 +160,9 @@ for clip in edit:
txt = output + '.txt' txt = output + '.txt'
with open(txt, 'w') as fd: with open(txt, 'w') as fd:
fd.write('file ' + '\nfile '.join(files)) fd.write('file ' + '\nfile '.join(files))
cmd = [ cmd = ['ffmpeg',
'ffmpeg', '-nostats', '-loglevel', 'error',
'-hide_banner', '-y', '-f', 'concat', '-safe', '0', '-i', txt, '-c', 'copy', output]
'-nostats', '-loglevel', 'error',
'-y', '-f', 'concat', '-safe', '0', '-i', txt, '-c', 'copy', output
]
run(cmd) run(cmd)
os.unlink(txt) os.unlink(txt)