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

use one version of ffmpeg for all tasks, remove avconv dependency, fixes #2606

Browse source
This commit is contained in:
j 2015-01-05 16:07:55 +00:00
commit e1bc418e0c
6 changed files with 61 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pandora/archive/models.py
View file

@ -453,9 +453,6 @@ class File(models.Model):
if self.data and len(audio) > 1:
config = settings.CONFIG['video']
resolution = self.stream_resolution()
ffmpeg = ox.file.cmd('ffmpeg')
if ffmpeg == 'ffmpeg':
ffmpeg = None
tmp = tempfile.mkdtemp()
if not self.info.get('language'):
self.info['language'] = parse_language(audio[0].get('language'))
@ -471,8 +468,7 @@ class File(models.Model):
n += 1
profile = '%sp.%s' % (resolution, config['formats'][0])
target = os.path.join(tmp, language + '_' + profile)
ok, error = extract.stream(media, target, profile, info, ffmpeg,
audio_track=i+1)
ok, error = extract.stream(media, target, profile, info, audio_track=i+1)
if ok:
tinfo = ox.avinfo(target)
del tinfo['path']
@ -676,15 +672,12 @@ class Stream(models.Model):
def encode(self):
media = self.source.media.path if self.source else self.file.data.path
ffmpeg = ox.file.cmd('ffmpeg')
if self.source or ffmpeg == 'ffmpeg' or self.format != 'webm':
ffmpeg = None
if not self.media:
self.media.name = self.path(self.name())
target = self.media.path
info = ox.avinfo(media)
ok, error = extract.stream(media, target, self.name(), info, ffmpeg)
ok, error = extract.stream(media, target, self.name(), info)
# file could have been moved while encoding
# get current version from db and update
_self = Stream.objects.get(id=self.id)