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

Video: Add config option for FFmpeg num_capture_buffers #703

Browse source
This commit is contained in:
Michael Mayer 2021-02-16 08:57:21 +01:00
parent 0990e54a66
commit 58005012b1
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/config/flags.go
View file

@ -321,6 +321,12 @@ var GlobalFlags = []cli.Flag{
Value: "libx264", Value: "libx264",
EnvVar: "PHOTOPRISM_FFMPEG_CODEC", EnvVar: "PHOTOPRISM_FFMPEG_CODEC",
}, },
cli.IntFlag{
Name: "ffmpeg-buffers",
Usage: "FFmpeg capture buffers",
Value: 32,
EnvVar: "PHOTOPRISM_FFMPEG_BUFFERS",
},
cli.StringFlag{ cli.StringFlag{
Name: "exiftool-bin", Name: "exiftool-bin",
Usage: "ExifTool `COMMAND` for enhanced metadata extraction", Usage: "ExifTool `COMMAND` for enhanced metadata extraction",

13
internal/config/fs.go
View file

@ -264,6 +264,19 @@ func (c *Config) FFmpegCodec() string {
return c.options.FFmpegCodec return c.options.FFmpegCodec
} }
// FFmpegBuffers returns the number of ffmpeg capture buffers.
func (c *Config) FFmpegBuffers() int {
if c.options.FFmpegBuffers <= 8 {
return 8
}
if c.options.FFmpegBuffers >= 2048 {
return 2048
}
return c.options.FFmpegBuffers
}
// TempPath returns a temporary directory name for uploads and downloads. // TempPath returns a temporary directory name for uploads and downloads.
func (c *Config) TempPath() string { func (c *Config) TempPath() string {
if c.options.TempPath == "" { if c.options.TempPath == "" {

3
internal/config/options.go
View file

@ -91,7 +91,8 @@ type Options struct {
DarktablePresets bool `yaml:"DarktablePresets" json:"DarktablePresets" flag:"darktable-presets"` DarktablePresets bool `yaml:"DarktablePresets" json:"DarktablePresets" flag:"darktable-presets"`
HeifConvertBin string `yaml:"HeifConvertBin" json:"-" flag:"heifconvert-bin"` HeifConvertBin string `yaml:"HeifConvertBin" json:"-" flag:"heifconvert-bin"`
FFmpegBin string `yaml:"FFmpegBin" json:"-" flag:"ffmpeg-bin"` FFmpegBin string `yaml:"FFmpegBin" json:"-" flag:"ffmpeg-bin"`
FFmpegCodec string `yaml:"FFmpegCodec" json:"-" flag:"ffmpeg-codec"` FFmpegCodec string `yaml:"FFmpegCodec" json:"FFmpegCodec" flag:"ffmpeg-codec"`
FFmpegBuffers int `yaml:"FFmpegBuffers" json:"FFmpegBuffers" flag:"ffmpeg-buffers"`
ExifToolBin string `yaml:"ExifToolBin" json:"-" flag:"exiftool-bin"` ExifToolBin string `yaml:"ExifToolBin" json:"-" flag:"exiftool-bin"`
DetachServer bool `yaml:"DetachServer" json:"-" flag:"detach-server"` DetachServer bool `yaml:"DetachServer" json:"-" flag:"detach-server"`
DownloadToken string `yaml:"DownloadToken" json:"-" flag:"download-token"` DownloadToken string `yaml:"DownloadToken" json:"-" flag:"download-token"`

4
internal/photoprism/convert.go
View file

@ -339,8 +339,8 @@ func (c *Convert) AvcConvertCommand(f *MediaFile, avcName, codecName string) (re
"-c:v", codecName, "-c:v", codecName,
"-c:a", "copy", "-c:a", "copy",
"-vf", format, "-vf", format,
"-num_output_buffers", "32", "-num_output_buffers", strconv.Itoa(c.conf.FFmpegBuffers()+8),
"-num_capture_buffers", "32", "-num_capture_buffers", strconv.Itoa(c.conf.FFmpegBuffers()),
"-crf", "23", "-crf", "23",
"-b:v", c.AvcBitrate(f), "-b:v", c.AvcBitrate(f),
"-f", "mp4", "-f", "mp4",