From 7de38d6c224c5aef89ad61d0e0dc5ce9830e51eb Mon Sep 17 00:00:00 2001 From: magnus-nomono <77778329+magnus-nomono@users.noreply.github.com> Date: Tue, 18 Jun 2024 12:12:18 +0200 Subject: [PATCH] Add mp3 support and tailor build more (#2) * Add mp3 encoding with lame * Changes necessary for tsx * Remove ffprobe binary --- .github/workflows/build.yml | 2 +- common.sh | 30 ++++++++---------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b70b4ce..5de1b91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update -y && \ - sudo apt-get install -y libopus-dev yasm + sudo apt-get install -y libmp3lame-dev libopus-dev yasm - name: Install ARM64 compiler if: env.ARCH == 'arm64' run: | diff --git a/common.sh b/common.sh index e90c549..f81e3da 100644 --- a/common.sh +++ b/common.sh @@ -34,6 +34,7 @@ FFMPEG_CONFIGURE_FLAGS=( # Reenable what we need --enable-decoder=aac* --enable-decoder=ac3 + --enable-decoder=adpcm* --enable-decoder=alac --enable-decoder=als --enable-decoder=ape @@ -78,26 +79,7 @@ FFMPEG_CONFIGURE_FLAGS=( --enable-demuxer=mpc --enable-demuxer=mpc8 --enable-demuxer=ogg - --enable-demuxer=pcm_alaw - --enable-demuxer=pcm_f32be - --enable-demuxer=pcm_f32le - --enable-demuxer=pcm_f64be - --enable-demuxer=pcm_f64le - --enable-demuxer=pcm_mulaw - --enable-demuxer=pcm_s8 - --enable-demuxer=pcm_s16be - --enable-demuxer=pcm_s16le - --enable-demuxer=pcm_s24be - --enable-demuxer=pcm_s24le - --enable-demuxer=pcm_s32be - --enable-demuxer=pcm_s32le - --enable-demuxer=pcm_u8 - --enable-demuxer=pcm_u16be - --enable-demuxer=pcm_u16le - --enable-demuxer=pcm_u24be - --enable-demuxer=pcm_u24le - --enable-demuxer=pcm_u32be - --enable-demuxer=pcm_u32le + --enable-demuxer=pcm* --enable-demuxer=rm --enable-demuxer=shorten --enable-demuxer=tak @@ -107,23 +89,27 @@ FFMPEG_CONFIGURE_FLAGS=( --enable-demuxer=xwma --enable-encoder=flac --enable-encoder=libopus + --enable-encoder=libmp3lame --enable-encoder=pcm* --enable-ffmpeg - --enable-ffprobe --enable-filter=aformat --enable-filter=anull --enable-filter=aresample --enable-filter=atrim + --enable-filter=channelmap + --enable-filter=channelsplit --enable-filter=format --enable-filter=null + --enable-filter=pan --enable-filter=setpts --enable-filter=trim + --enable-libmp3lame --enable-libopus + --enable-muxer=mp3 --enable-muxer=ogg --enable-muxer=opus --enable-muxer=pcm* --enable-muxer=wav - --enable-muxer=webm --enable-parser=aac --enable-parser=aac_latm --enable-parser=ac3