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

Config: Fix FFmpegResolution() func and related test #3498

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-06-28 16:45:53 +02:00
parent 9b3917dd00
commit a6d3eee331
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/config/config_ffmpeg.go
View file

@ -44,10 +44,10 @@ func (c *Config) FFmpegResolution() int {
return 4320
case c.options.FFmpegResolution <= 144:
return 144
case c.options.FFmpegBitrate >= 4320:
case c.options.FFmpegResolution >= 4320:
return 4320
default:
return c.options.FFmpegBitrate
return c.options.FFmpegResolution
}
}

2
internal/config/config_ffmpeg_test.go
View file

@ -45,7 +45,7 @@ func TestConfig_FFmpegBitrate(t *testing.T) {
func TestConfig_FFmpegResolution(t *testing.T) {
c := NewConfig(CliTestContext())
assert.Equal(t, 144, c.FFmpegResolution())
assert.Equal(t, 4320, c.FFmpegResolution())
c.options.FFmpegResolution = 1920
assert.Equal(t, 1920, c.FFmpegResolution())