mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
RPi: update kodi deinterlace patches
sync with latest version from popcornmix, mark callback as threadsafe to get rid of ffmpeg warning Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
parent
ef9341118b
commit
5225072715
@ -1,4 +1,4 @@
|
||||
From 886f9ddb2fbdf8e4528d7c6b6513a9f762f0b109 Mon Sep 17 00:00:00 2001
|
||||
From 97d39a46091b65e4355ce7e545bdec46ff2f87de Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sat, 11 Sep 2021 14:03:05 +0100
|
||||
Subject: [PATCH 1/4] CDVDVideoCodecDRMPRIME: Also support YUV420 buffers
|
||||
@ -50,5 +50,5 @@ index 20a5c24f53..a36107c515 100644
|
||||
if (ret < 0)
|
||||
{
|
||||
--
|
||||
2.34.1
|
||||
2.39.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 55303f4a214d80af24d75a93f102edbe02000423 Mon Sep 17 00:00:00 2001
|
||||
From 42b30508bfe5451d4dc2884acfde9e0ec2d58c92 Mon Sep 17 00:00:00 2001
|
||||
From: Dom Cobley <popcornmix@gmail.com>
|
||||
Date: Fri, 3 Dec 2021 16:00:50 +0000
|
||||
Subject: [PATCH 2/4] gbm: Set max bpc for high bit depth videos
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 2/4] gbm: Set max bpc for high bit depth videos
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
index b91a1705ac..726a5b79b7 100644
|
||||
index 4b8ee5afbb..bd6623e8d1 100644
|
||||
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
@@ -34,6 +34,14 @@ void CVideoLayerBridgeDRMPRIME::Disable()
|
||||
@ -42,5 +42,5 @@ index b91a1705ac..726a5b79b7 100644
|
||||
|
||||
void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, const CRect& destRect)
|
||||
--
|
||||
2.34.1
|
||||
2.39.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e93a6bc009e660db2746b529149bac8d2e3ae122 Mon Sep 17 00:00:00 2001
|
||||
From 0b9b204c6560f3aff39697f92616b48102840dfe Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Rusak <lorusak@gmail.com>
|
||||
Date: Mon, 29 Apr 2019 18:48:45 -0700
|
||||
Subject: [PATCH 3/4] CVideoLayerBridgeDRMPRIME add colourspace connector
|
||||
@ -46,7 +46,7 @@ index e77f75b58b..4de9732308 100644
|
||||
std::string GetColorRange(const VideoPicture& picture);
|
||||
uint8_t GetEOTF(const VideoPicture& picture);
|
||||
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
index 726a5b79b7..09701cdbaa 100644
|
||||
index bd6623e8d1..a1342595c6 100644
|
||||
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
|
||||
@@ -42,6 +42,16 @@ void CVideoLayerBridgeDRMPRIME::Disable()
|
||||
@ -83,5 +83,5 @@ index 726a5b79b7..09701cdbaa 100644
|
||||
|
||||
void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, const CRect& destRect)
|
||||
--
|
||||
2.34.1
|
||||
2.39.0
|
||||
|
||||
|
@ -1,19 +1,26 @@
|
||||
From 8d00033fc98dd0c2570b6b933b4313e7b238b6d0 Mon Sep 17 00:00:00 2001
|
||||
From 518d8487d090af854fb72a7d0e5efc075d97228c Mon Sep 17 00:00:00 2001
|
||||
From: Dom Cobley <popcornmix@gmail.com>
|
||||
Date: Fri, 30 Sep 2022 17:59:55 +0100
|
||||
Subject: [PATCH 4/4] DVDVideoCodecDRMPRIME: use AV_PIX_FMT_DRM_PRIME for
|
||||
frames input to ffmpeg
|
||||
Date: Wed, 18 Jan 2023 16:41:00 +0000
|
||||
Subject: [PATCH 4/4] CDVDVideoCodecDRMPRIME: Adjust av formats to match recent
|
||||
ffmpeg changes
|
||||
|
||||
This is more correct and necessary with more recent trees from jc
|
||||
---
|
||||
.../VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
.../VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
|
||||
index a36107c515..63233cdbdd 100644
|
||||
index a36107c515..d5b3289680 100644
|
||||
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
|
||||
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
|
||||
@@ -660,13 +660,13 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test)
|
||||
@@ -319,6 +319,7 @@ bool CDVDVideoCodecDRMPRIME::Open(CDVDStreamInfo& hints, CDVDCodecOptions& optio
|
||||
m_pCodecContext->bits_per_coded_sample = hints.bitsperpixel;
|
||||
m_pCodecContext->time_base.num = 1;
|
||||
m_pCodecContext->time_base.den = DVD_TIME_BASE;
|
||||
+ m_pCodecContext->thread_safe_callbacks = 1;
|
||||
m_pCodecContext->thread_count = CServiceBroker::GetCPUInfo()->GetCPUCount();
|
||||
|
||||
if (hints.extradata && hints.extrasize > 0)
|
||||
@@ -660,13 +661,13 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test)
|
||||
|
||||
const AVFilter* srcFilter = avfilter_get_by_name("buffer");
|
||||
const AVFilter* outFilter = avfilter_get_by_name("buffersink");
|
||||
@ -29,7 +36,7 @@ index a36107c515..63233cdbdd 100644
|
||||
m_pCodecContext->time_base.num ?
|
||||
m_pCodecContext->time_base.num : 1,
|
||||
m_pCodecContext->time_base.num ?
|
||||
@@ -818,6 +818,7 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::ProcessFilterIn()
|
||||
@@ -818,6 +819,7 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::ProcessFilterIn()
|
||||
m_pFrame->data[0] = reinterpret_cast<uint8_t*>(descriptor);
|
||||
}
|
||||
|
||||
@ -38,5 +45,5 @@ index a36107c515..63233cdbdd 100644
|
||||
if (ret < 0)
|
||||
{
|
||||
--
|
||||
2.34.1
|
||||
2.39.0
|
||||
|
Loading…
x
Reference in New Issue
Block a user