forked from 0x2620/pandora
add stream.flags
This commit is contained in:
parent
f591f66634
commit
72358a7bce
2 changed files with 25 additions and 2 deletions
22
pandora/archive/migrations/0005_auto_20180804_1554.py
Normal file
22
pandora/archive/migrations/0005_auto_20180804_1554.py
Normal file
|
@ -0,0 +1,22 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.13 on 2018-08-04 15:54
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django.core.serializers.json
|
||||
from django.db import migrations, models
|
||||
import oxdjango.fields
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('archive', '0004_jsonfield'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='stream',
|
||||
name='flags',
|
||||
field=oxdjango.fields.JSONField(default=dict, editable=False, encoder=django.core.serializers.json.DjangoJSONEncoder),
|
||||
),
|
||||
]
|
|
@ -521,7 +521,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, audio_track=i+1)
|
||||
ok, error = extract.stream(media, target, profile, info, audio_track=i+1, flags=self.flags)
|
||||
if ok:
|
||||
tinfo = ox.avinfo(target)
|
||||
del tinfo['path']
|
||||
|
@ -691,6 +691,7 @@ class Stream(models.Model):
|
|||
available = models.BooleanField(default=False)
|
||||
oshash = models.CharField(max_length=16, null=True, db_index=True)
|
||||
info = JSONField(default=dict, editable=False)
|
||||
flags = JSONField(default=dict, editable=False)
|
||||
duration = models.FloatField(default=0)
|
||||
aspect_ratio = models.FloatField(default=0)
|
||||
|
||||
|
@ -750,7 +751,7 @@ class Stream(models.Model):
|
|||
self.media.name = self.path(self.name())
|
||||
target = self.media.path
|
||||
info = ox.avinfo(media)
|
||||
ok, error = extract.stream(media, target, self.name(), info)
|
||||
ok, error = extract.stream(media, target, self.name(), info, flags=self.flags)
|
||||
# file could have been moved while encoding
|
||||
# get current version from db and update
|
||||
_self = Stream.objects.get(id=self.id)
|
||||
|
|
Loading…
Reference in a new issue