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

Fix some race conditions

Browse Source
This commit is contained in:
Zoe Roux 2024-02-26 22:27:47 +01:00
parent 4c7e335ef4
commit 7baa586738
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transcoder/Dockerfile.dev
View File

@ -47,4 +47,4 @@ ENV NVIDIA_VISIBLE_DEVICES="all"
ENV NVIDIA_DRIVER_CAPABILITIES="all" ENV NVIDIA_DRIVER_CAPABILITIES="all"
EXPOSE 7666 EXPOSE 7666
CMD wgo run . CMD wgo run -race .

5
transcoder/src/keyframes.go
View File

@ -54,8 +54,8 @@ func (kf *Keyframe) add(values []float64) {
} }
func (kf *Keyframe) AddListener(callback func(keyframes []float64)) { func (kf *Keyframe) AddListener(callback func(keyframes []float64)) {
kf.mutex.RLock() kf.mutex.Lock()
defer kf.mutex.RUnlock() defer kf.mutex.Unlock()
kf.listeners = append(kf.listeners, callback) kf.listeners = append(kf.listeners, callback)
} }
@ -72,6 +72,7 @@ func GetKeyframes(sha string, path string) *Keyframe {
save_path := fmt.Sprintf("%s/%s/keyframes.json", Settings.Metadata, sha) save_path := fmt.Sprintf("%s/%s/keyframes.json", Settings.Metadata, sha)
if err := getSavedInfo(save_path, kf); err == nil { if err := getSavedInfo(save_path, kf); err == nil {
log.Printf("Using keyframes cache on filesystem for %s", path) log.Printf("Using keyframes cache on filesystem for %s", path)
kf.ready.Done()
return return
} }

3
transcoder/src/stream.go
View File

@ -377,6 +377,7 @@ func (ts *Stream) GetSegment(segment int32) (string, error) {
} }
} }
} }
readyChan := ts.segments[segment].channel
ts.lock.RUnlock() ts.lock.RUnlock()
if !ready { if !ready {
@ -392,7 +393,7 @@ func (ts *Stream) GetSegment(segment int32) (string, error) {
} }
select { select {
case <-ts.segments[segment].channel: case <-readyChan:
case <-time.After(60 * time.Second): case <-time.After(60 * time.Second):
return "", errors.New("could not retrive the selected segment (timeout)") return "", errors.New("could not retrive the selected segment (timeout)")
} }