Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add zscale filter to armhf/arm64 for HDR thumbnails extraction #54

Merged
merged 3 commits into from
Dec 4, 2020
Merged

Add zscale filter to armhf/arm64 for HDR thumbnails extraction #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
368dc00
add zscale filter to armhf/arm64 for tone mapping
nyanmisaka Dec 2, 2020
6585527
version 4.3.1-3
nyanmisaka Dec 2, 2020
e36ec9d
specify armv7 to match neon flag on armhf
nyanmisaka Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# We just wrap `build` so this is really it
name: "jellyfin-ffmpeg"
version: "4.3.1-2"
version: "4.3.1-3"
packages:
- stretch-amd64
- stretch-armhf
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
jellyfin-ffmpeg (4.3.1-3) unstable; urgency=medium

* Add zscale filter to armhf/arm64 for HDR thumbnails extraction

-- nyanmisaka <nst799610810@gmail.com> Wed, 02 Dec 2020 20:52:33 +0800

jellyfin-ffmpeg (4.3.1-2) unstable; urgency=medium

* Add support for Ubuntu Groovy (20.10)
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CONFIG := --prefix=${TARGET_DIR} \
--enable-libx264 \
--enable-libx265 \
--enable-libzvbi \
--enable-libzimg \

CONFIG_ARM_COMMON := --toolchain=hardened \
--enable-cross-compile \
Expand All @@ -56,7 +57,6 @@ CONFIG_ARM64 := ${CONFIG_ARM_COMMON} \
--cross-prefix=/usr/bin/aarch64-linux-gnu- \

CONFIG_x86 := --arch=amd64 \
--enable-libzimg \
--enable-opencl \
--enable-vaapi \
--enable-amf \
Expand Down
33 changes: 22 additions & 11 deletions docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,28 @@ PORTS_ADDR=http://ports.ubuntu.com/

# Prepare common extra libs for amd64, armhf and arm64
prepare_extra_common() {
# Download and install zimg for zscale filter
pushd ${SOURCE_DIR}
git clone --depth=1 https://github.com/sekrit-twc/zimg
pushd zimg
case ${ARCH} in
'amd64')
CROSS_OPT=""
;;
'armhf')
CROSS_OPT="--host=armv7-linux-gnueabihf CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++"
;;
'arm64')
CROSS_OPT="--host=aarch64-linux-gnu CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++"
;;
esac
./autogen.sh
./configure --prefix=${TARGET_DIR} ${CROSS_OPT}
make -j $(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/zimg
echo "zimg${TARGET_DIR}/lib/libzimg.so* usr/lib/jellyfin-ffmpeg/lib" >> ${SOURCE_DIR}/debian/jellyfin-ffmpeg.install
popd
popd

# Download and install dav1d
pushd ${SOURCE_DIR}
git clone --depth=1 https://code.videolan.org/videolan/dav1d.git
Expand Down Expand Up @@ -51,17 +73,6 @@ prepare_extra_common() {

# Prepare extra headers, libs and drivers for x86_64-linux-gnu
prepare_extra_amd64() {
# Download and install zimg for zscale filter
pushd ${SOURCE_DIR}
git clone --depth=1 https://github.com/sekrit-twc/zimg
pushd zimg
./autogen.sh
./configure --prefix=${TARGET_DIR}
make -j $(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/zimg
echo "zimg${TARGET_DIR}/lib/libzimg.so* usr/lib/jellyfin-ffmpeg/lib" >> ${SOURCE_DIR}/debian/jellyfin-ffmpeg.install
popd
popd

# Download and install the nvidia headers
pushd ${SOURCE_DIR}
git clone -b n9.0.18.3 --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
Expand Down