Merge pull request #11147 from HiassofT/le13-rpi-kodi-ffmpeg-8.1

RPi: update kodi patches, add deinterlacing fix from jc

Author: heitbaum

projects/RPi/patches/kodi/0001-gbm-Set-max-bpc-for-high-bit-depth-videos.patch

@@ -1,7 +1,7 @@
-From 760f78e30e0f3fc22c0cc6acc67e6559ad6cf438 Mon Sep 17 00:00:00 2001
+From 696d8cc63dcce8ca2bda2cc4cc1354ae9aa900d5 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Fri, 3 Dec 2021 16:00:50 +0000
-Subject: [PATCH 1/2] gbm: Set max bpc for high bit depth videos
+Subject: [PATCH 1/3] gbm: Set max bpc for high bit depth videos
 
 ---
  .../HwDecRender/VideoLayerBridgeDRMPRIME.cpp      | 15 +++++++++++++++

projects/RPi/patches/kodi/0002-DVDVideoCodecDRMPRIME-add-support-for-filters.patch

@@ -1,7 +1,7 @@
-From 7fe467bbbc02f410dcd42314ab79a05ff525e212 Mon Sep 17 00:00:00 2001
+From 1e7176d19e4c10a4de7e45b9d762a3bc97907ff1 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 20 Oct 2019 17:10:07 +0000
-Subject: [PATCH 2/2] DVDVideoCodecDRMPRIME: add support for filters
+Subject: [PATCH 2/3] DVDVideoCodecDRMPRIME: add support for filters
 
 DRMPRIME deinterlace filter
 
@@ -80,10 +80,10 @@ so allow user to choose appropriate setting.
  5 files changed, 507 insertions(+), 39 deletions(-)
 
 diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
-index 587bb7d6f2d4..9953521a20c9 100644
+index a7f9fa70214c..40e264ed5199 100644
 --- a/addons/resource.language.en_gb/resources/strings.po
 +++ b/addons/resource.language.en_gb/resources/strings.po
-@@ -7551,6 +7551,11 @@ msgctxt "#13438"
+@@ -7547,6 +7547,11 @@ msgctxt "#13438"
  msgid "Allow hardware acceleration with DRM PRIME"
  msgstr ""
 
@@ -95,7 +95,7 @@ index 587bb7d6f2d4..9953521a20c9 100644
  #: system/settings/settings.xml
  msgctxt "#13439"
  msgid "Allow hardware acceleration - MediaCodec"
-@@ -20029,6 +20034,12 @@ msgctxt "#36172"
+@@ -19991,6 +19996,12 @@ msgctxt "#36172"
  msgid "Enable PRIME decoding of video files"
  msgstr ""
 
@@ -132,7 +132,7 @@ index 6c2db262e13b..ebc355e69696 100644
            <requirement>HAS_GLES</requirement>
            <visible>false</visible>
 diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
-index 07c505213691..c6cd64922c39 100644
+index 51e77faf1929..b60b9bd0c706 100644
 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
 +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
 @@ -28,6 +28,8 @@
@@ -241,7 +241,7 @@ index 07c505213691..c6cd64922c39 100644
 
      buffer->Export(frame, width, height);
      buffer->SyncStart();
-@@ -369,6 +380,10 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDStreamInfo& hints, CDVDCodecOptions& optio
+@@ -368,6 +379,10 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDStreamInfo& hints, CDVDCodecOptions& optio
    for (auto&& option : options.m_keys)
      av_opt_set(m_pCodecContext, option.m_name.c_str(), option.m_value.c_str(), 0);
 
@@ -252,7 +252,7 @@ index 07c505213691..c6cd64922c39 100644
    if (avcodec_open2(m_pCodecContext, pCodec, nullptr) < 0)
    {
      CLog::Log(LOGINFO, "CDVDVideoCodecDRMPRIME::{} - unable to open codec", __FUNCTION__);
-@@ -381,9 +396,12 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDStreamInfo& hints, CDVDCodecOptions& optio
+@@ -380,9 +395,12 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDStreamInfo& hints, CDVDCodecOptions& optio
    }
 
    UpdateProcessInfo(m_pCodecContext, m_pCodecContext->pix_fmt);
@@ -265,7 +265,7 @@ index 07c505213691..c6cd64922c39 100644
    return true;
  }
 
-@@ -458,6 +476,8 @@ void CDVDVideoCodecDRMPRIME::Reset()
+@@ -457,6 +475,8 @@ void CDVDVideoCodecDRMPRIME::Reset()
      return;
 
    Drain();
@@ -274,7 +274,7 @@ index 07c505213691..c6cd64922c39 100644
 
    do
    {
-@@ -505,7 +525,7 @@ void CDVDVideoCodecDRMPRIME::Drain()
+@@ -504,7 +524,7 @@ void CDVDVideoCodecDRMPRIME::Drain()
    av_packet_free(&avpkt);
  }
 
@@ -283,7 +283,7 @@ index 07c505213691..c6cd64922c39 100644
  {
    pVideoPicture->iWidth = m_pFrame->width;
    pVideoPicture->iHeight = m_pFrame->height;
-@@ -601,6 +621,370 @@ void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture)
+@@ -600,6 +620,370 @@ void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture)
                             ? DVD_NOPTS_VALUE
                             : static_cast<double>(pts) * DVD_TIME_BASE / AV_TIME_BASE;
    pVideoPicture->dts = DVD_NOPTS_VALUE;
@@ -654,7 +654,7 @@ index 07c505213691..c6cd64922c39 100644
  }
 
  CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideoPicture)
-@@ -608,6 +992,21 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo
+@@ -607,6 +991,21 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo
    if (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN)
      Drain();
 
@@ -676,7 +676,7 @@ index 07c505213691..c6cd64922c39 100644
    int ret = avcodec_receive_frame(m_pCodecContext, m_pFrame);
    if (ret == AVERROR(EAGAIN))
      return VC_BUFFER;
-@@ -630,41 +1029,65 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo
+@@ -629,41 +1028,65 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo
      return VC_ERROR;
    }
 
@@ -819,7 +819,7 @@ index db49d165e7ba..64c6c029f3d4 100644
 +  AVBufferRef *m_hw_frames_ref = nullptr;
  };
 diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
-index f70a19900c4b..3c2bbeadcf3e 100644
+index 0bb0711d2670..6c729682fbf5 100644
 --- a/xbmc/settings/Settings.h
 +++ b/xbmc/settings/Settings.h
 @@ -123,6 +123,7 @@ public:

projects/RPi/patches/kodi/0003-fixup-WIP-DRMPRIME-deinterlace-filter.patch

@@ -0,0 +1,30 @@
+From 79d2085a930f98a4b0916e813f82b82a9ab63e86 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Wed, 1 Apr 2026 20:35:17 +0200
+Subject: [PATCH 3/3] fixup WIP: DRMPRIME deinterlace filter
+
+patch from jc
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp     | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
+index b60b9bd0c706..c5fd49048a7c 100644
+--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
+@@ -773,6 +773,10 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, AVPixelForma
+         av_buffer_unref(&m_hw_device_ref);
+         return false;
+     }
++    AVHWFramesContext *const fctx = (AVHWFramesContext *)m_hw_frames_ref->data;
++    fctx->format = AV_PIX_FMT_DRM_PRIME;
++    fctx->sw_format = AV_PIX_FMT_NV12;
++
+     par->hw_frames_ctx = av_buffer_ref(m_hw_frames_ref);
+   }
+ 
+-- 
+2.47.3
+