Skip to content

Commit 43629fb

Browse files
authored
fix: limit duration of watermark input (#158)
1 parent fc35b2c commit 43629fb

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

crates/ffpipeline/src/pipeline.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,24 @@ impl Pipeline {
506506
"-loop",
507507
"1",
508508
"-framerate",
509-
output_context.media_frame_rate.r_frame_rate.clone()
509+
output_context.media_frame_rate.r_frame_rate.clone(),
510+
"-t",
511+
format!("{}ms", duration.as_millis())
510512
]
511513
} else if watermark_stream.codec == "gif" || watermark_stream.codec == "apng" {
512-
args!["-ignore_loop", "0"]
514+
args![
515+
"-ignore_loop",
516+
"0",
517+
"-t",
518+
format!("{}ms", duration.as_millis())
519+
]
513520
} else {
514-
args!["-stream_loop", "-1"]
521+
args![
522+
"-stream_loop",
523+
"-1",
524+
"-t",
525+
format!("{}ms", duration.as_millis())
526+
]
515527
};
516528

517529
inputs.push(PipelineInput::Watermark {

examples/playout/playout.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"phase_offset_ms": 0,
3434
"disable_after_ms": 3000000,
3535
"fade_ms": 1000,
36-
"hold_ms": 8000,
36+
"hold_ms": 8000
3737
}
3838
}
3939
},

0 commit comments

Comments
 (0)