feature: add webm support

Author: toresbe

app/api/hooks/routes.py

@@ -35,15 +35,15 @@ async def receive_hook(
         new_file = Path(f"{upload_id}/{sanitized_filename}")
 
         if (settings.tusd_dir / new_file).exists():
-            logger.warning("File already exists, deleting!: %s", new_file)
-            new_file.unlink()
+            logger.warning("File already exists, deleting!: %s", (settings.tusd_dir / new_file))
+            (settings.tusd_dir / new_file).unlink()
 
         return HookResponse(ChangeFileInfo=FileInfoChanges(ID=upload_id, Storage={"Path": str(new_file)}))
 
     if hook_request.type == "post-finish":
         ingest = Ingester(archive_base_path=settings.archive_dir, django_api=django_api)
         upload_meta = get_upload_metadata(hook_request)
-        upload_file = Path(hook_request.event.upload.storage["Path"])
+        upload_file = Path(hook_request.event.upload.storage["Path"]).relative_to(Path("/"))
 
         try:
             metadata = await metadata_extractor.assert_compliance(upload_file)

app/django_client/service.py

@@ -26,6 +26,7 @@ class FormatEnum(str, Enum):
     SRT = "srt"
     THEORA = "theora"
     VC1 = "vc1"
+    WEBM_MED = "webm_med"
 
     def __str__(self) -> str:
         return str(self.value)
@@ -41,6 +42,7 @@ class IntFormatEnum(int, Enum):
     THEORA = 7
     SRT = 8
     CLOUDFLARE_ID = 9
+    WEBM_MED = 10
 
 
 class DjangoApiService:

app/ingest.py

@@ -10,7 +10,10 @@
 from .media.ffprobe_schema import FfprobeOutput
 from .task_builder import TKB
 
-DESIRED_FORMATS = (FormatEnum("large_thumb"),)
+DESIRED_FORMATS = (
+    FormatEnum.LARGE_THUMB,
+    FormatEnum.WEBM_MED,
+)
 
 
 class Ingester:
@@ -85,6 +88,8 @@ async def _process_format(
         )
 
         command = template.render(template_args)
+        self.logger.debug("Generated command: %s", command)
+
         await TKB(command).execute()
 
         self.logger.info("Creating video file entry for %s", output_file)

app/runner.py

@@ -16,7 +16,7 @@ class Task:
     def __init__(self, proc: Coroutine[Any, Any, Process]):
         self.proc = proc
 
-    async def execute(self) -> str:
+    async def execute(self) -> tuple[str, str]:
         proc = await self.proc
         stdout, stderr = await proc.communicate()
 

app/task_builder.py

@@ -1,5 +1,4 @@
 import asyncio
-import shlex
 
 from app.runner import Task
 
@@ -16,8 +15,8 @@ def TKB(command: str) -> Task:
 
     """
     return Task(
-        asyncio.create_subprocess_exec(
-            *shlex.split(command),
+        asyncio.create_subprocess_shell(
+            command,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )

templates/webm_med.j2

@@ -0,0 +1,14 @@
+---
+output_file_extension: webm
+---
+ffmpeg -i "{{ input_file }}"
+    -passlogfile "{{ output_file }}"
+    -c:v libvpx-vp9 -crf 30 -b:v 10M
+    -pass 1 -an -f null /dev/null &&
+ffmpeg -i "{{ input_file }}"
+    -passlogfile "{{ output_file }}"
+    -c:v libvpx-vp9 -crf 30 -b:v 10M
+    -pass 2 -cpu-used 3 -row-mt 1 -tile-rows 2 -threads 8
+    -c:a libopus
+    -vf "pad=ceil(max(iw\,ih*16/9)/2)*2:ceil(max(ih\,iw*9/16)/2)*2:(ow-iw)/2:(oh-ih)/2,setsar=1"
+    "{{ output_file }}"