[#2497] Media preview proxy: added quality
config setting, adjusted width/height defaults.
This commit is contained in:
parent
02ad1cd8e9
commit
aa0a5ffb48
@ -441,8 +441,9 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil
|
|||||||
# Note: media preview proxy depends on media proxy to be enabled
|
# Note: media preview proxy depends on media proxy to be enabled
|
||||||
config :pleroma, :media_preview_proxy,
|
config :pleroma, :media_preview_proxy,
|
||||||
enabled: false,
|
enabled: false,
|
||||||
thumbnail_max_width: 400,
|
thumbnail_max_width: 600,
|
||||||
thumbnail_max_height: 200,
|
thumbnail_max_height: 600,
|
||||||
|
quality: 2,
|
||||||
proxy_opts: [
|
proxy_opts: [
|
||||||
head_request_max_read_duration: 5_000
|
head_request_max_read_duration: 5_000
|
||||||
]
|
]
|
||||||
|
@ -1926,6 +1926,11 @@ config :pleroma, :config_description, [
|
|||||||
description: "Max height of preview thumbnail."
|
description: "Max height of preview thumbnail."
|
||||||
},
|
},
|
||||||
%{
|
%{
|
||||||
|
key: :quality,
|
||||||
|
type: :integer,
|
||||||
|
description: "Quality of the output. Ranges from 1 (max quality) to 31 (lowest quality)."
|
||||||
|
},
|
||||||
|
%{
|
||||||
key: :proxy_opts,
|
key: :proxy_opts,
|
||||||
type: :keyword,
|
type: :keyword,
|
||||||
description: "Media proxy options",
|
description: "Media proxy options",
|
||||||
|
@ -7,13 +7,15 @@ defmodule Pleroma.Helpers.MediaHelper do
|
|||||||
Handles common media-related operations.
|
Handles common media-related operations.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def ffmpeg_resize(uri_or_path, %{max_width: max_width, max_height: max_height}) do
|
def ffmpeg_resize(uri_or_path, %{max_width: max_width, max_height: max_height} = options) do
|
||||||
|
quality = options[:quality] || 1
|
||||||
|
|
||||||
cmd = ~s"""
|
cmd = ~s"""
|
||||||
ffmpeg -i #{uri_or_path} -f lavfi -i color=c=white \
|
ffmpeg -i #{uri_or_path} -f lavfi -i color=c=white \
|
||||||
-filter_complex "[0:v] scale='min(#{max_width},iw)':'min(#{max_height},ih)': \
|
-filter_complex "[0:v] scale='min(#{max_width},iw)':'min(#{max_height},ih)': \
|
||||||
force_original_aspect_ratio=decrease [scaled]; \
|
force_original_aspect_ratio=decrease [scaled]; \
|
||||||
[1][scaled] scale2ref [bg][img]; [bg] setsar=1 [bg]; [bg][img] overlay=shortest=1" \
|
[1][scaled] scale2ref [bg][img]; [bg] setsar=1 [bg]; [bg][img] overlay=shortest=1" \
|
||||||
-loglevel quiet -f image2 -vcodec mjpeg -frames:v 1 pipe:1
|
-loglevel quiet -f image2 -vcodec mjpeg -frames:v 1 -q:v #{quality} pipe:1
|
||||||
"""
|
"""
|
||||||
|
|
||||||
pid = Port.open({:spawn, cmd}, [:use_stdio, :in, :stream, :exit_status, :binary])
|
pid = Port.open({:spawn, cmd}, [:use_stdio, :in, :stream, :exit_status, :binary])
|
||||||
|
@ -78,12 +78,14 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
|
|||||||
end
|
end
|
||||||
|
|
||||||
defp handle_image_or_video_preview(%{params: params} = conn, url) do
|
defp handle_image_or_video_preview(%{params: params} = conn, url) do
|
||||||
|
quality = Config.get!([:media_preview_proxy, :quality])
|
||||||
|
|
||||||
with {thumbnail_max_width, thumbnail_max_height} <- thumbnail_max_dimensions(params),
|
with {thumbnail_max_width, thumbnail_max_height} <- thumbnail_max_dimensions(params),
|
||||||
media_proxy_url <- MediaProxy.url(url),
|
media_proxy_url <- MediaProxy.url(url),
|
||||||
{:ok, thumbnail_binary} <-
|
{:ok, thumbnail_binary} <-
|
||||||
MediaHelper.ffmpeg_resize(
|
MediaHelper.ffmpeg_resize(
|
||||||
media_proxy_url,
|
media_proxy_url,
|
||||||
%{max_width: thumbnail_max_width, max_height: thumbnail_max_height}
|
%{max_width: thumbnail_max_width, max_height: thumbnail_max_height, quality: quality}
|
||||||
) do
|
) do
|
||||||
conn
|
conn
|
||||||
|> put_resp_header("content-type", "image/jpeg")
|
|> put_resp_header("content-type", "image/jpeg")
|
||||||
|
Loading…
Reference in New Issue
Block a user