From 19b449023266b3ddb8acbfa85a41d1c7d7ec446a Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 18 Jul 2023 16:53:07 +0200 Subject: [PATCH] Video: Update docker-compose.yml config examples #3466 #3498 #3549 Signed-off-by: Michael Mayer --- docker-compose.yml | 4 ++-- setup/docker/arm64/docker-compose.yml | 4 ++-- setup/docker/docker-compose.yml | 4 ++-- setup/docker/nvidia/docker-compose.yml | 4 ++-- setup/podman/docker-compose.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bd1f02c34..fc0d08ea6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,8 +108,8 @@ services: ## Hardware Video Transcoding (optional): # PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry", "vaapi") Intel: "intel" for Broadwell or later and "vaapi" for Haswell or earlier # PHOTOPRISM_FFMPEG_ENCODER: "intel" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry", "vaapi") Intel: "intel" for Broadwell or later and "vaapi" for Haswell or earlier` - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - # PHOTOPRISM_FFMPEG_RESOLUTION: "1920" # FFmpeg encoding resolution limit in pixel height (default: 4096) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) # LIBVA_DRIVER_NAME: "i965" # For Intel architectures Haswell and older which do not support QSV yet but use VAAPI instead ## Share hardware devices with FFmpeg and TensorFlow (optional): # devices: diff --git a/setup/docker/arm64/docker-compose.yml b/setup/docker/arm64/docker-compose.yml index a000d0752..9dd8e060b 100644 --- a/setup/docker/arm64/docker-compose.yml +++ b/setup/docker/arm64/docker-compose.yml @@ -88,8 +88,8 @@ services: # PHOTOPRISM_INIT: "update clean" ## Hardware Video Transcoding: # PHOTOPRISM_FFMPEG_ENCODER: "raspberry" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - # PHOTOPRISM_FFMPEG_RESOLUTION: "1920" # FFmpeg encoding resolution limit in pixel height (default: 4096) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/setup/docker/docker-compose.yml b/setup/docker/docker-compose.yml index f6a8c70fd..96eaad1b8 100644 --- a/setup/docker/docker-compose.yml +++ b/setup/docker/docker-compose.yml @@ -79,8 +79,8 @@ services: # PHOTOPRISM_INIT: "https gpu tensorflow" ## Hardware Video Transcoding: # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - # PHOTOPRISM_FFMPEG_RESOLUTION: "1920" # FFmpeg encoding resolution limit in pixel height (default: 4096) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/setup/docker/nvidia/docker-compose.yml b/setup/docker/nvidia/docker-compose.yml index d258cec87..bdb657923 100644 --- a/setup/docker/nvidia/docker-compose.yml +++ b/setup/docker/nvidia/docker-compose.yml @@ -84,8 +84,8 @@ services: ## Hardware Video Transcoding: ## see https://docs.photoprism.app/getting-started/advanced/transcoding/#nvidia-container-toolkit PHOTOPRISM_FFMPEG_ENCODER: "nvidia" - PHOTOPRISM_FFMPEG_BITRATE: "50" - PHOTOPRISM_FFMPEG_RESOLUTION: "4096" + PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) + PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) NVIDIA_VISIBLE_DEVICES: "all" NVIDIA_DRIVER_CAPABILITIES: "compute,video,utility" ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): diff --git a/setup/podman/docker-compose.yml b/setup/podman/docker-compose.yml index 1e96e76c8..0a7591e4e 100644 --- a/setup/podman/docker-compose.yml +++ b/setup/podman/docker-compose.yml @@ -83,8 +83,8 @@ services: # PHOTOPRISM_INIT: "https gpu tensorflow" ## Hardware Video Transcoding: # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - # PHOTOPRISM_FFMPEG_RESOLUTION: "1920" # FFmpeg encoding resolution limit in pixel (default: 4096) + # PHOTOPRISM_FFMPEG_SIZE: "1920" # Maximum video size in PIXELS (720-7680) (default: 3840) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # Maximum video BITRATE in Mbit/s (default: 50) ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000