Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-31 04:04:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use builtin max instead of custom one

Browse Source
This commit is contained in:
Zoe Roux 2024-04-01 22:18:44 +02:00
parent 83110374f8
commit ea98598399
No known key found for this signature in database
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transcoder/src/info.go
View File

@ -1,7 +1,6 @@
package src package src
import ( import (
"cmp"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
@ -168,13 +167,6 @@ func OrNull(str string) *string {
return &str return &str
} }
func Max[T cmp.Ordered](x, y T) T {
if x < y {
return y
}
return x
}
var SubtitleExtensions = map[string]string{ var SubtitleExtensions = map[string]string{
"subrip": "srt", "subrip": "srt",
"ass": "ass", "ass": "ass",
@ -316,7 +308,7 @@ func getInfo(path string, route string) (*MediaInfo, error) {
Link: link, Link: link,
} }
}), }),
Chapters: Map(make([]Chapter, Max(chapters_end-chapters_begin, 1)-1), func(_ Chapter, i int) Chapter { Chapters: Map(make([]Chapter, max(chapters_end-chapters_begin, 1)-1), func(_ Chapter, i int) Chapter {
return Chapter{ return Chapter{
StartTime: ParseTime(mi.GetI(mediainfo.StreamMenu, 0, int(chapters_begin)+i, mediainfo.InfoName)), StartTime: ParseTime(mi.GetI(mediainfo.StreamMenu, 0, int(chapters_begin)+i, mediainfo.InfoName)),
// +1 is safe, the value at chapters_end contains the right duration // +1 is safe, the value at chapters_end contains the right duration

2
transcoder/src/stream.go
View File

@ -68,7 +68,7 @@ func NewStream(file *FileStream, handle StreamHandle, ret *Stream) {
ret.heads = make([]Head, 0) ret.heads = make([]Head, 0)
length, is_done := file.Keyframes.Length() length, is_done := file.Keyframes.Length()
ret.segments = make([]Segment, length, Max(length, 2000)) ret.segments = make([]Segment, length, max(length, 2000))
for seg := range ret.segments { for seg := range ret.segments {
ret.segments[seg].channel = make(chan struct{}) ret.segments[seg].channel = make(chan struct{})
} }