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

Update patches and bump version to 4.4.1-2 #91

Merged
merged 3 commits into from
Feb 21, 2022
Merged

Update patches and bump version to 4.4.1-2 #91

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
46e5585
Fix an issue that OpenCL deriving fails when two devices are available
nyanmisaka Feb 21, 2022
b180e97
Update the min version to 1.4.23.0 for AMF SDK
nyanmisaka Feb 21, 2022
7539e1e
Bump version to 4.4.1-2
nyanmisaka Feb 21, 2022
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-win64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ done

# Use the latest distro for toolchains
distro="ubuntu:impish"
ffrevison="1"
ffrevison="2"
image_name="jellyfin-ffmpeg-build-windows-win64"
package_temporary_dir="$( mktemp -d )"
current_user="$( whoami )"
Expand Down
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.4.1-1"
version: "4.4.1-2"
packages:
- buster-amd64
- buster-armhf
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
jellyfin-ffmpeg (4.4.1-2) unstable; urgency=medium

* Fix the OpenCL dynamic linking issue on Win64 (#82)
* Enable Intel media driver building (#89)

-- nyanmisaka <nst799610810@gmail.com> Mon, 21 Feb 2022 13:26:03 +0800

jellyfin-ffmpeg (4.4.1-1) unstable; urgency=medium

* New upstream release 4.4.1 (#70)
Expand Down
13 changes: 13 additions & 0 deletions debian/patches/0004-add-amf-refactor-and-hevc-10-bit-encoding.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2511,3 +2511,16 @@ Index: jellyfin-ffmpeg/libavcodec/amfenc_hevc.c
.wrapper_name = "amf",
.hw_configs = ff_amfenc_hw_configs,
};
Index: jellyfin-ffmpeg/configure
===================================================================
--- jellyfin-ffmpeg.orig/configure
+++ jellyfin-ffmpeg/configure
@@ -6787,7 +6787,7 @@ fi

enabled amf &&
check_cpp_condition amf "AMF/core/Version.h" \
- "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400090000"
+ "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400170000"

# Funny iconv installations are not unusual, so check it after all flags have been set
if enabled libc_iconv; then
65 changes: 51 additions & 14 deletions debian/patches/0008-add-d3d11-opencl-interop-for-AMD.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,44 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
static void CL_CALLBACK opencl_error_callback(const char *errinfo,
const void *private_info,
size_t cb,
@@ -820,17 +835,25 @@ static int opencl_device_init(AVHWDevice
@@ -491,8 +506,10 @@ static int opencl_device_create_internal
cl_uint nb_platforms;
cl_platform_id *platforms = NULL;
cl_platform_id platform_id;
+ cl_platform_id platform_id_default;
cl_uint nb_devices;
cl_device_id *devices = NULL;
+ cl_device_id device_id_default;
AVOpenCLDeviceContext *hwctx = hwdev->hwctx;
cl_int cle;
cl_context_properties default_props[3];
@@ -571,6 +588,11 @@ static int opencl_device_create_internal
++found;
platform_id = platforms[p];
hwctx->device_id = devices[d];
+
+ if (p == 0 && d == 0) {
+ platform_id_default = platforms[0];
+ device_id_default = devices[0];
+ }
}

av_freep(&devices);
@@ -582,9 +604,10 @@ static int opencl_device_create_internal
goto fail;
}
if (found > 1) {
- av_log(hwdev, AV_LOG_ERROR, "More than one matching device found.\n");
- err = AVERROR(ENODEV);
- goto fail;
+ av_log(hwdev, AV_LOG_WARNING, "More than one matching device found. "
+ "Default to the first one.\n");
+ platform_id = platform_id_default;
+ hwctx->device_id = device_id_default;
}

if (!props) {
@@ -820,17 +843,25 @@ static int opencl_device_init(AVHWDevice
#if HAVE_OPENCL_D3D11
{
const char *d3d11_ext = "cl_khr_d3d11_sharing";
Expand Down Expand Up @@ -86,7 +123,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
}

CL_FUNC(clCreateFromD3D11Texture2DKHR,
@@ -840,6 +863,13 @@ static int opencl_device_init(AVHWDevice
@@ -840,6 +871,13 @@ static int opencl_device_init(AVHWDevice
CL_FUNC(clEnqueueReleaseD3D11ObjectsKHR,
"D3D11 in OpenCL release");

Expand All @@ -100,7 +137,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
if (fail) {
av_log(hwdev, AV_LOG_WARNING, "D3D11 to OpenCL mapping "
"not usable.\n");
@@ -1242,7 +1272,7 @@ static int opencl_device_derive(AVHWDevi
@@ -1242,7 +1280,7 @@ static int opencl_device_derive(AVHWDevi
CL_CONTEXT_VA_API_DISPLAY_INTEL,
(intptr_t)src_hwctx->display,
CL_CONTEXT_INTEROP_USER_SYNC,
Expand All @@ -109,7 +146,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
0,
};
OpenCLDeviceSelector selector = {
@@ -1281,11 +1311,13 @@ static int opencl_device_derive(AVHWDevi
@@ -1281,11 +1319,13 @@ static int opencl_device_derive(AVHWDevi
device_handle,
&device, FALSE);
if (SUCCEEDED(hr)) {
Expand All @@ -124,7 +161,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
0,
};
OpenCLDeviceSelector selector = {
@@ -1318,11 +1350,13 @@ static int opencl_device_derive(AVHWDevi
@@ -1318,11 +1358,13 @@ static int opencl_device_derive(AVHWDevi
case AV_HWDEVICE_TYPE_D3D11VA:
{
AVD3D11VADeviceContext *src_hwctx = src_ctx->hwctx;
Expand All @@ -139,7 +176,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
0,
};
OpenCLDeviceSelector selector = {
@@ -2004,7 +2038,8 @@ static int opencl_map_frame(AVHWFramesCo
@@ -2004,7 +2046,8 @@ static int opencl_map_frame(AVHWFramesCo
goto fail;
}

Expand All @@ -149,7 +186,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c

av_log(hwfc, AV_LOG_DEBUG, "Map plane %d (%p -> %p).\n",
p, src->data[p], dst->data[p]);
@@ -2329,7 +2364,7 @@ static void opencl_unmap_from_dxva2(AVHW
@@ -2329,7 +2372,7 @@ static void opencl_unmap_from_dxva2(AVHW
{
AVOpenCLFrameDescriptor *desc = hwmap->priv;
OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv;
Expand All @@ -158,7 +195,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
cl_event event;
cl_int cle;

@@ -2421,11 +2456,13 @@ static int opencl_frames_derive_from_dxv
@@ -2421,11 +2464,13 @@ static int opencl_frames_derive_from_dxv
cl_int cle;
int err, i, p, nb_planes;

Expand All @@ -174,7 +211,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
nb_planes = 2;

if (src_fc->initial_pool_size == 0) {
@@ -2493,7 +2530,7 @@ static void opencl_unmap_from_d3d11(AVHW
@@ -2493,7 +2538,7 @@ static void opencl_unmap_from_d3d11(AVHW
{
AVOpenCLFrameDescriptor *desc = hwmap->priv;
OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv;
Expand All @@ -183,7 +220,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
cl_event event;
cl_int cle;

@@ -2501,7 +2538,7 @@ static void opencl_unmap_from_d3d11(AVHW
@@ -2501,7 +2546,7 @@ static void opencl_unmap_from_d3d11(AVHW
frames_priv->command_queue, desc->nb_planes, desc->planes,
0, NULL, &event);
if (cle != CL_SUCCESS) {
Expand All @@ -192,7 +229,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
"handle: %d.\n", cle);
}

@@ -2516,7 +2553,7 @@ static int opencl_map_from_d3d11(AVHWFra
@@ -2516,7 +2561,7 @@ static int opencl_map_from_d3d11(AVHWFra
AVOpenCLFrameDescriptor *desc;
cl_event event;
cl_int cle;
Expand All @@ -201,7 +238,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c

index = (intptr_t)src->data[1];
if (index >= frames_priv->nb_mapped_frames) {
@@ -2530,20 +2567,36 @@ static int opencl_map_from_d3d11(AVHWFra
@@ -2530,20 +2575,36 @@ static int opencl_map_from_d3d11(AVHWFra

desc = &frames_priv->mapped_frames[index];

Expand Down Expand Up @@ -246,7 +283,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c
dst->data[i] = (uint8_t*)desc->planes[i];

err = ff_hwframe_map_create(dst->hw_frames_ctx, dst, src,
@@ -2572,16 +2625,26 @@ static int opencl_frames_derive_from_d3d
@@ -2572,16 +2633,26 @@ static int opencl_frames_derive_from_d3d
AVD3D11VAFramesContext *src_hwctx = src_fc->hwctx;
OpenCLDeviceContext *device_priv = dst_fc->device_ctx->internal->priv;
OpenCLFramesContext *frames_priv = dst_fc->internal->priv;
Expand Down Expand Up @@ -278,7 +315,7 @@ Index: jellyfin-ffmpeg/libavutil/hwcontext_opencl.c

if (src_fc->initial_pool_size == 0) {
av_log(dst_fc, AV_LOG_ERROR, "Only fixed-size pools are supported "
@@ -2604,27 +2667,94 @@ static int opencl_frames_derive_from_d3d
@@ -2604,27 +2675,94 @@ static int opencl_frames_derive_from_d3d
for (i = 0; i < frames_priv->nb_mapped_frames; i++) {
AVOpenCLFrameDescriptor *desc = &frames_priv->mapped_frames[i];
desc->nb_planes = nb_planes;
Expand Down