pleroma

commit: 72daf522c9af52832525fc002df061703aabca7f
parent 139057f346f5903e0ed21ea91e7d43fd906fe914
Author: feld <feld@feld.me>
Date:   Fri,  8 Mar 2024 14:48:26 +0000

Merge branch 'fix-framegrabs' into 'develop'

Fix ffmpeg framegrabs with Exile

See merge request pleroma/pleroma!4087
Diffstat:
A
changelog.d/framegrabs.fix
1
+
M
lib/pleroma/helpers/media_helper.ex
36
++++++++++++++++++++----------------

2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/changelog.d/framegrabs.fix b/changelog.d/framegrabs.fix
@@ -0,0 +1 @@
+Video framegrabs were not working correctly after the change to use Exile to execute ffmpeg
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
@@ -40,28 +40,32 @@ defmodule Pleroma.Helpers.MediaHelper do
   end
 
   # Note: video thumbnail is intentionally not resized (always has original dimensions)
+  @spec video_framegrab(String.t()) :: {:ok, binary()} | {:error, any()}
   def video_framegrab(url) do
     with executable when is_binary(executable) <- System.find_executable("ffmpeg"),
          {:ok, env} <- HTTP.get(url, [], pool: :media),
          {:ok, pid} <- StringIO.open(env.body) do
       body_stream = IO.binstream(pid, 1)
 
-      Exile.stream!(
-        [
-          executable,
-          "-i",
-          "pipe:0",
-          "-vframes",
-          "1",
-          "-f",
-          "mjpeg",
-          "pipe:1"
-        ],
-        input: body_stream,
-        ignore_epipe: true,
-        stderr: :disable
-      )
-      |> Enum.into(<<>>)
+      result =
+        Exile.stream!(
+          [
+            executable,
+            "-i",
+            "pipe:0",
+            "-vframes",
+            "1",
+            "-f",
+            "mjpeg",
+            "pipe:1"
+          ],
+          input: body_stream,
+          ignore_epipe: true,
+          stderr: :disable
+        )
+        |> Enum.into(<<>>)
+
+      {:ok, result}
     else
       nil -> {:error, {:ffmpeg, :command_not_found}}
       {:error, _} = error -> error