Merge pull request #64 from nyanmisaka/ffmpeg432

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "4.3.1-4"
+version: "4.3.2-1"
 packages:
  - stretch-amd64
  - stretch-armhf

debian/control

@@ -5,7 +5,7 @@ Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
 Uploaders: Jellyfin Packaging Team <packaging@jellyfin.org>
 Rules-Requires-Root: no
 Homepage: https://ffmpeg.org/
-Standards-Version: 4.3.1
+Standards-Version: 4.3.2
 Vcs-Git: https://github.com/jellyfin/jellyfin-ffmpeg.git
 Vcs-Browser: https://github.com/jellyfin/jellyfin-ffmpeg
 Build-Depends:

debian/patches/0005-lavfi-fix-framesync-with-embedded-PGS-subtitle.patch

@@ -0,0 +1,33 @@
+avfilter/hwupload_cuda: add YUVA420P format support
+avfilter/overlay_cuda: fix framesync with embedded PGS subtitle
+Index: jellyfin-ffmpeg/libavfilter/vf_hwupload_cuda.c
+===================================================================
+--- jellyfin-ffmpeg.orig/libavfilter/vf_hwupload_cuda.c
++++ jellyfin-ffmpeg/libavfilter/vf_hwupload_cuda.c
+@@ -57,7 +57,7 @@ static int cudaupload_query_formats(AVFi
+ int ret;
+
+ static const enum AVPixelFormat input_pix_fmts[] = {
+- AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P,
++ AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV444P,
+ AV_PIX_FMT_P010, AV_PIX_FMT_P016, AV_PIX_FMT_YUV444P16,
+ AV_PIX_FMT_0RGB32, AV_PIX_FMT_0BGR32,
+ #if CONFIG_VULKAN
+Index: jellyfin-ffmpeg/libavfilter/vf_overlay_cuda.c
+===================================================================
+--- jellyfin-ffmpeg.orig/libavfilter/vf_overlay_cuda.c
++++ jellyfin-ffmpeg/libavfilter/vf_overlay_cuda.c
+@@ -157,9 +157,12 @@ static int overlay_cuda_blend(FFFrameSyn
+ if (ret < 0)
+ return ret;
+
+- if (!input_main || !input_overlay)
++ if (!input_main)
+ return AVERROR_BUG;
+
++ if (!input_overlay)
++ return ff_filter_frame(outlink, input_main);
++
+ ret = av_frame_make_writable(input_main);
+ if (ret < 0) {
+ av_frame_free(&input_main);

debian/patches/series

@@ -2,3 +2,4 @@
 0002-lavfi-add-a-filter-for-uploading-normal-frames-to-VAAPI.patch
 0003-fix-for-the-broken-tonemap_vaapi-filter.patch
 0004-cuda-format-converter-impl.patch
+0005-lavfi-fix-framesync-with-embedded-PGS-subtitle.patch

docker-build.sh

@@ -92,7 +92,7 @@ prepare_extra_amd64() {
 
  # Download and install libva
  pushd ${SOURCE_DIR}
- git clone -b v2.10-branch --depth=1 https://github.com/intel/libva
+ git clone -b v2.11-branch --depth=1 https://github.com/intel/libva
  pushd libva
  sed -i 's|getenv("LIBVA_DRIVERS_PATH")|"/usr/lib/jellyfin-ffmpeg/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/dri:/usr/local/lib/dri"|g' va/va.c
  sed -i 's|getenv("LIBVA_DRIVER_NAME")|NULL|g' va/va.c
@@ -119,7 +119,7 @@ prepare_extra_amd64() {
 
  # Download and install gmmlib
  pushd ${SOURCE_DIR}
- git clone -b intel-gmmlib-20.4.1 --depth=1 https://github.com/intel/gmmlib
+ git clone -b intel-gmmlib-21.1.1 --depth=1 https://github.com/intel/gmmlib
  pushd gmmlib
  mkdir build && pushd build
  cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} ..
@@ -132,7 +132,7 @@ prepare_extra_amd64() {
 
  # Download and install MediaSDK
  pushd ${SOURCE_DIR}
- git clone -b intel-mediasdk-20.5 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK
+ git clone -b intel-mediasdk-21.1 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK
  pushd MediaSDK
  sed -i 's|MFX_PLUGINS_CONF_DIR "/plugins.cfg"|"/usr/lib/jellyfin-ffmpeg/lib/mfx/plugins.cfg"|g' api/mfx_dispatch/linux/mfxloader.cpp
  mkdir build && pushd build
@@ -150,7 +150,7 @@ prepare_extra_amd64() {
  # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default)
  # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF
  #pushd ${SOURCE_DIR}
- #git clone -b intel-media-20.4 --depth=1 https://github.com/intel/media-driver
+ #git clone -b intel-media-21.1 --depth=1 https://github.com/intel/media-driver
  #pushd media-driver
  #mkdir build && pushd build
  #cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \