diff --git a/fkbeta/fk/fixtures/frikanalen.json b/fkbeta/fk/fixtures/frikanalen.json index a047dc15..76886342 100644 --- a/fkbeta/fk/fixtures/frikanalen.json +++ b/fkbeta/fk/fixtures/frikanalen.json @@ -55,6 +55,13 @@ "fsname": "mp4" } }, + { + "model": "fk.fileformat", + "pk": 9, + "fields": { + "fsname": "av1" + } + }, { "model": "fk.category", "pk": 119, diff --git a/utils/move_and_process.py b/utils/move_and_process.py index 1e20b3a2..b9641148 100755 --- a/utils/move_and_process.py +++ b/utils/move_and_process.py @@ -34,6 +34,7 @@ 'original': 6, 'theora': 7, 'srt': 8, + 'av1': 9, } for k, v in list(VF_FORMATS.items()): VF_FORMATS[v] = k @@ -56,6 +57,10 @@ class Converter(object): '-qscale:v 7 -qscale:a 2 -vf scale=720:-1'), 'ext': 'ogv', }, + 'av1': { + 'ffmpeg': '-c:v libaom-av1 -strict -2', + 'ext': 'avi', + }, 'broadcast': { 'ffmpeg': '-target pal-dv', 'ext': 'dv', @@ -95,6 +100,7 @@ def get_formats(cls, filepath): else: assert 'broadcast' in path formats.append('theora') + formats.append('av1') return formats diff --git a/utils/test_move_and_process.py b/utils/test_move_and_process.py index c83acebf..079aff43 100644 --- a/utils/test_move_and_process.py +++ b/utils/test_move_and_process.py @@ -46,10 +46,12 @@ def test_generate(self): ('/tmp/original/test.ogv', [ '/tmp/large_thumb/test.jpg', '/tmp/broadcast/test.dv', - '/tmp/theora/test.ogv']), + '/tmp/theora/test.ogv', + '/tmp/av1/test.avi']), ('/tmp/broadcast/test.ogv', [ '/tmp/large_thumb/test.jpg', - '/tmp/theora/test.ogv']), + '/tmp/theora/test.ogv', + '/tmp/av1/test.avi']), ) nop = lambda *_, **__: None for t in tests: