Skip to content

Commit

Permalink
GIT CI ARM: do not build own FFmpeg
Browse files Browse the repository at this point in the history
Own FFmpeg was build only to enable periodic insertion of SPS/PPS NALU
for OMX. This should be now, however, possible to do even with the lavc
`header_inserter` option (which is enabled by default for OMX). Also
the OMX API seems unavailable in more recent RPi OS in favor of other
APIs.
  • Loading branch information
MartinPulec committed Sep 22, 2023
1 parent 4e9c3f8 commit 4c95ebb
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 67,922 deletions.
18 changes: 1 addition & 17 deletions .github/scripts/Linux/arm/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,7 @@ apt -y install libcaca-dev libmagickwand-dev libnatpmp-dev libopencv-core-dev li
/.github/scripts/Linux/install_others.sh ximea

# FFmpeg
if [ "$ARCH" = armhf ]; then # Raspbian - build own FFmpeg with OMX camera patch
apt -y install libraspberrypi-dev libdrm-dev
sed -i '/^deb /p;s/deb /deb-src /' /etc/apt/sources.list
apt -y update && apt -y build-dep ffmpeg
raspbian_build_sdl2
apt -y remove libavcodec58 && apt -y autoremove
git clone --depth 1 -b n4.3.3 https://github.com/FFmpeg/FFmpeg.git && cd FFmpeg

# apply patches
find /.github/scripts/Linux/arm/ffmpeg-arm-patches -name '*.patch' -print0 | sort -z | xargs -0 -n 1 git apply

./configure --enable-gpl --disable-stripping --enable-libaom --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libspeex --enable-libvpx --enable-libwebp --enable-libx265 --enable-omx --enable-neon --enable-libx264 --enable-mmal --enable-omx-rpi --enable-rpi --enable-vout-drm --enable-libdrm --enable-v4l2-request --enable-libudev --cpu=arm1176jzf-s --enable-shared --disable-static
make -j3 install
cd "$OLDPWD"
else
apt -y install libavcodec-dev libavformat-dev libsdl2-dev libswscale-dev
fi
apt -y install libavcodec-dev libavformat-dev libsdl2-dev libswscale-dev

# mkappimage
mkai_arch=$(dpkg --print-architecture)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4c95ebb

Please sign in to comment.