From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89296CC6B0F for ; Tue, 13 Oct 2026 21:51:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3E67060681; Tue, 13 Oct 2026 21:51:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id eCV7upi9JEU6; Tue, 13 Oct 2026 21:51:08 +0000 (UTC) ARC-Filter: OpenARC Filter v1.3.2 smtp3.osuosl.org EEB8D60890 Authentication-Results: smtp3.osuosl.org; arc=fail smtp.remote-ip=140.211.166.142 ARC-Seal: i=2; d=osuosl.org; s=arc; a=rsa-sha256; cv=fail; t=1791928268; b=mr/vNbyahN4xwHrwapsGtrpcLuwHZXDCuOtOdGLE8MdYnVeJ+ER6ZysjvpV2427dRT0T 2JG7rSSIeXbMc4Pg5yruObf+8+SHjmr4itRMl/uQ+C6yHQj7ilAxD8X0cVgk4/G0IA1jb BULlhKjI17uYk5Bo7oUF8J5uDQa34SmdCgZux8vqSQZCcrhlJWNFyykFvRlO0g/DMWpmj yZZxJ8pfcN3Cr+FYoB2vuisfInqmt7FBWoZ6uOJ/7L5LsexoSkpVwG0LogTLb/HYeq7LD OUIs6F4c37gStoj+PT7gyIiaMWuExW+MFbz3+ITH6zij+j7wEUkq1SVsIM4GRkcemRw== ARC-Message-Signature: i=2; d=osuosl.org; s=arc; a=rsa-sha256; c=relaxed/relaxed; t=1791928268; h=X-Comment:DKIM-Signature:X-Original-To:Delivered-To:Received: Received:X-Virus-Scanned:X-Spam-Flag:X-Spam-Score:X-Spam-Level: X-Spam-Status:Received:ARC-Filter:Received-SPF:Received: DKIM-Signature:X-KAS-Sym:Received:Received:From:To:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-Spamd-Bar:Subject: X-BeenThere:X-Mailman-Version:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:Content-Type: Content-Transfer-Encoding:Errors-To:Sender; bh=XwNPeYKpP+AK0NUMsck39/Ks6c7We4C2o/kP3/tPb8w=; b=S3V7Anv75WiFcq975vFsBD2NsLySyZMJUfKTNFKt8iZGqooYQ/l7/FLg82jopKjtu7wd MtD8seca9IksGtReCv0oQ8GVGmlBccrJh4OxOx1FfapG/0aoRfw50m3pRB4EYsioNOEFb RUp2/CaBKicTNj4nReu+GhpykrbkRU1NE55S9PfXAnPadNo4mjvooK9XvGMxFkuP2+JTn +iQJTKFbqJpodtx5nadU+Qg+BqS6Hd4shq5sgC4UiVnI/h9bSMtOrQUXQBOaxHrpFr5VC 6l7/nDlN1VmsSivDAWeD+INtuHXby8+yTATNj/nmOyO6NyfEIReJ8QlW8DJBfNBA98w== ARC-Authentication-Results: i=2; smtp3.osuosl.org; arc=fail smtp.remote-ip=140.211.166.142 X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=buildroot.org; s=default; t=1791928268; bh=XwNPeYKpP+AK0NUMsck39/Ks6c7We4C2o/kP3/tPb8w=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cp26z61thcrq4LcjCWmShNqgvHICVkIOLp/RN//h9HIMZNgVimSEFf4xx2nC+Mv+G A+lh3qP8ROLNFlSr1lK0cj01Ov4htSHXDIIC4Bx2JQcbPG/Q/c7u7E1r8OvuVeIsWO vM7OEjkjVnNmAZGnZCfqHJEy3h1wGF1dcv8Isx41DHHFeG2zZOazAODPsMvsDx0InR VCs1G37HNkzHBHIn2YKq4B/WfF8x4IBvQCm+lxRIxZgl4FDvwO/SZFLYkXGNsFfxy5 YEypyMTqNxqEVnXQNG6GxPPTTObtuqYzMtGSAlUSs2hNDQeaRj7Inxk8FwilHbDXCI 8KB4/0orMQ85w== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id EEB8D60890; Tue, 13 Oct 2026 21:51:07 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id C6AB1235 for ; Tue, 13 Oct 2026 21:51:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B8A7180858 for ; Tue, 13 Oct 2026 21:51:06 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ti1FnXRWNKWm for ; Tue, 13 Oct 2026 21:51:04 +0000 (UTC) ARC-Filter: OpenARC Filter v1.3.2 smtp1.osuosl.org B7B1C80854 Authentication-Results: smtp1.osuosl.org; arc=none smtp.remote-ip=85.13.140.57 ARC-Seal: i=1; d=osuosl.org; s=arc; a=rsa-sha256; cv=none; t=1791928264; b=DX9jHH362QCcQ0Ljczf8A1p7gYTm2GbazYYAktIjiFXq3Tbsy8IJe9EhoSrhgewjWmJx fUmEugEdd5yrWz3E/Drz60Fi1l8jELUqVt0ZxGYLslZ6rLi+dkWIYiHzd/6yFElOPtreO wuzkNHC9ENVcDs2FSawl+uEVeJmMvQzIX4ELN9G0LIBxhQEy5hZXiRMIk6yoeVoR5OdeI 1pOO/n5b7Q2ZFDhSL+IumMeamW3bUbDLoBZ0T7saTii10CyPRvJVMKqj4umWuu/k9QxLU Y/X0SdonNMQ3bmDtJVIsMfKA+kSJWX9a8BTwnZFi03Up8db3Sp0/rMwexR4FGEogkBA== ARC-Message-Signature: i=1; d=osuosl.org; s=arc; a=rsa-sha256; c=relaxed/relaxed; t=1791928264; h=Received-SPF:DKIM-Signature:X-KAS-Sym:Received:Received:From:To: Subject:Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Spam-Score:X-Spamd-Bar; bh=Tb6X/KeDpAF3SMxo548xiAPIL9Xd7QLq4PlScn8iqq8=; b=kDs78J8QE6cJX16Jc+9Jaw/dEHKTTkbVuFjST8PZv+Wsr12VPNT8zkbPp3qsu1FFQw/J e3//ExbO8R4YoKjxeDmUtA7pJlj3gdxDfXiJXGuesOkhhXsxY6wzHtEv/W/kvGLokxVyv BtbEwBOahdKLv1OaWLh9mO6+3IYyjYV/6n9gyues3/Hc8Bedb861doEXPG07Fr3RaJZxz PIxc+dabEtBG5vH/LXqlt1gojYEYWeiX7K5w0pYMHFtDqWdMVUaAgKtoMB3sUPoifwBY7 yohdJYL+5U9bYsGXg/XfYjoAVoYizVKLoC1mdhzjbCGXOYCp//yansDW0noRaYfXKbA== ARC-Authentication-Results: i=1; smtp1.osuosl.org; dmarc=pass header.from=kuhls.net; dkim=pass header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202605290044 header.b=RDg2fyfT; arc=none smtp.remote-ip=85.13.140.57 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=85.13.140.57; helo=dd20012.kasserver.com; envelope-from=bernd@kuhls.net; receiver= Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=kuhls.net Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202605290044 header.b=RDg2fyfT Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp1.osuosl.org (Postfix) with ESMTPS id B7B1C80854 for ; Tue, 13 Oct 2026 21:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202605290044; t=1791928232; bh=Tb6X/KeDpAF3SMxo548xiAPIL9Xd7QLq4PlScn8iqq8=; h=From:To:Subject:Date:In-Reply-To:From; b=RDg2fyfTpQ0C4EHwTbuMKGcBLrXyVF/wwK+x0DTomM9VdcvLX4kiKisCmW9IgQJa2 KsMur3UoYFehszgOk3jX8PNepr+WBuJ9oTHD6F0f4Zn/MXhG2RHA6T8PyGrVB+UIBq tYscAG5idgFRqK+H6J38fo1VSkDcegS49KH0/gWRQPLqmkywJ7PNsp2BGah6m4M/NO 8zUFhRBSfeP3gcsqj6zwWGn3MS3GUQP4nZOH/Z+eIksmDFclBn0YkDj8FerazcKmm8 7IwpQ4j1omHOjZwMbKmFjW6v95A9dnKlSqXvOAB3ieM6VJV1drMjdDkLV9LtLYNh54 O+F2NXpSQfQYw== X-KAS-Sym: v3:f51bdf72230551df:iRrhmmgc7+3BXX9A7J0fNbonZj/POtdddEk4Wm3Jhqtu+ sXfYOd4zBWKrruPbrjPdv/aES5XyA4HhkYwm1co6isH0XaNMXgtqj5ztLda6xfN7JMCG5kC0l9e eg7Z6CBkYtSFlvHI38C/3xfc6/ar0E34i0+9kgHjEx4muSh1jt+pz1nqnncJQ+adhAsuZfnsXvq YBz93Ws0X6CBfGw73C81W2yZVNFEiDXmm2njJa1Z97kdSXiwA83kCl7e1Iei+EnLIJKwlHgl7U+ TiUmmYdu0QK4VggGIaCUOAcqzRcmHRIsp9t18czpbCJYDCR+z7UrxaMk/Rs6hLK7VsWaFchw==: dt3LKQApgri4iaaksDNcprcKF/E3h/JMiOTlBUGebQE8b9Xf3UfRBmuq7BnyP67LpiEwju61o2E AXmgat2Q8Wq9lD35FIJs4EJcDq8ug7AbP/NsbbwVvxU/1o9xzbxkGmkY2nc+z8U4BQftc+nimmZ eNIi3/UsCFUWy+V6tzNHnOJs6PrFf7pC6MzrchM3DJeZ2MVa9fBASTmUGjpKyaLGSyJqYDhGIW/ it0SCGR9WjDy1Kc6jUTjCLoxIMhcCSJKsi0NHpQcZFviO2UGARugSrYkW3J+M3P2sI9jHXNQ6K2 0RM5+GqJ06Y1QU8fJajixsz5Cv/TKgAQ8yelWizPiSRZO7h2ONaIELSQoiFsU4QNzNfWpMjT1eZ rgIKmpkXcLoAdusNYmF3CprPYZQ3KMUePz00NiVH+bQI/GaVH04N2a9bxEv2Pq2fT1hFEQ+InRu S5egoYFA2wEq64FNY+Dn9Kfb95qszKcDmhNmRtXESimLiI6QDGnBctTFRNGF2zJhb5205t7gQwx SLMtSTM3T+xkhALQ42eKH9p+4rwGDwyoaMuk07LQIJ6Rfy/Vui1kJXkuw2NXxrfBdEcMOGzsn18 H7ke Received: from fli4l.lan.fli4l (p54a1b220.dip0.t-ipconnect.de [84.161.178.32]) by dd20012.kasserver.com (Postfix) with ESMTPSA id 592D6A4C5990 for ; Tue, 13 Oct 2026 23:50:32 +0200 (CEST) Received: from bruckner.lan.fli4l ([192.168.1.1]:37044) by fli4l.lan.fli4l with esmtp (Exim 4.100.1) (envelope-from ) id 1xGkOF-000000001g9-1Xsc for buildroot@buildroot.org; Tue, 13 Oct 2026 21:50:32 +0000 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 13 Oct 2026 23:50:27 +0200 Message-ID: <20261013215029.317512-3-bernd@kuhls.net> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261013215029.317512-1-bernd@kuhls.net> References: <20261013215029.317512-1-bernd@kuhls.net> MIME-Version: 1.0 X-Spamd-Bar: -- Subject: [Buildroot] [PATCH 3/5] package/kodi: support ffmpeg 7.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" For details see upstream PR 24972 from which these patches were taken during its development from a force-push which took place May 29, 2024, 8:13 GMT+2. Please note that the later patches in this PR for ffmpeg 7.1 are not compatible with Kodi 21.3. We need to use the 7.0 branch of ffmpeg in order to prepare for the bump of Kodi to 22.0 which supports ffmpeg versions >= 7.0: https://github.com/xbmc/xbmc/commit/72fe098c8436c96763f677b4c65d32988b931b5b Signed-off-by: Bernd Kuhls --- package/kodi/0007-Update-to-7.0.patch | 338 ++++++++++++++++++ ...cated-use-of-FF_API_INTERLACED_FRAME.patch | 98 +++++ ...move-deprecated-use-of-avcodec_close.patch | 30 ++ ...precated-use-av_stream_get_side_data.patch | 113 ++++++ ...ve-CrystalHD-hw-acceleration-strings.patch | 47 +++ ...layerignoredtsinwav-advanced-setting.patch | 51 +++ ...Use-new-audio-DTS-and-ATMOS-profiles.patch | 98 +++++ 7 files changed, 775 insertions(+) create mode 100644 package/kodi/0007-Update-to-7.0.patch create mode 100644 package/kodi/0008-Remove-deprecated-use-of-FF_API_INTERLACED_FRAME.patch create mode 100644 package/kodi/0009-Remove-deprecated-use-of-avcodec_close.patch create mode 100644 package/kodi/0010-Remove-deprecated-use-av_stream_get_side_data.patch create mode 100644 package/kodi/0011-Remove-CrystalHD-hw-acceleration-strings.patch create mode 100644 package/kodi/0012-Remove-VideoPlayerignoredtsinwav-advanced-setting.patch create mode 100644 package/kodi/0013-Use-new-audio-DTS-and-ATMOS-profiles.patch diff --git a/package/kodi/0007-Update-to-7.0.patch b/package/kodi/0007-Update-to-7.0.patch new file mode 100644 index 0000000000..cc9cbe0960 --- /dev/null +++ b/package/kodi/0007-Update-to-7.0.patch @@ -0,0 +1,338 @@ +From fd9fdfd70e4b9e4783de1b6ca11f1925217af559 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Thu, 11 Apr 2024 17:11:32 +0200 +Subject: [PATCH] Update to 7.0 + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +[Bernd: removed fixes in xbmc/cdrip/, they are incompatible with ffmpeg + 6.1, they will be re-added with the bump of ffmpeg to 7.0] +Signed-off-by: Bernd Kuhls +--- + cmake/modules/FindFFMPEG.cmake | 16 +-- + tools/buildsteps/windows/ffmpeg_options.txt | 1 - + tools/depends/target/ffmpeg/CMakeLists.txt | 6 +- + tools/depends/target/ffmpeg/FFMPEG-VERSION | 4 +- + .../ActiveAE/ActiveAEResampleFFMPEG.cpp | 110 +++++++++--------- + .../DVDDemuxers/DVDDemuxFFmpeg.cpp | 71 +---------- + 6 files changed, 67 insertions(+), 141 deletions(-) + +diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake +index 6c6bf973de..6bd05e9f3d 100644 +--- a/cmake/modules/FindFFMPEG.cmake ++++ b/cmake/modules/FindFFMPEG.cmake +@@ -163,14 +163,14 @@ if(WITH_FFMPEG) + set(REQUIRED_FFMPEG_VERSION undef) + else() + # required ffmpeg library versions +- set(REQUIRED_FFMPEG_VERSION 6.0.0) +- set(_avcodec_ver ">=60.2.100") +- set(_avfilter_ver ">=9.3.100") +- set(_avformat_ver ">=60.3.100") +- set(_avutil_ver ">=58.2.100") +- set(_postproc_ver ">=57.1.100") +- set(_swresample_ver ">=4.10.100") +- set(_swscale_ver ">=7.1.100") ++ set(REQUIRED_FFMPEG_VERSION 7.0.0) ++ set(_avcodec_ver ">=61.3.100") ++ set(_avfilter_ver ">=10.1.100") ++ set(_avformat_ver ">=61.1.100") ++ set(_avutil_ver ">=59.8.100") ++ set(_postproc_ver ">=58.1.100") ++ set(_swresample_ver ">=5.1.100") ++ set(_swscale_ver ">=8.1.100") + endif() + + # Allows building with external ffmpeg not found in system paths, +diff --git a/tools/buildsteps/windows/ffmpeg_options.txt b/tools/buildsteps/windows/ffmpeg_options.txt +index 5034ff26c4..776c0b4b35 100644 +--- a/tools/buildsteps/windows/ffmpeg_options.txt ++++ b/tools/buildsteps/windows/ffmpeg_options.txt +@@ -1,5 +1,4 @@ + --disable-avdevice +---disable-crystalhd + --disable-cuda + --disable-cuvid + --disable-devices +diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt +index 0bbc23540a..86d7db1bba 100644 +--- a/tools/depends/target/ffmpeg/CMakeLists.txt ++++ b/tools/depends/target/ffmpeg/CMakeLists.txt +@@ -92,14 +92,12 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) + list(APPEND ffmpeg_conf --extra-cflags=-mno-stackrealign) + endif() + elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) +- list(APPEND ffmpeg_conf --disable-crystalhd +- --enable-videotoolbox ++ list(APPEND ffmpeg_conf --enable-videotoolbox + --disable-filter=yadif_videotoolbox + --target-os=darwin + ) + elseif(CORE_SYSTEM_NAME STREQUAL osx) +- list(APPEND ffmpeg_conf --disable-crystalhd +- --enable-videotoolbox ++ list(APPEND ffmpeg_conf --enable-videotoolbox + --target-os=darwin + --disable-securetransport + ) +diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION +index f2ba09402e..60b8887de3 100644 +--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION ++++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION +@@ -1,5 +1,5 @@ + LIBNAME=ffmpeg +-VERSION=6.0.1 ++VERSION=7.0.1 + ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +-SHA512=945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc ++SHA512=43b639b0bc0597e95dea2dce3e925f4b71ca8c4d9eadaef614941053e287f2d5c2e78d95413f0f7142da0f6ea1dbf443457e4fa1c2296cd8cf4081c185ed9c04 + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp +index e897cbd3ea..6fce0af981 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp +@@ -66,51 +66,7 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfi + AVChannelLayout dstChLayout = {}; + AVChannelLayout srcChLayout = {}; + +- av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout); +- av_channel_layout_from_mask(&srcChLayout, m_src_chan_layout); +- +- int ret = swr_alloc_set_opts2(&m_pContext, &dstChLayout, m_dst_fmt, m_dst_rate, &srcChLayout, +- m_src_fmt, m_src_rate, 0, NULL); +- +- if (ret) +- { +- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - create context failed"); +- return false; +- } +- +- if(quality == AE_QUALITY_HIGH) +- { +- av_opt_set_double(m_pContext, "cutoff", 1.0, 0); +- av_opt_set_int(m_pContext,"filter_size", 256, 0); +- } +- else if(quality == AE_QUALITY_MID) +- { +- // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97 +- av_opt_set_double(m_pContext, "cutoff", 0.985, 0); +- av_opt_set_int(m_pContext,"filter_size", 64, 0); +- } +- else if(quality == AE_QUALITY_LOW) +- { +- av_opt_set_double(m_pContext, "cutoff", 0.97, 0); +- av_opt_set_int(m_pContext,"filter_size", 32, 0); +- } +- +- if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P) +- { +- av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0); +- } +- +- // tell resampler to clamp float values +- // not required for sink stage (remapLayout == true) +- if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) && +- (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) && +- !remapLayout && normalize) +- { +- av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); +- } +- +- av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0); +- ++ bool hasMatrix = false; + if (remapLayout) + { + // one-to-one mapping of channels +@@ -120,28 +76,19 @@ bool CActiveAEResampleFFMPEG::Init(SampleConfig dstConfig, SampleConfig srcConfi + m_dst_chan_layout = 0; + for (unsigned int out=0; outCount(); out++) + { +- m_dst_chan_layout += ((uint64_t)1) << out; ++ m_dst_chan_layout += static_cast(1) << out; + int idx = CAEUtil::GetAVChannelIndex((*remapLayout)[out], m_src_chan_layout); + if (idx >= 0) + { + m_rematrix[out][idx] = 1.0; + } + } +- +- av_opt_set_int(m_pContext, "out_channel_count", m_dst_channels, 0); +- av_opt_set_int(m_pContext, "out_channel_layout", m_dst_chan_layout, 0); +- +- if (swr_set_matrix(m_pContext, (const double*)m_rematrix, AE_CH_MAX) < 0) +- { +- CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed"); +- return false; +- } ++ hasMatrix = true; + } + // stereo upmix + else if (upmix && m_src_channels == 2 && m_dst_channels > 2) + { + memset(m_rematrix, 0, sizeof(m_rematrix)); +- av_channel_layout_uninit(&dstChLayout); + av_channel_layout_from_mask(&dstChLayout, m_dst_chan_layout); + for (int out=0; out(m_rematrix), AE_CH_MAX) < 0) + { + CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - setting channel matrix failed"); + return false; + } + } + ++ if (quality == AE_QUALITY_HIGH) ++ { ++ av_opt_set_double(m_pContext, "cutoff", 1.0, 0); ++ av_opt_set_int(m_pContext, "filter_size", 256, 0); ++ } ++ else if (quality == AE_QUALITY_MID) ++ { ++ // 0.97 is default cutoff so use (1.0 - 0.97) / 2.0 + 0.97 ++ av_opt_set_double(m_pContext, "cutoff", 0.985, 0); ++ av_opt_set_int(m_pContext, "filter_size", 64, 0); ++ } ++ else if (quality == AE_QUALITY_LOW) ++ { ++ av_opt_set_double(m_pContext, "cutoff", 0.97, 0); ++ av_opt_set_int(m_pContext, "filter_size", 32, 0); ++ } ++ ++ if (m_dst_fmt == AV_SAMPLE_FMT_S32 || m_dst_fmt == AV_SAMPLE_FMT_S32P) ++ { ++ av_opt_set_int(m_pContext, "output_sample_bits", m_dst_bits, 0); ++ } ++ ++ // tell resampler to clamp float values ++ // not required for sink stage (remapLayout == true) ++ if ((m_dst_fmt == AV_SAMPLE_FMT_FLT || m_dst_fmt == AV_SAMPLE_FMT_FLTP) && ++ (m_src_fmt == AV_SAMPLE_FMT_FLT || m_src_fmt == AV_SAMPLE_FMT_FLTP) && !remapLayout && ++ normalize) ++ { ++ av_opt_set_double(m_pContext, "rematrix_maxval", 1.0, 0); ++ } ++ ++ av_opt_set_double(m_pContext, "center_mix_level", centerMix, 0); ++ + if(swr_init(m_pContext) < 0) + { + CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Init - init resampler failed"); +diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +index 1aebc3dcbc..174df53f16 100644 +--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -376,74 +376,7 @@ bool CDVDDemuxFFmpeg::Open(const std::shared_ptr& pInput, bool + if (iformat == nullptr) + { + // let ffmpeg decide which demuxer we have to open +- bool trySPDIFonly = (m_pInput->GetContent() == "audio/x-spdif-compressed"); +- +- if (!trySPDIFonly) +- av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0); +- +- // Use the more low-level code in case we have been built against an old +- // FFmpeg without the above av_probe_input_buffer(), or in case we only +- // want to probe for spdif (DTS or IEC 61937) compressed audio +- // specifically, or in case the file is a wav which may contain DTS or +- // IEC 61937 (e.g. ac3-in-wav) and we want to check for those formats. +- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0)) +- { +- AVProbeData pd; +- int probeBufferSize = 32768; +- std::unique_ptr probe_buffer (new uint8_t[probeBufferSize + AVPROBE_PADDING_SIZE]); +- +- // init probe data +- pd.buf = probe_buffer.get(); +- pd.filename = strFile.c_str(); +- +- // read data using avformat's buffers +- pd.buf_size = avio_read(m_ioContext, pd.buf, probeBufferSize); +- if (pd.buf_size <= 0) +- { +- CLog::Log(LOGERROR, "{} - error reading from input stream, {}", __FUNCTION__, +- CURL::GetRedacted(strFile)); +- return false; +- } +- memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE); +- +- // restore position again +- avio_seek(m_ioContext , 0, SEEK_SET); +- +- // the advancedsetting is for allowing the user to force outputting the +- // 44.1 kHz DTS wav file as PCM, so that an A/V receiver can decode +- // it (this is temporary until we handle 44.1 kHz passthrough properly) +- if (trySPDIFonly || (iformat && strcmp(iformat->name, "wav") == 0 && !CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_VideoPlayerIgnoreDTSinWAV)) +- { +- // check for spdif and dts +- // This is used with wav files and audio CDs that may contain +- // a DTS or AC3 track padded for S/PDIF playback. If neither of those +- // is present, we assume it is PCM audio. +- // AC3 is always wrapped in iec61937 (ffmpeg "spdif"), while DTS +- // may be just padded. +- const AVInputFormat* iformat2 = av_find_input_format("spdif"); +- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4) +- { +- iformat = iformat2; +- } +- else +- { +- // not spdif or no spdif demuxer, try dts +- iformat2 = av_find_input_format("dts"); +- +- if (iformat2 && iformat2->read_probe(&pd) > AVPROBE_SCORE_MAX / 4) +- { +- iformat = iformat2; +- } +- else if (trySPDIFonly) +- { +- // not dts either, return false in case we were explicitly +- // requested to only check for S/PDIF padded compressed audio +- CLog::Log(LOGDEBUG, "{} - not spdif or dts file, falling back", __FUNCTION__); +- return false; +- } +- } +- } +- } ++ av_probe_input_buffer(m_ioContext, &iformat, strFile.c_str(), NULL, 0, 0); + + if (!iformat) + { +@@ -1353,7 +1286,7 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double* startpts) + + if (ret >= 0) + { +- if (m_pFormatContext->iformat->read_seek) ++ if (!(m_pFormatContext->iformat->flags & AVFMT_NOTIMESTAMPS)) + m_seekToKeyFrame = true; + m_currentPts = DVD_NOPTS_VALUE; + } +-- +2.47.3 + diff --git a/package/kodi/0008-Remove-deprecated-use-of-FF_API_INTERLACED_FRAME.patch b/package/kodi/0008-Remove-deprecated-use-of-FF_API_INTERLACED_FRAME.patch new file mode 100644 index 0000000000..401681fcbe --- /dev/null +++ b/package/kodi/0008-Remove-deprecated-use-of-FF_API_INTERLACED_FRAME.patch @@ -0,0 +1,98 @@ +From 8ab7d9781db412374796d80966828f35037d995c Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Thu, 11 Apr 2024 17:13:36 +0200 +Subject: [PATCH] Remove deprecated use of FF_API_INTERLACED_FRAME + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 5 +++-- + .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++---- + xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 6 ++++-- + xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp | 2 +- + 4 files changed, 13 insertions(+), 9 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +index eb2943bb8c..4da0722d5c 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +@@ -582,8 +582,9 @@ void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture) + + pVideoPicture->iRepeatPicture = 0; + pVideoPicture->iFlags = 0; +- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0; +- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST : 0; ++ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0; ++ pVideoPicture->iFlags |= ++ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0; + pVideoPicture->iFlags |= m_pFrame->data[0] ? 0 : DVP_FLAG_DROPPED; + + if (m_codecControlFlags & DVD_CODEC_CTRL_DROP) +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +index d66378fa07..9586d211e9 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +@@ -792,12 +792,12 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecFFmpeg::GetPicture(VideoPicture* pVideoPi + } + m_dropCtrl.Process(framePTS, m_pCodecContext->skip_frame > AVDISCARD_DEFAULT); + +- if (m_pDecodedFrame->key_frame) ++ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_KEY) + { + m_started = true; + m_iLastKeyframe = m_pCodecContext->has_b_frames + 2; + } +- if (m_pDecodedFrame->interlaced_frame) ++ if (m_pDecodedFrame->flags & AV_FRAME_FLAG_INTERLACED) + m_interlaced = true; + else + m_interlaced = false; +@@ -1013,8 +1013,9 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(VideoPicture* pVideoPicture) + + pVideoPicture->iRepeatPicture = 0.5 * m_pFrame->repeat_pict; + pVideoPicture->iFlags = 0; +- pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0; +- pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST: 0; ++ pVideoPicture->iFlags |= m_pFrame->flags & AV_FRAME_FLAG_INTERLACED ? DVP_FLAG_INTERLACED : 0; ++ pVideoPicture->iFlags |= ++ m_pFrame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST ? DVP_FLAG_TOP_FIELD_FIRST : 0; + + if (m_codecControlFlags & DVD_CODEC_CTRL_DROP) + { +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp +index fb7606e0d0..a62fa6273d 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp +@@ -3068,8 +3068,10 @@ bool CFFmpegPostproc::AddPicture(CVaapiDecodedPicture &inPic) + m_pFilterFrameIn->height = m_config.vidHeight; + m_pFilterFrameIn->linesize[0] = image.pitches[0]; + m_pFilterFrameIn->linesize[1] = image.pitches[1]; +- m_pFilterFrameIn->interlaced_frame = (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED) ? 1 : 0; +- m_pFilterFrameIn->top_field_first = (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST) ? 1 : 0; ++ if (inPic.DVDPic.iFlags & DVP_FLAG_INTERLACED) ++ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_INTERLACED; ++ if (inPic.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST) ++ m_pFilterFrameIn->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + + if (inPic.DVDPic.pts == DVD_NOPTS_VALUE) + m_pFilterFrameIn->pts = AV_NOPTS_VALUE; +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp +index 1f71f643d2..567d63559d 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp +@@ -196,7 +196,7 @@ CDVDVideoCodec::VCReturn CDecoder::Decode(AVCodecContext* avctx, AVFrame* frame) + + if(frame) + { +- if (frame->interlaced_frame) ++ if (frame->flags & AV_FRAME_FLAG_INTERLACED) + return CDVDVideoCodec::VC_FATAL; + + if (m_renderBuffer) +-- +2.47.3 + diff --git a/package/kodi/0009-Remove-deprecated-use-of-avcodec_close.patch b/package/kodi/0009-Remove-deprecated-use-of-avcodec_close.patch new file mode 100644 index 0000000000..97b957c001 --- /dev/null +++ b/package/kodi/0009-Remove-deprecated-use-of-avcodec_close.patch @@ -0,0 +1,30 @@ +From 31bcf3a0c4b041ca04f710c5cf731b2ab8fe3ae0 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Thu, 11 Apr 2024 17:14:48 +0200 +Subject: [PATCH] Remove deprecated use of avcodec_close + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp +index 0cdf8c3864..477a2e82ec 100644 +--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp ++++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp +@@ -188,7 +188,6 @@ bool CDVDDemuxClient::ParsePacket(DemuxPacket* pkt) + if (!avcodec_open2(stream->m_context, stream->m_context->codec, nullptr)) + { + avcodec_send_packet(stream->m_context, avpkt); +- avcodec_close(stream->m_context); + } + } + av_packet_free(&avpkt); +-- +2.47.3 + diff --git a/package/kodi/0010-Remove-deprecated-use-av_stream_get_side_data.patch b/package/kodi/0010-Remove-deprecated-use-av_stream_get_side_data.patch new file mode 100644 index 0000000000..ce8a37e200 --- /dev/null +++ b/package/kodi/0010-Remove-deprecated-use-av_stream_get_side_data.patch @@ -0,0 +1,113 @@ +From c1ef1c6851c01f8435b66eb7b605feae83089f28 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Thu, 11 Apr 2024 17:15:16 +0200 +Subject: [PATCH] Remove deprecated use av_stream_get_side_data + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + .../DVDDemuxers/DVDDemuxFFmpeg.cpp | 53 +++++++++++-------- + 1 file changed, 32 insertions(+), 21 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +index 174df53f16..f917bf719f 100644 +--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -1630,42 +1630,49 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) + st->colorRange = pStream->codecpar->color_range; + st->hdr_type = DetermineHdrType(pStream); + +- // https://github.com/FFmpeg/FFmpeg/blob/release/5.0/doc/APIchanges +- size_t size = 0; +- uint8_t* side_data = nullptr; ++ // https://github.com/FFmpeg/FFmpeg/blob/release/7.0/doc/APIchanges ++ const AVPacketSideData* sideData = nullptr; + + if (st->hdr_type == StreamHdrType::HDR_TYPE_DOLBYVISION) + { +- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, &size); +- if (side_data && size) ++ ++ sideData = ++ av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, AV_PKT_DATA_DOVI_CONF); ++ if (sideData && sideData->size) + { +- st->dovi = *reinterpret_cast(side_data); ++ st->dovi = *reinterpret_cast(sideData->data); + } + } + +- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, &size); +- if (side_data && size) ++ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA); ++ if (sideData && sideData->size) + { + st->masteringMetaData = std::make_shared( +- *reinterpret_cast(side_data)); ++ *reinterpret_cast(sideData->data)); + } + +- side_data = av_stream_get_side_data(pStream, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, &size); +- if (side_data && size) ++ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_CONTENT_LIGHT_LEVEL); ++ if (sideData && sideData->size) + { + st->contentLightMetaData = std::make_shared( +- *reinterpret_cast(side_data)); ++ *reinterpret_cast(sideData->data)); + } + +- uint8_t* displayMatrixSideData = +- av_stream_get_side_data(pStream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); +- if (displayMatrixSideData) ++ sideData = av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_DISPLAYMATRIX); ++ if (sideData) + { +- const double tetha = +- av_display_rotation_get(reinterpret_cast(displayMatrixSideData)); +- if (!std::isnan(tetha)) ++ const double theta = ++ av_display_rotation_get(reinterpret_cast(sideData->data)); ++ if (!std::isnan(theta)) + { +- st->iOrientation = ((static_cast(-tetha) % 360) + 360) % 360; ++ st->iOrientation = ((static_cast(-theta) % 360) + 360) % 360; + } + } + +@@ -2488,7 +2495,9 @@ StreamHdrType CDVDDemuxFFmpeg::DetermineHdrType(AVStream* pStream) + { + StreamHdrType hdrType = StreamHdrType::HDR_TYPE_NONE; + +- if (av_stream_get_side_data(pStream, AV_PKT_DATA_DOVI_CONF, nullptr)) // DoVi ++ if (av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_DOVI_CONF)) // DoVi + hdrType = StreamHdrType::HDR_TYPE_DOLBYVISION; + else if (pStream->codecpar->color_trc == AVCOL_TRC_SMPTE2084) // HDR10 + hdrType = StreamHdrType::HDR_TYPE_HDR10; +@@ -2496,7 +2505,9 @@ StreamHdrType CDVDDemuxFFmpeg::DetermineHdrType(AVStream* pStream) + hdrType = StreamHdrType::HDR_TYPE_HLG; + // file could be SMPTE2086 which FFmpeg currently returns as unknown + // so use the presence of static metadata to detect it +- else if (av_stream_get_side_data(pStream, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, nullptr)) ++ else if (av_packet_side_data_get(pStream->codecpar->coded_side_data, ++ pStream->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_MASTERING_DISPLAY_METADATA)) + hdrType = StreamHdrType::HDR_TYPE_HDR10; + + return hdrType; +-- +2.47.3 + diff --git a/package/kodi/0011-Remove-CrystalHD-hw-acceleration-strings.patch b/package/kodi/0011-Remove-CrystalHD-hw-acceleration-strings.patch new file mode 100644 index 0000000000..583bd1dbd5 --- /dev/null +++ b/package/kodi/0011-Remove-CrystalHD-hw-acceleration-strings.patch @@ -0,0 +1,47 @@ +From a186fedb05fa90ffa2c0a97115f756a213631575 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Thu, 11 Apr 2024 17:15:43 +0200 +Subject: [PATCH] Remove CrystalHD hw acceleration strings + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + addons/resource.language.en_gb/resources/strings.po | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po +index 98eb7f64b7..b9a680fd93 100644 +--- a/addons/resource.language.en_gb/resources/strings.po ++++ b/addons/resource.language.en_gb/resources/strings.po +@@ -7359,10 +7359,7 @@ msgctxt "#13427" + msgid "Allow hardware acceleration - DXVA2" + msgstr "" + +-#: system/settings/settings.xml +-msgctxt "#13428" +-msgid "Allow hardware acceleration - CrystalHD" +-msgstr "" ++#empty string with id 13428 + + #: system/settings/settings.xml + msgctxt "#13429" +@@ -19518,11 +19515,7 @@ msgctxt "#36158" + msgid "Enable DXVA2 hardware decoding of video files." + msgstr "" + +-#. Description of setting with label #13428 "Allow hardware acceleration (CrystalHD)" +-#: system/settings/settings.xml +-msgctxt "#36159" +-msgid "Enable CrystalHD decoding of video files." +-msgstr "" ++#empty string with id 36159 + + #. Description of setting with label #13429 "Allow hardware acceleration (VDADecoder)" + #: system/settings/settings.xml +-- +2.47.3 + diff --git a/package/kodi/0012-Remove-VideoPlayerignoredtsinwav-advanced-setting.patch b/package/kodi/0012-Remove-VideoPlayerignoredtsinwav-advanced-setting.patch new file mode 100644 index 0000000000..9dec6ae8cf --- /dev/null +++ b/package/kodi/0012-Remove-VideoPlayerignoredtsinwav-advanced-setting.patch @@ -0,0 +1,51 @@ +From 463dd7fdc97fdfbe93b1145b6fd8e5bfaceaaa0c Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Sat, 13 Apr 2024 10:31:36 +0200 +Subject: [PATCH] Remove VideoPlayerignoredtsinwav advanced setting + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + xbmc/settings/AdvancedSettings.cpp | 2 -- + xbmc/settings/AdvancedSettings.h | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index cc06244799..4e2d6badd6 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -129,7 +129,6 @@ void CAdvancedSettings::Initialize() + return; + + m_audioApplyDrc = -1.0f; +- m_VideoPlayerIgnoreDTSinWAV = false; + + //default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted + m_limiterHold = 0.025f; +@@ -579,7 +578,6 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) + GetCustomRegexps(pAudioExcludes, m_audioExcludeFromScanRegExps); + + XMLUtils::GetFloat(pElement, "applydrc", m_audioApplyDrc); +- XMLUtils::GetBoolean(pElement, "VideoPlayerignoredtsinwav", m_VideoPlayerIgnoreDTSinWAV); + + XMLUtils::GetFloat(pElement, "limiterhold", m_limiterHold, 0.0f, 100.0f); + XMLUtils::GetFloat(pElement, "limiterrelease", m_limiterRelease, 0.001f, 100.0f); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index 5abbed2486..a0bc209dce 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -121,7 +121,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler + + std::string m_audioDefaultPlayer; + float m_audioPlayCountMinimumPercent; +- bool m_VideoPlayerIgnoreDTSinWAV; + float m_limiterHold; + float m_limiterRelease; + +-- +2.47.3 + diff --git a/package/kodi/0013-Use-new-audio-DTS-and-ATMOS-profiles.patch b/package/kodi/0013-Use-new-audio-DTS-and-ATMOS-profiles.patch new file mode 100644 index 0000000000..be3abbed20 --- /dev/null +++ b/package/kodi/0013-Use-new-audio-DTS-and-ATMOS-profiles.patch @@ -0,0 +1,98 @@ +From a088ac3ab28e55a5fa7f3de13ab9c59cbb1f9601 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Sat, 13 Apr 2024 13:07:58 +0200 +Subject: [PATCH] Use new audio DTS and ATMOS profiles + +Upstream: https://github.com/xbmc/xbmc/pull/24972#event-12966390666 + +Patch was cherry-picked from upstream tree: +https://github.com/xbmc/xbmc/commits/0e935f9edb30fd905f14230af653930b5fe139e8/ + +Signed-off-by: Bernd Kuhls +--- + .../VideoPlayer/DVDDemuxers/DVDDemux.cpp | 20 +++++++++++++------ + .../DVDInputStreams/InputStreamAddon.cpp | 9 +++------ + 2 files changed, 17 insertions(+), 12 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp +index 63fb9264a8..22fe7ba751 100644 +--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp ++++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp +@@ -15,15 +15,15 @@ std::string CDemuxStreamAudio::GetStreamType() + std::string strInfo; + switch (codec) + { +- //! @todo: With ffmpeg >= 6.1 add new AC4 codec + case AV_CODEC_ID_AC3: + strInfo = "AC3 "; + break; ++ case AV_CODEC_ID_AC4: ++ strInfo = "AC4 "; ++ break; + case AV_CODEC_ID_EAC3: + { +- //! @todo: With ffmpeg >= 6.1 add new atmos profile case +- // "JOC" its EAC3 Atmos underlying profile, there is no standard codec name string +- if (StringUtils::Contains(codecName, "JOC")) ++ if (profile == FF_PROFILE_EAC3_DDP_ATMOS) + strInfo = "DD+ ATMOS "; + else + strInfo = "DD+ "; +@@ -31,7 +31,6 @@ std::string CDemuxStreamAudio::GetStreamType() + } + case AV_CODEC_ID_DTS: + { +- //! @todo: With ffmpeg >= 6.1 add new DTSX profile cases + switch (profile) + { + case FF_PROFILE_DTS_96_24: +@@ -49,6 +48,12 @@ std::string CDemuxStreamAudio::GetStreamType() + case FF_PROFILE_DTS_HD_HRA: + strInfo = "DTS-HD HRA "; + break; ++ case FF_PROFILE_DTS_HD_MA_X: ++ strInfo = "DTS-HD MA X "; ++ break; ++ case FF_PROFILE_DTS_HD_MA_X_IMAX: ++ strInfo = "DTS-HD MA X (IMAX) "; ++ break; + default: + strInfo = "DTS "; + break; +@@ -62,7 +67,10 @@ std::string CDemuxStreamAudio::GetStreamType() + strInfo = "MP3 "; + break; + case AV_CODEC_ID_TRUEHD: +- strInfo = "TrueHD "; ++ if (profile == FF_PROFILE_TRUEHD_ATMOS) ++ strInfo = "TrueHD ATMOS "; ++ else ++ strInfo = "TrueHD "; + break; + case AV_CODEC_ID_AAC: + { +diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp +index daf66ce0cd..902f38ade2 100644 +--- a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp ++++ b/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp +@@ -762,14 +762,11 @@ int CInputStreamAddon::ConvertAudioCodecProfile(STREAMCODEC_PROFILE profile) + case DTSCodecProfileHDExpress: + return FF_PROFILE_DTS_EXPRESS; + case DTSCodecProfileHDMAX: +- //! @todo: with ffmpeg >= 6.1 set the appropriate profile +- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X ++ return FF_PROFILE_DTS_HD_MA_X; + case DTSCodecProfileHDMAIMAX: +- //! @todo: with ffmpeg >= 6.1 set the appropriate profile +- return FF_PROFILE_UNKNOWN; // FF_PROFILE_DTS_HD_MA_X_IMAX ++ return FF_PROFILE_DTS_HD_MA_X_IMAX; + case DDPlusCodecProfileAtmos: +- //! @todo: with ffmpeg >= 6.1 set the appropriate profile +- return FF_PROFILE_UNKNOWN; // FF_PROFILE_EAC3_DDP_ATMOS ++ return FF_PROFILE_EAC3_DDP_ATMOS; + default: + return FF_PROFILE_UNKNOWN; + } +-- +2.47.3 + -- 2.47.3 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot