jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-27 04:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: update FM support patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-11-26 20:37:33 +01:00
parent 37d3bde303
commit 3a0626aad5
1 changed files with 65 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
packages/mediacenter/kodi/patches/kodi-995.01-fernetmenta.patch
View File

@ -1,7 +1,7 @@
From 8a29d2fa2571cadbdccc003d08efa23fcc046f45 Mon Sep 17 00:00:00 2001 From f96268818f3d054afb71d22be580d9cdedd7eb66 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de> From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 12:05:50 +0200 Date: Thu, 11 Oct 2012 12:05:50 +0200
Subject: [PATCH 1/9] vdpau: advanced settings for auto deinterlacing Subject: [PATCH 01/10] vdpau: advanced settings for auto deinterlacing
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++----
@ -10,10 +10,10 @@ Subject: [PATCH 1/9] vdpau: advanced settings for auto deinterlacing
3 files changed, 10 insertions(+), 4 deletions(-) 3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
index 5760fc5..300b901 100644 index 1871eb8..5e18248 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1957,10 +1957,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) @@ -1965,10 +1965,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */)
if (method == VS_INTERLACEMETHOD_AUTO) if (method == VS_INTERLACEMETHOD_AUTO)
{ {
int deint = -1; int deint = -1;
@ -29,7 +29,7 @@ index 5760fc5..300b901 100644
if (deint != -1) if (deint != -1)
{ {
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index f4c309b..04ef53a 100644 index e6d58b3..1f92402 100644
--- a/xbmc/settings/AdvancedSettings.cpp --- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp
@@ -157,6 +157,8 @@ void CAdvancedSettings::Initialize() @@ -157,6 +157,8 @@ void CAdvancedSettings::Initialize()
@ -40,8 +40,8 @@ index f4c309b..04ef53a 100644
+ m_videoVDPAUdeintSD = -1; + m_videoVDPAUdeintSD = -1;
m_videoVDPAUtelecine = false; m_videoVDPAUtelecine = false;
m_videoVDPAUdeintSkipChromaHD = false; m_videoVDPAUdeintSkipChromaHD = false;
m_DXVACheckCompatibility = false; m_useFfmpegVda = false;
@@ -588,6 +590,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) @@ -589,6 +591,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f);
XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
@ -49,9 +49,9 @@ index f4c309b..04ef53a 100644
+ XMLUtils::GetInt(pElement,"vdpauSDdeint",m_videoVDPAUdeintSD); + XMLUtils::GetInt(pElement,"vdpauSDdeint",m_videoVDPAUdeintSD);
XMLUtils::GetBoolean(pElement,"vdpauInvTelecine",m_videoVDPAUtelecine); XMLUtils::GetBoolean(pElement,"vdpauInvTelecine",m_videoVDPAUtelecine);
XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD);
XMLUtils::GetBoolean(pElement,"useffmpegvda", m_useFfmpegVda);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 7df586e..eccd25c 100644 index fb5a837..9b805a0 100644
--- a/xbmc/settings/AdvancedSettings.h --- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h
@@ -162,6 +162,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -162,6 +162,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
@ -64,10 +64,10 @@ index 7df586e..eccd25c 100644
bool m_videoVDPAUdeintSkipChromaHD; bool m_videoVDPAUdeintSkipChromaHD;
bool m_musicUseTimeSeeking; bool m_musicUseTimeSeeking;
From 7f086396571f870f80c15b67700e9ab81c1d3933 Mon Sep 17 00:00:00 2001 From aecf2bd32b23a933d65eff1e32a295fdadaf8867 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de> From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 25 Jul 2013 17:18:13 +0200 Date: Thu, 25 Jul 2013 17:18:13 +0200
Subject: [PATCH 2/9] ActiveAE: slightly reduce buffer size Subject: [PATCH 02/10] ActiveAE: slightly reduce buffer size
--- ---
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++--
@ -89,32 +89,32 @@ index 6e9900f..17b6c01 100644
void CEngineStats::Reset(unsigned int sampleRate) void CEngineStats::Reset(unsigned int sampleRate)
From 839d6295e3158562a56b21d438e9b48f3a7ee2a0 Mon Sep 17 00:00:00 2001 From 817f21c47b7c000b6a49596b862adfa6de4feec7 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de> From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 4 Oct 2014 21:25:31 +0200 Date: Sat, 4 Oct 2014 21:25:31 +0200
Subject: [PATCH 4/9] vaapi: lock gfx context on pre-cleanup Subject: [PATCH 04/10] vaapi: lock gfx context on pre-cleanup
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
index a5e560a..823f613 100644 index ed7bd74..9c1dd84 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
@@ -618,6 +618,7 @@ long CDecoder::Release() @@ -628,6 +628,7 @@ long CDecoder::Release()
CSingleLock lock(m_DecoderSection); if (g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG,"VAAPI::Release pre-cleanup"); CLog::Log(LOGDEBUG,"VAAPI::Release pre-cleanup");
+ CSingleLock lock1(g_graphicsContext); + CSingleLock lock1(g_graphicsContext);
Message *reply; Message *reply;
if (m_vaapiOutput.m_controlPort.SendOutMessageSync(COutputControlProtocol::PRECLEANUP, if (m_vaapiOutput.m_controlPort.SendOutMessageSync(COutputControlProtocol::PRECLEANUP,
&reply, &reply,
From e1d83be487296f0e05e256c8efdbf7d7c8233a1e Mon Sep 17 00:00:00 2001 From d0fa19a4c6ce0967d4bfdab9836696b379895064 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org> From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 19 Oct 2014 21:34:47 +0300 Date: Sun, 19 Oct 2014 21:34:47 +0300
Subject: [PATCH 5/9] [linux] Add FDEventMonitor for monitoring file Subject: [PATCH 05/10] [linux] Add FDEventMonitor for monitoring file
descriptors descriptors
Add FDEventMonitor helper thread for monitoring file descriptors for Add FDEventMonitor helper thread for monitoring file descriptors for
@ -494,10 +494,10 @@ index c147d8f..744fd06 100644
SRCS += LinuxTimezone.cpp SRCS += LinuxTimezone.cpp
SRCS += PosixMountProvider.cpp SRCS += PosixMountProvider.cpp
From 1cee1d708009ba18c3588c2d6e16d9e5f00a0e60 Mon Sep 17 00:00:00 2001 From 9fe447e12d86fbd75995d8c0f0fa6d89786c6983 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org> From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 19 Oct 2014 21:36:44 +0300 Date: Sun, 19 Oct 2014 21:36:44 +0300
Subject: [PATCH 6/9] [AE] ALSA: Add ALSADeviceMonitor for monitoring card Subject: [PATCH 06/10] [AE] ALSA: Add ALSADeviceMonitor for monitoring card
removals/additions removals/additions
--- ---
@ -774,10 +774,10 @@ index 0000000..f9e2f26
+#endif +#endif
+ +
From 30a90fe4c23b37c7025a75f374444141d8f13fec Mon Sep 17 00:00:00 2001 From 750969d09c060e59957d7aa6a582c0406a24cf21 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org> From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 19 Oct 2014 21:37:49 +0300 Date: Sun, 19 Oct 2014 21:37:49 +0300
Subject: [PATCH 7/9] [AE] ALSA: Add ALSADeviceMonitor for monitoring ELD Subject: [PATCH 07/10] [AE] ALSA: Add ALSADeviceMonitor for monitoring ELD
changes changes
ELD changes can happen e.g. when the connected HDMI sink is changed. ELD changes can happen e.g. when the connected HDMI sink is changed.
@ -1118,10 +1118,10 @@ index 0000000..56dfd50
+#endif +#endif
+ +
From b973fa859970c7066f774fed2b1836773ef5c85d Mon Sep 17 00:00:00 2001 From b1c67c1a6448d05bb3393eeccb857a3ec71625b5 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org> From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 2 Nov 2014 21:10:51 +0200 Date: Sun, 2 Nov 2014 21:10:51 +0200
Subject: [PATCH 8/9] [AE] ALSA: Add more logging to device change triggers Subject: [PATCH 08/10] [AE] ALSA: Add more logging to device change triggers
--- ---
xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp | 13 +++++++++++-- xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp | 13 +++++++++++--
@ -1170,10 +1170,10 @@ index 9b595ee..f9ca9ae 100644
} }
From c7d8a5a7f2f0bec8c17996310087d7f333146cca Mon Sep 17 00:00:00 2001 From e83bc9308cd53fcfcef1053caa99797c8187a9b0 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org> From: Anssi Hannula <anssi@xbmc.org>
Date: Tue, 4 Nov 2014 19:22:03 +0200 Date: Tue, 4 Nov 2014 19:22:03 +0200
Subject: [PATCH 9/9] [AE] ALSA: Fix DeviceChange event triggered by Subject: [PATCH 09/10] [AE] ALSA: Fix DeviceChange event triggered by
enumeration enumeration
All hctl elements get an SND_CTL_EVENT_MASK_REMOVE event when the ctl All hctl elements get an SND_CTL_EVENT_MASK_REMOVE event when the ctl
@ -1220,3 +1220,41 @@ index f9ca9ae..89a7585 100644
CAEFactory::DeviceChange(); CAEFactory::DeviceChange();
} }
From 667a16d052988936935b49a4e8b4458a6a224eb8 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 24 Nov 2014 07:49:12 +0100
Subject: [PATCH 10/10] dvdplayer: demux ffmpeg - fix seeking behind eof
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 4218bfc..4147a57 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -897,6 +897,12 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
CSingleLock lock(m_critSection);
ret = av_seek_frame(m_pFormatContext, -1, seek_pts, backwords ? AVSEEK_FLAG_BACKWARD : 0);
+ // demuxer will return failure, if you seek behind eof
+ if (ret < 0 && m_pFormatContext->duration && seek_pts >= (m_pFormatContext->duration + m_pFormatContext->start_time))
+ ret = 0;
+ else if (ret < 0 && m_pInput->IsEOF())
+ ret = 0;
+
if(ret >= 0)
UpdateCurrentPTS();
}
@@ -910,10 +916,6 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts)
if(startpts)
*startpts = DVD_MSEC_TO_TIME(time);
- // demuxer will return failure, if you seek to eof
- if (m_pInput->IsEOF() && ret <= 0)
- return true;
-
return (ret >= 0);
}