From a57c21febd3d8e13b6cb737d56e9f164607c987a Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 5 Apr 2022 16:17:26 +0200 Subject: [PATCH] Video Transcoding: Update docker-compose.yml config examples #2125 --- docker-compose.yml | 8 ++++---- docker/examples/arm64/docker-compose.yml | 5 +++-- docker/examples/armv7/docker-compose.yml | 2 -- docker/examples/docker-compose.yml | 5 ++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 07b387265..d2671f99d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,10 +108,10 @@ services: PHOTOPRISM_OIDC_CLIENT_SECRET: "9d8351a0-ca01-4556-9c37-85eb634869b9" ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clitools, clean): # PHOTOPRISM_INIT: "gpu tensorflow" - ## Hardware video transcoding config (optional): - # PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # FFmpeg Encoders ("software", "intel", "nvidia", "apple", "v4l2", "vaapi") - # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) + ## Hardware Video Transcoding (optional): + # PHOTOPRISM_FFMPEG_ENCODER: "nvidia" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "v4l2", "vaapi") + # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) + # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) ## Share hardware devices with FFmpeg and TensorFlow (optional): # devices: # - "/dev/dri:/dev/dri" # Intel (h264_qsv) diff --git a/docker/examples/arm64/docker-compose.yml b/docker/examples/arm64/docker-compose.yml index 8c30f7537..4ff22706b 100644 --- a/docker/examples/arm64/docker-compose.yml +++ b/docker/examples/arm64/docker-compose.yml @@ -77,8 +77,6 @@ services: PHOTOPRISM_DISABLE_CLASSIFICATION: "false" # disables image classification PHOTOPRISM_JPEG_QUALITY: 85 # image quality, a higher value reduces compression (25-100) PHOTOPRISM_RAW_PRESETS: "false" # enables RAW file converter presets (may reduce performance) - # PHOTOPRISM_FFMPEG_ENCODER: "h264_v4l2m2m" # FFmpeg AVC encoder for video transcoding (default: libx264) - # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) PHOTOPRISM_DETECT_NSFW: "false" # flag photos as private that MAY be offensive PHOTOPRISM_UPLOAD_NSFW: "true" # allow uploads that MAY be offensive # PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server @@ -93,6 +91,9 @@ services: PHOTOPRISM_SITE_AUTHOR: "" ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clean): # PHOTOPRISM_INIT: "update clean" + ## Hardware Video Transcoding (optional): + # PHOTOPRISM_FFMPEG_ENCODER: "v4l2" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "v4l2", "vaapi") + # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) ## Run as a specific user, group, or with a custom umask (does not work together with "user:") # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000 diff --git a/docker/examples/armv7/docker-compose.yml b/docker/examples/armv7/docker-compose.yml index 917965a64..1765b4f53 100644 --- a/docker/examples/armv7/docker-compose.yml +++ b/docker/examples/armv7/docker-compose.yml @@ -70,8 +70,6 @@ services: PHOTOPRISM_DISABLE_TENSORFLOW: "false" # disables all features depending on TensorFlow PHOTOPRISM_DISABLE_FACES: "false" # disables facial recognition PHOTOPRISM_DISABLE_CLASSIFICATION: "false" # disables image classification - # PHOTOPRISM_FFMPEG_ENCODER: "h264_v4l2m2m" # FFmpeg AVC encoder for video transcoding (default: libx264) - # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) PHOTOPRISM_DETECT_NSFW: "false" # flag photos as private that MAY be offensive PHOTOPRISM_UPLOAD_NSFW: "true" # allows uploads that MAY be offensive # PHOTOPRISM_DATABASE_DRIVER: "sqlite" # SQLite is an embedded database that doesn't require a server diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml index e93fb98d7..78bad0acf 100644 --- a/docker/examples/docker-compose.yml +++ b/docker/examples/docker-compose.yml @@ -82,11 +82,10 @@ services: PHOTOPRISM_SITE_AUTHOR: "" ## Run/install on first startup (options: update, gpu, tensorflow, davfs, clitools, clean): # PHOTOPRISM_INIT: "gpu tensorflow" - ## Hardware video transcoding config (optional) + ## Hardware Video Transcoding (optional): + # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "v4l2", "vaapi") # PHOTOPRISM_FFMPEG_BUFFERS: "64" # FFmpeg capture buffers (default: 32) # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - # PHOTOPRISM_FFMPEG_ENCODER: "h264_v4l2m2m" # use Video4Linux for AVC transcoding (default: libx264) - # PHOTOPRISM_FFMPEG_ENCODER: "h264_qsv" # use Intel Quick Sync Video for AVC transcoding (default: libx264) ## Run as a specific user, group, or with a custom umask (does not work together with "user:") # PHOTOPRISM_UID: 1000 # PHOTOPRISM_GID: 1000