From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 27 Aug 2020 17:47:29 +0000 (-0500)
Subject: ffmpeg needs input from fifo path, not stdin
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=f1218a2b4e16178c8c1285157f7cd995dc950e3e;p=akkoma

ffmpeg needs input from fifo path, not stdin
---

diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
index 7e1af8bac..7c2bfbc53 100644
--- a/lib/pleroma/helpers/media_helper.ex
+++ b/lib/pleroma/helpers/media_helper.ex
@@ -39,16 +39,16 @@ defmodule Pleroma.Helpers.MediaHelper do
 
   def video_framegrab(url) do
     with executable when is_binary(executable) <- System.find_executable("ffmpeg"),
+         url = Pleroma.Web.MediaProxy.url(url),
+         {:ok, env} <- Pleroma.HTTP.get(url),
+         {:ok, fifo_path} <- mkfifo(),
          args = [
-           "-i", "-",
+           "-i", fifo_path,
            "-vframes", "1",
            "-f", "mjpeg",
            "-loglevel", "error",
            "-"
-         ],
-         url = Pleroma.Web.MediaProxy.url(url),
-         {:ok, env} <- Pleroma.HTTP.get(url),
-         {:ok, fifo_path} <- mkfifo() do
+         ] do
       run_fifo(fifo_path, env, executable, args)
     else
       nil -> {:error, {:ffmpeg, :command_not_found}}
@@ -57,7 +57,12 @@ defmodule Pleroma.Helpers.MediaHelper do
   end
 
   defp run_fifo(fifo_path, env, executable, args) do
-    args = List.flatten([fifo_path, args])
+    args =
+      if _executable = System.find_executable("convert") do
+        List.flatten([fifo_path, args])
+      else
+        args
+      end
     pid = Port.open({:spawn_executable, executable}, [:use_stdio, :stream, :exit_status, :binary, args: args])
     fifo = Port.open(to_charlist(fifo_path), [:eof, :binary, :stream, :out])
     true = Port.command(fifo, env.body)