apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-10 02:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential race condition

Browse Source
This commit is contained in:
Ingo Oppermann
2024-11-27 14:29:40 +01:00
parent f55a3e7fce
commit cfc5b7d16f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg/parse/parser.go
View File

@@ -235,6 +235,9 @@ func (p *parser) Parse(line []byte) uint64 {
} }
if isFFmpegInputs { if isFFmpegInputs {
p.lock.progress.Lock()
defer p.lock.progress.Unlock()
if err := p.parseFFmpegIO("input", bytes.TrimPrefix(line, []byte("ffmpeg.inputs:"))); err != nil { if err := p.parseFFmpegIO("input", bytes.TrimPrefix(line, []byte("ffmpeg.inputs:"))); err != nil {
p.logger.WithFields(log.Fields{ p.logger.WithFields(log.Fields{
"line": line, "line": line,
@@ -246,6 +249,9 @@ func (p *parser) Parse(line []byte) uint64 {
} }
if isHLSStreamMap { if isHLSStreamMap {
p.lock.progress.Lock()
defer p.lock.progress.Unlock()
if err := p.parseHLSStreamMap(bytes.TrimPrefix(line, []byte("hls.streammap:"))); err != nil { if err := p.parseHLSStreamMap(bytes.TrimPrefix(line, []byte("hls.streammap:"))); err != nil {
p.logger.WithFields(log.Fields{ p.logger.WithFields(log.Fields{
"line": line, "line": line,
@@ -257,6 +263,9 @@ func (p *parser) Parse(line []byte) uint64 {
} }
if isFFmpegOutputs { if isFFmpegOutputs {
p.lock.progress.Lock()
defer p.lock.progress.Unlock()
if err := p.parseFFmpegIO("output", bytes.TrimPrefix(line, []byte("ffmpeg.outputs:"))); err != nil { if err := p.parseFFmpegIO("output", bytes.TrimPrefix(line, []byte("ffmpeg.outputs:"))); err != nil {
p.logger.WithFields(log.Fields{ p.logger.WithFields(log.Fields{
"line": line, "line": line,
@@ -287,6 +296,9 @@ func (p *parser) Parse(line []byte) uint64 {
} }
if isFFmpegMapping { if isFFmpegMapping {
p.lock.progress.Lock()
defer p.lock.progress.Unlock()
if err := p.parseFFmpegMapping(bytes.TrimPrefix(line, []byte("ffmpeg.mapping:"))); err != nil { if err := p.parseFFmpegMapping(bytes.TrimPrefix(line, []byte("ffmpeg.mapping:"))); err != nil {
p.logger.WithFields(log.Fields{ p.logger.WithFields(log.Fields{
"line": line, "line": line,