luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Increase default jpeg-size to 7680 x 4320 px #388

Browse source 
It's easier to decrease this when you've made a mistake than the other way.

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-15 08:30:28 +02:00
parent 6ebf975bf6
commit 1ad34478de
7 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docker-compose.travis.yml
View file

@ -38,8 +38,9 @@ services:
PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage)
PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680)
PHOTOPRISM_THUMB_SIZE_UNCACHED: 4096 # On-demand rendering size limit (default 4096, min 720, max 7680) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD
PHOTOPRISM_JPEG_SIZE: 4096 # Size limit for converted image files in pixels (720-30000) PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680)
PHOTOPRISM_JPEG_SIZE: 7680 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage) PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage)
PHOTOPRISM_SIDECAR_JSON: "true" # Read metadata from JSON sidecar files created by exiftool PHOTOPRISM_SIDECAR_JSON: "true" # Read metadata from JSON sidecar files created by exiftool
PHOTOPRISM_SIDECAR_YAML: "true" # Backup photo metadata to YAML sidecar files PHOTOPRISM_SIDECAR_YAML: "true" # Backup photo metadata to YAML sidecar files

5
docker-compose.yml
View file

@ -52,8 +52,9 @@ services:
PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_UNCACHED: "true" # Enable on-demand thumbnail rendering (high memory and cpu usage)
PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680)
PHOTOPRISM_THUMB_SIZE_UNCACHED: 4096 # On-demand rendering size limit (default 4096, min 720, max 7680) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD
PHOTOPRISM_JPEG_SIZE: 4096 # Size limit for converted image files in pixels (720-30000) PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680)
PHOTOPRISM_JPEG_SIZE: 7680 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage) PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage)
PHOTOPRISM_SIDECAR_JSON: "true" # Read metadata from JSON sidecar files created by exiftool PHOTOPRISM_SIDECAR_JSON: "true" # Read metadata from JSON sidecar files created by exiftool
PHOTOPRISM_SIDECAR_YAML: "true" # Backup photo metadata to YAML sidecar files PHOTOPRISM_SIDECAR_YAML: "true" # Backup photo metadata to YAML sidecar files

1
docker/demo/Dockerfile
View file

@ -24,6 +24,7 @@ ENV PHOTOPRISM_THUMB_FILTER lanczos
ENV PHOTOPRISM_THUMB_UNCACHED true ENV PHOTOPRISM_THUMB_UNCACHED true
ENV PHOTOPRISM_THUMB_SIZE 4096 ENV PHOTOPRISM_THUMB_SIZE 4096
ENV PHOTOPRISM_THUMB_SIZE_UNCACHED 4096 ENV PHOTOPRISM_THUMB_SIZE_UNCACHED 4096
ENV PHOTOPRISM_JPEG_SIZE 4096
ENV PHOTOPRISM_JPEG_QUALITY 95 ENV PHOTOPRISM_JPEG_QUALITY 95
ENV PHOTOPRISM_SITE_CAPTION "Try our demo" ENV PHOTOPRISM_SITE_CAPTION "Try our demo"

7
docker/photoprism/arm64/docker-compose.yml
View file

@ -42,10 +42,9 @@ services:
PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
PHOTOPRISM_THUMB_UNCACHED: "false" # Enable on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_UNCACHED: "false" # Enable on-demand thumbnail rendering (high memory and cpu usage)
PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680)
# PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD
PHOTOPRISM_THUMB_SIZE_UNCACHED: 4096 # On-demand rendering size limit (default 4096, min 720, max 7680) PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680)
# PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # Retina 6K, 8K Ultra HD PHOTOPRISM_JPEG_SIZE: 7680 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_SIZE: 4096 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage) PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage)
PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for generated files like cache and index PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for generated files like cache and index
volumes: volumes:

7
docker/photoprism/docker-compose.yml
View file

@ -41,10 +41,9 @@ services:
PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear PHOTOPRISM_THUMB_FILTER: "lanczos" # Resample filter, best to worst: blackman, lanczos, cubic, linear
PHOTOPRISM_THUMB_UNCACHED: "false" # Enable on-demand thumbnail rendering (high memory and cpu usage) PHOTOPRISM_THUMB_UNCACHED: "false" # Enable on-demand thumbnail rendering (high memory and cpu usage)
PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680) PHOTOPRISM_THUMB_SIZE: 2048 # Pre-rendered thumbnail size limit (default 2048, min 720, max 7680)
# PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage) # PHOTOPRISM_THUMB_SIZE: 4096 # Retina 4K, DCI 4K (requires more storage); 7680 for 8K Ultra HD
PHOTOPRISM_THUMB_SIZE_UNCACHED: 4096 # On-demand rendering size limit (default 4096, min 720, max 7680) PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # On-demand rendering size limit (default 7680, min 720, max 7680)
# PHOTOPRISM_THUMB_SIZE_UNCACHED: 7680 # Retina 6K, 8K Ultra HD PHOTOPRISM_JPEG_SIZE: 7680 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_SIZE: 4096 # Size limit for converted image files in pixels (720-30000)
PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage) PHOTOPRISM_JPEG_QUALITY: 90 # Use 95 for high-quality thumbnails (requires more storage)
PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for generated files like cache and index PHOTOPRISM_STORAGE_PATH: "/photoprism/storage" # Storage PATH for generated files like cache and index
volumes: volumes:

4
internal/config/flags.go
View file

@ -286,13 +286,13 @@ var GlobalFlags = []cli.Flag{
cli.IntFlag{ cli.IntFlag{
Name: "thumb-size-uncached, x", Name: "thumb-size-uncached, x",
Usage: "on-demand rendering size limit in `PIXELS` (720-7680)", Usage: "on-demand rendering size limit in `PIXELS` (720-7680)",
Value: 4096, Value: 7680,
EnvVar: "PHOTOPRISM_THUMB_SIZE_UNCACHED", EnvVar: "PHOTOPRISM_THUMB_SIZE_UNCACHED",
}, },
cli.IntFlag{ cli.IntFlag{
Name: "jpeg-size", Name: "jpeg-size",
Usage: "size limit for converted image files in `PIXELS` (720-30000)", Usage: "size limit for converted image files in `PIXELS` (720-30000)",
Value: 4096, Value: 7680,
EnvVar: "PHOTOPRISM_JPEG_SIZE", EnvVar: "PHOTOPRISM_JPEG_SIZE",
}, },
cli.IntFlag{ cli.IntFlag{

2
internal/thumb/types.go
View file

@ -4,7 +4,7 @@ import "github.com/disintegration/imaging"
var ( var (
Size = 2048 Size = 2048
Limit = 4096 Limit = 7680
Filter = ResampleLanczos Filter = ResampleLanczos
JpegQuality = 95 JpegQuality = 95
JpegQualitySmall = 80 JpegQualitySmall = 80