Skip to content

Commit

Permalink
feat: Be more resilient when downloading HTTP content
Browse files Browse the repository at this point in the history
  • Loading branch information
@mauricioabreu
mauricioabreu committed Feb 11, 2024
1 parent 407cfc9 commit 1a79952
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 0 deletions.
9 changes: 9 additions & 0 deletions internal/mosaic/command/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ func getVideoInputArguments(m mosaic.Mosaic) []string {
args := []string{"-i", m.BackgroundURL}

for _, media := range m.Medias {
// Resiliency flags
args = append(args,
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
)

if media.IsLoop {
args = append(args,
"-stream_loop", "-1",
Expand Down
50 changes: 50 additions & 0 deletions internal/mosaic/mosaic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,17 @@ func TestBuildFFMPEGCommand(t *testing.T) {
expectedArgs: []string{
"-loglevel", "error",
"-i", "http://example.com/background.jpg",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_1.m3u8",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_2.m3u8",
"-filter_complex", `nullsrc=size=1920x1080 [background];[0:v] realtime, scale=1920x1080 [image];[1:v] setpts=PTS-STARTPTS, scale=1170x660 [v1];[2:v] setpts=PTS-STARTPTS, scale=568x320 [v2];[background][v1] overlay=shortest=0:x=84:y=40 [posv1];[posv1][v2] overlay=shortest=0:x=1260:y=40 [posv2];[image][posv2] overlay=shortest=0 [mosaic];[1:a] aresample=async=1 [a1]`,
"-map", "[mosaic]",
Expand Down Expand Up @@ -114,7 +124,17 @@ func TestBuildFFMPEGCommand(t *testing.T) {
expectedArgs: []string{
"-loglevel", "error",
"-i", "http://example.com/background.jpg",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_1.m3u8",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_2.m3u8",
"-filter_complex", `nullsrc=size=1920x1080 [background];[0:v] realtime, scale=1920x1080 [image];[1:v] setpts=PTS-STARTPTS, scale=1170x660 [v1];[2:v] setpts=PTS-STARTPTS, scale=568x320 [v2];[background][v1] overlay=shortest=0:x=84:y=40 [posv1];[posv1][v2] overlay=shortest=0:x=1260:y=40 [posv2];[image][posv2] overlay=shortest=0 [mosaic];[1:a] aresample=async=1 [a1];[2:a] aresample=async=1 [a2]`,
"-map", "[mosaic]",
Expand Down Expand Up @@ -172,7 +192,17 @@ func TestBuildFFMPEGCommand(t *testing.T) {
expectedArgs: []string{
"-loglevel", "error",
"-i", "http://example.com/background.jpg",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_1.m3u8",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_2.m3u8",
"-filter_complex", `nullsrc=size=1920x1080 [background];[0:v] realtime, scale=1920x1080 [image];[1:v] setpts=PTS-STARTPTS, scale=1170x660 [v1];[2:v] setpts=PTS-STARTPTS, scale=568x320 [v2];[background][v1] overlay=shortest=0:x=84:y=40 [posv1];[posv1][v2] overlay=shortest=0:x=1260:y=40 [posv2];[image][posv2] overlay=shortest=0 [mosaic]`,
"-map", "[mosaic]",
Expand Down Expand Up @@ -229,7 +259,17 @@ func TestBuildFFMPEGCommand(t *testing.T) {
expectedArgs: []string{
"-loglevel", "error",
"-i", "http://example.com/background.jpg",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_1.m3u8",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_2.m3u8",
"-filter_complex", `nullsrc=size=1920x1080 [background];[0:v] realtime, scale=1920x1080 [image];[1:v] setpts=PTS-STARTPTS, scale=1170x660 [v1];[2:v] setpts=PTS-STARTPTS, scale=568x320 [v2];[background][v1] overlay=shortest=0:x=84:y=40 [posv1];[posv1][v2] overlay=shortest=0:x=1260:y=40 [posv2];[image][posv2] overlay=shortest=0 [mosaic];[1:a] aresample=async=1 [a1]`,
"-map", "[mosaic]",
Expand Down Expand Up @@ -287,7 +327,17 @@ func TestBuildFFMPEGCommand(t *testing.T) {
expectedArgs: []string{
"-loglevel", "error",
"-i", "http://example.com/background.jpg",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-i", "http://example.com/mosaicvideo_1.m3u8",
"-reconnect_at_eof", "1",
"-reconnect_streamed", "1",
"-reconnect_on_network_error", "1",
"-reconnect_on_http_error", "4xx,5xx",
"-reconnect_delay_max", "2",
"-stream_loop", "-1",
"-i", "http://example.com/promotion-video.mp4",
"-filter_complex", `nullsrc=size=1920x1080 [background];[0:v] realtime, scale=1920x1080 [image];[1:v] setpts=PTS-STARTPTS, scale=1170x660 [v1];[2:v] setpts=PTS-STARTPTS, scale=568x320 [v2];[background][v1] overlay=shortest=0:x=84:y=40 [posv1];[posv1][v2] overlay=shortest=0:x=1260:y=40 [posv2];[image][posv2] overlay=shortest=0 [mosaic];[1:a] aresample=async=1 [a1]`,
Expand Down

0 comments on commit 1a79952

Please sign in to comment.