From 2c724258e83090440ba1ff6ee143345a1af2a8a4 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Wed, 9 Mar 2022 09:39:45 +0100 Subject: [PATCH] Integrate fakesilence tool. --- .gitmodules | 3 +++ icedreammusic/ndi-feeder/Dockerfile | 11 +++++++++++ icedreammusic/ndi-feeder/fakesilence | 1 + icedreammusic/ndi-feeder/ndi-feeder.sh | 1 + 4 files changed, 16 insertions(+) create mode 100644 .gitmodules create mode 160000 icedreammusic/ndi-feeder/fakesilence diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d0c6a99 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "icedreammusic/ndi-feeder/fakesilence"] + path = icedreammusic/ndi-feeder/fakesilence + url = https://github.com/icedream/fakesilence.git diff --git a/icedreammusic/ndi-feeder/Dockerfile b/icedreammusic/ndi-feeder/Dockerfile index e1829b9..ff1b53f 100644 --- a/icedreammusic/ndi-feeder/Dockerfile +++ b/icedreammusic/ndi-feeder/Dockerfile @@ -6,6 +6,15 @@ RUN chmod -v +x *.sh ### +FROM golang:1 AS fakesilence + +WORKDIR /usr/src/fakesilence +COPY fakesilence/ . +RUN go build -v . +RUN cp fakesilence /usr/local/bin/ + +### + # yay build FROM archlinux @@ -23,6 +32,8 @@ RUN yay --noconfirm -S pod2man && sudo rm -r ~/.cache /var/cache/pacman/* RUN yay --noconfirm -S ndi-advanced-sdk && sudo rm -r ~/.cache /var/cache/pacman/* RUN yay --noconfirm -S ffmpeg-ndi && sudo rm -r ~/.cache /var/cache/pacman/* +COPY --from=fakesilence /usr/local/bin/fakesilence /usr/local/bin/ + COPY --from=0 /target/ / CMD ["ndi-feeder.sh"] diff --git a/icedreammusic/ndi-feeder/fakesilence b/icedreammusic/ndi-feeder/fakesilence new file mode 160000 index 0000000..9d9a958 --- /dev/null +++ b/icedreammusic/ndi-feeder/fakesilence @@ -0,0 +1 @@ +Subproject commit 9d9a9581df7b36bb9ef54b593dc725b6db4cc888 diff --git a/icedreammusic/ndi-feeder/ndi-feeder.sh b/icedreammusic/ndi-feeder/ndi-feeder.sh index 6d94f57..fd6277f 100644 --- a/icedreammusic/ndi-feeder/ndi-feeder.sh +++ b/icedreammusic/ndi-feeder/ndi-feeder.sh @@ -65,6 +65,7 @@ while true; do call_ffmpeg -loglevel warning \ -analyzeduration 1 -f libndi_newtek -extra_ips 192.168.188.21 -i "$found_audio_source" \ -map a -c:a pcm_s16le -ar 48000 -ac 2 -f s16le - | + fakesilence --samplerate 48000 --channels 2 | call_ffmpeg -loglevel warning \ -ar 48000 -channels 2 -f s16le -i - \ -map a -c:a flac -f ogg -content_type application/ogg "${target_url}" || true