From 2c22f2ee3a3ddbf3efa3b7d08cef13f1c9657810 Mon Sep 17 00:00:00 2001 From: asonix Date: Thu, 13 Jul 2023 17:42:21 -0500 Subject: [PATCH] It compiles and runs, but doesn't work --- defaults.toml | 33 ++-- pict-rs.toml | 229 ++++++++++++++++----------- src/config.rs | 3 +- src/config/commandline.rs | 319 ++++++++++++++++++++++++++------------ src/config/defaults.rs | 97 ++++++++---- src/config/file.rs | 77 +++++---- src/config/primitives.rs | 42 ----- src/discover/ffmpeg.rs | 4 +- src/discover/magick.rs | 30 +--- src/error.rs | 4 + src/formats.rs | 17 +- src/formats/animation.rs | 30 ++-- src/formats/video.rs | 147 ++++++++++++++---- src/ingest.rs | 18 +-- src/lib.rs | 9 +- src/queue/process.rs | 5 +- src/validate.rs | 235 ++++++++++++++++++++++++---- src/validate/magick.rs | 16 +- 18 files changed, 881 insertions(+), 434 deletions(-) diff --git a/defaults.toml b/defaults.toml index a837c0d..7179742 100644 --- a/defaults.toml +++ b/defaults.toml @@ -18,14 +18,7 @@ targets = "info" path = "/mnt" [media] -max_width = 10000 -max_height = 10000 -max_area = 40000000 max_file_size = 40 -max_frame_count = 900 -enable_silent_video = true -enable_full_video = false -video_codec = "vp9" filters = [ "blur", "crop", @@ -33,14 +26,30 @@ filters = [ "resize", "thumbnail", ] -skip_validate_imports = false -[media.gif] -max_width = 128 -max_height = 128 -max_area = 16384 +[media.image] +max_width = 10000 +max_height = 10000 +max_area = 40000000 +max_file_size = 40 + +[media.animation] +max_width = 256 +max_height = 256 +max_area = 65536 +max_file_size = 40 max_frame_count = 100 +[media.video] +enable = true +allow_audio = false +max_width = 3840 +max_height = 3840 +max_area = 8294400 +max_file_size = 40 +max_frame_count = 900 +video_codec = "vp9" + [repo] type = "sled" path = "/mnt/sled-repo" diff --git a/pict-rs.toml b/pict-rs.toml index f47a156..e3257c2 100644 --- a/pict-rs.toml +++ b/pict-rs.toml @@ -128,6 +128,11 @@ path = '/mnt' ## Media Processing Configuration [media] +## Optional: max file size (in Megabytes) +# environment variable: PICTRS__MEDIA__MAX_FILE_SIZE +# default: 40 +max_file_size = 40 + ## Optional: preprocessing steps for uploaded images # environment variable: PICTRS__MEDIA__PREPROCESS_STEPS # default: empty @@ -135,70 +140,35 @@ path = '/mnt' # This configuration is the same format as the process endpoint's query arguments preprocess_steps = 'crop=16x9&resize=1200&blur=0.2' -## Optional: max media width (in pixels) -# environment variable: PICTRS__MEDIA__MAX_WIDTH -# default: 10,000 -max_width = 10000 - -## Optional: max media height (in pixels) -# environment variable: PICTRS__MEDIA__MAX_HEIGHT -# default: 10,000 -max_height = 10000 - -## Optional: max media area (in pixels) -# environment variable: PICTRS__MEDIA__MAX_AREA -# default: 40,000,000 -max_area = 40000000 - -## Optional: max file size (in Megabytes) -# environment variable: PICTRS__MEDIA__MAX_FILE_SIZE -# default: 40 -max_file_size = 40 - -## Optional: max frame count -# environment variable: PICTRS__MEDIA__MAX_FRAME_COUNT -# default: # 900 -max_frame_count = 900 - -## Optional: enable GIF, MP4, and WEBM uploads (without sound) -# environment variable: PICTRS__MEDIA__ENABLE_SILENT_VIDEO -# default: true -# -# Set this to false to serve static images only -enable_silent_video = true - -## Optional: enable MP4, and WEBM uploads (with sound) and GIF (without sound) -# environment variable: PICTRS__MEDIA__ENABLE_FULL_VIDEO -# default: false -enable_full_video = false - -## Optional: set the default video codec -# environment variable: PICTRS__MEDIA__VIDEO_CODEC -# default: vp9 -# -# available options: av1, h264, h265, vp8, vp9 -# this setting does nothing if video is not enabled -video_codec = "vp9" - -## Optional: set the default audio codec -# environment variable: PICTRS__MEDIA__AUDIO_CODEC -# default: empty -# -# available options: aac, opus, vorbis -# The audio codec is automatically selected based on video codec, but can be overriden -# av1, vp8, and vp9 map to opus -# h264 and h265 map to aac -# vorbis is not default for any codec -# this setting does nothing if full video is not enabled -audio_codec = "aac" - ## Optional: set allowed filters for image processing # environment variable: PICTRS__MEDIA__FILTERS # default: ['blur', 'crop', 'identity', 'resize', 'thumbnail'] filters = ['blur', 'crop', 'identity', 'resize', 'thumbnail'] -## Optional: set file type for all uploads -# environment variable: PICTRS__MEDIA__FORMAT + +[media.image] +## Optional: max media width (in pixels) +# environment variable: PICTRS__MEDIA__IMAGE__MAX_WIDTH +# default: 10,000 +max_width = 10000 + +## Optional: max media height (in pixels) +# environment variable: PICTRS__MEDIA__IMAGE__MAX_HEIGHT +# default: 10,000 +max_height = 10000 + +## Optional: max media area (in pixels) +# environment variable: PICTRS__MEDIA__IMAGE__MAX_AREA +# default: 40,000,000 +max_area = 40000000 + +## Optional: max file size (in Megabytes) +# environment variable: PICTRS__MEDIA__IMAGE__MAX_FILE_SIZE +# default: 40 +max_file_size = 40 + +## Optional: set file type for all images +# environment variable: PICTRS__MEDIA__IMAGE__FORMAT # default: empty # # available options: avif, png, jpeg, jxl, webp @@ -207,49 +177,126 @@ filters = ['blur', 'crop', 'identity', 'resize', 'thumbnail'] # are stored in their original file type. format = "webp" -## Optional: whether to validate images uploaded through the `import` endpoint -# environment variable: PICTRS__MEDIA__SKIP_VALIDATE_IMPORTS -# default: false -# -# Set this to true if you want to avoid processing imported media -skip_validate_imports = false -## Gif configuration +[media.animation] +## Optional: max animation width (in pixels) +# environment variable: PICTRS__MEDIA__ANIMATION__MAX_WIDTH +# default: 256 # -# Making any of these bounds 0 will disable gif uploads -[media.gif] -# Optional: Maximum width in pixels for uploaded gifs -# environment variable: PICTRS__MEDIA__GIF__MAX_WIDTH -# default: 128 -# -# If a gif does not fit within this bound, it will either be transcoded to a video or rejected, -# depending on whether video uploads are enabled -max_width = 128 +# If an animation exceeds this value, it may be converted to a silent video +max_width = 256 -# Optional: Maximum height in pixels for uploaded gifs -# environment variable: PICTRS__MEDIA__GIF__MAX_HEIGHT -# default: 128 +## Optional: max animation height (in pixels) +# environment variable: PICTRS__MEDIA__ANIMATION__MAX_HEIGHT +# default: 256 # -# If a gif does not fit within this bound, it will either be transcoded to a video or rejected, -# depending on whether video uploads are enabled -max_height = 128 +# If an animation exceeds this value, it may be converted to a silent video +max_height = 256 -# Optional: Maximum area in pixels for uploaded gifs -# environment variable: PICTRS__MEDIA__GIF__MAX_AREA -# default: 16384 (128 * 128) +## Optional: max animation area (in pixels) +# environment variable: PICTRS__MEDIA__ANIMATION__MAX_AREA +# default: 65,526 # -# If a gif does not fit within this bound, it will either be transcoded to a video or rejected, -# depending on whether video uploads are enabled -max_area = 16384 +# If an animation exceeds this value, it may be converted to a silent video +max_area = 65536 -# Optional: Maximum number of frames permitted in uploaded gifs -# environment variable: PICTRS__MEDIA__GIF__MAX_FRAME_COUNT +## Optional: max animation size (in Megabytes) +# environment variable: PICTRS__MEDIA__ANIMATION__MAX_FILE_SIZE +# default: 40 +# +# If an animation exceeds this value, it may be converted to a silent video +max_file_size = 40 + +## Optional: max frame count +# environment variable: PICTRS__MEDIA__ANIMATION__MAX_FRAME_COUNT # default: 100 # -# If a gif does not fit within this bound, it will either be transcoded to a video or rejected, -# depending on whether video uploads are enabled +# If an animation exceeds this value, it may be converted to a silent video max_frame_count = 100 +## Optional: set file type for all animations +# environment variable: PICTRS__MEDIA__ANIMATION__FORMAT +# default: empty +# +# available options: apng, avif, gif, webp +# When set, all uploaded still images will be converted to this file type. For balancing quality vs +# file size vs browser support, 'avif', 'jxl', and 'webp' should be considered. By default, images +# are stored in their original file type. +format = "webp" + + +[media.video] +## Optional: enable MP4 and WEBM uploads (without sound) +# environment variable: PICTRS__MEDIA__VIDEO__ENABLE +# default: true +# +# Set this to false to serve static images only +enable = true + +## Optional: enable Sound for MP4 and WEBM uploads +# environment variable: PICTRS__MEDIA__VIDEO__ALLOW_AUDIO +# default: false +# +# this setting does nothing if video is not enabled +allow_audio = false + +## Optional: max video width (in pixels) +# environment variable: PICTRS__MEDIA__VIDEO__MAX_WIDTH +# default: 3,840 +# +# this setting does nothing if video is not enabled +max_width = 3840 + +## Optional: max video height (in pixels) +# environment variable: PICTRS__MEDIA__VIDEO__MAX_HEIGHT +# default: 3,840 +# +# this setting does nothing if video is not enabled +max_height = 3840 + +## Optional: max video area (in pixels) +# environment variable: PICTRS__MEDIA__VIDEO__MAX_AREA +# default: 8,294,400 +# +# this setting does nothing if video is not enabled +max_area = 8294400 + +## Optional: max video size (in Megabytes) +# environment variable: PICTRS__MEDIA__VIDEO__MAX_FILE_SIZE +# default: 40 +# +# this setting does nothing if video is not enabled +max_file_size = 40 + +## Optional: max frame count +# environment variable: PICTRS__MEDIA__VIDEO__MAX_FRAME_COUNT +# default: 900 +# +# this setting does nothing if video is not enabled +max_frame_count = 900 + +## Optional: set the default video codec +# environment variable: PICTRS__MEDIA__VIDEO__VIDEO_CODEC +# default: vp9 +# +# available options: av1, h264, h265, vp8, vp9 +# this setting does nothing if video is not enabled +video_codec = "vp9" + +## Optional: set the default audio codec +# environment variable: PICTRS__MEDIA__VIDEO__AUDIO_CODEC +# default: empty +# +# available options: aac, opus, vorbis +# The audio codec is automatically selected based on video codec, but can be overriden to `vorbis` +# for webm uploads +# automatic mappings: +# - av1, vp8, and vp9 map to opus +# - h264 and h265 map to aac +# - vorbis is not default for any codec +# this setting does nothing if full video is not enabled +audio_codec = "opus" + ## Database configuration [repo] diff --git a/src/config.rs b/src/config.rs index 506575e..f32bc28 100644 --- a/src/config.rs +++ b/src/config.rs @@ -12,7 +12,8 @@ use defaults::Defaults; pub(crate) use commandline::Operation; pub(crate) use file::{ - ConfigFile as Configuration, ObjectStorage, OpenTelemetry, Repo, Sled, Store, Tracing, + Animation, ConfigFile as Configuration, Image, Media, ObjectStorage, OpenTelemetry, Repo, Sled, + Store, Tracing, Video, }; pub(crate) use primitives::{Filesystem, LogFormat}; diff --git a/src/config/commandline.rs b/src/config/commandline.rs index a16537d..58a4442 100644 --- a/src/config/commandline.rs +++ b/src/config/commandline.rs @@ -1,6 +1,6 @@ use crate::{ - config::primitives::{AudioCodec, LogFormat, Targets, VideoCodec}, - formats::ImageFormat, + config::primitives::{LogFormat, Targets}, + formats::{AnimationFormat, AudioCodec, ImageFormat, VideoCodec}, serde_str::Serde, }; use clap::{Parser, Subcommand}; @@ -48,21 +48,28 @@ impl Args { worker_id, client_pool_size, media_preprocess_steps, - media_skip_validate_imports, - media_max_width, - media_max_height, - media_max_area, media_max_file_size, - media_max_frame_count, - media_gif_max_width, - media_gif_max_height, - media_gif_max_area, - media_enable_silent_video, - media_enable_full_video, + media_image_max_width, + media_image_max_height, + media_image_max_area, + media_image_max_file_size, + media_image_format, + media_animation_max_width, + media_animation_max_height, + media_animation_max_area, + media_animation_max_file_size, + media_animation_max_frame_count, + media_animation_format, + media_video_enable, + media_video_allow_audio, + media_video_max_width, + media_video_max_height, + media_video_max_area, + media_video_max_file_size, + media_video_max_frame_count, media_video_codec, - media_audio_codec, + media_video_audio_codec, media_filters, - media_format, store, }) => { let server = Server { @@ -71,33 +78,43 @@ impl Args { worker_id, client_pool_size, }; - let gif = if media_gif_max_width.is_none() - && media_gif_max_height.is_none() - && media_gif_max_area.is_none() - { - None - } else { - Some(Gif { - max_width: media_gif_max_width, - max_height: media_gif_max_height, - max_area: media_gif_max_area, - }) + + let image = Image { + max_file_size: media_image_max_file_size, + max_width: media_image_max_width, + max_height: media_image_max_height, + max_area: media_image_max_area, + format: media_image_format, }; - let media = Media { - preprocess_steps: media_preprocess_steps, - skip_validate_imports: media_skip_validate_imports, - max_width: media_max_width, - max_height: media_max_height, - max_area: media_max_area, - max_file_size: media_max_file_size, - max_frame_count: media_max_frame_count, - gif, - enable_silent_video: media_enable_silent_video, - enable_full_video: media_enable_full_video, + + let animation = Animation { + max_file_size: media_animation_max_file_size, + max_width: media_animation_max_width, + max_height: media_animation_max_height, + max_area: media_animation_max_area, + max_frame_count: media_animation_max_frame_count, + format: media_animation_format, + }; + + let video = Video { + enable: media_video_enable, + allow_audio: media_video_allow_audio, + max_file_size: media_video_max_file_size, + max_width: media_video_max_width, + max_height: media_video_max_height, + max_area: media_video_max_area, + max_frame_count: media_video_max_frame_count, video_codec: media_video_codec, - audio_codec: media_audio_codec, + audio_codec: media_video_audio_codec, + }; + + let media = Media { + max_file_size: media_max_file_size, + preprocess_steps: media_preprocess_steps, filters: media_filters, - format: media_format, + image: image.set(), + animation: animation.set(), + video: video.set(), }; let operation = Operation::Run; @@ -335,45 +352,126 @@ struct OldDb { #[derive(Debug, Default, serde::Serialize)] #[serde(rename_all = "snake_case")] struct Media { - #[serde(skip_serializing_if = "Option::is_none")] - preprocess_steps: Option, - #[serde(skip_serializing_if = "Option::is_none")] - max_width: Option, - #[serde(skip_serializing_if = "Option::is_none")] - max_height: Option, - #[serde(skip_serializing_if = "Option::is_none")] - max_area: Option, #[serde(skip_serializing_if = "Option::is_none")] max_file_size: Option, #[serde(skip_serializing_if = "Option::is_none")] - max_frame_count: Option, - #[serde(skip_serializing_if = "Option::is_none")] - gif: Option, - #[serde(skip_serializing_if = "Option::is_none")] - enable_silent_video: Option, - #[serde(skip_serializing_if = "Option::is_none")] - enable_full_video: Option, - #[serde(skip_serializing_if = "Option::is_none")] - video_codec: Option, - #[serde(skip_serializing_if = "Option::is_none")] - audio_codec: Option, + preprocess_steps: Option, #[serde(skip_serializing_if = "Option::is_none")] filters: Option>, #[serde(skip_serializing_if = "Option::is_none")] - format: Option, + image: Option, #[serde(skip_serializing_if = "Option::is_none")] - skip_validate_imports: Option, + animation: Option, + #[serde(skip_serializing_if = "Option::is_none")] + video: Option