jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Browse Source
This commit is contained in:
Stephan Raue 2011-08-25 01:43:57 +02:00
commit da5be5527b
12 changed files with 216 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-031-disable_overlay_renderer_for_MESA_older_then_7.7.1_on_linux.patch Normal file
View File

@ -0,0 +1,111 @@
diff -Naur xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej
--- xbmc-10.1-Dharma/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp.rej 2011-08-22 05:09:40.801478536 +0200
@@ -0,0 +1,38 @@
+--- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
++++ xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+@@ -20,6 +20,7 @@
+ */
+
+ #include "system.h"
++#include "windowing/WindowingFactory.h"
+ #include "settings/AdvancedSettings.h"
+ #include "settings/GUISettings.h"
+ #include "settings/Settings.h"
+@@ -829,16 +830,17 @@
+
+ if(pSource->format == DVDVideoPicture::FMT_YUV420P)
+ {
+-#ifdef _LINUX
+- // for now use cpu for ssa overlays as it currently allocates and
+- // frees textures for each frame this causes a hugh memory leak
+- // on some mesa intel drivers
+-
+- if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
+- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
+- || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
+- render = OVERLAY_BUF;
+-#endif
++ if(g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER)
++ {
++ // for now use cpu for ssa overlays as it currently allocates and
++ // frees textures for each frame this causes a hugh memory leak
++ // on some mesa intel drivers
++
++ if(m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SPU)
++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_IMAGE)
++ || m_pOverlayContainer->ContainsOverlayType(DVDOVERLAY_TYPE_SSA) )
++ render = OVERLAY_BUF;
++ }
+
+ if(render == OVERLAY_BUF)
+ {
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp
--- xbmc-10.1-Dharma/xbmc/RenderSystem.cpp 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.cpp 2011-08-22 05:10:30.353131282 +0200
@@ -29,6 +29,7 @@
m_RenderVersionMajor = 0;
m_RenderVersionMinor = 0;
m_renderCaps = 0;
+ m_renderQuirks = 0;
m_minDXTPitch = 0;
}
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp
--- xbmc-10.1-Dharma/xbmc/RenderSystemGL.cpp 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200
@@ -65,8 +65,22 @@
}
}
#endif
- if (m_RenderVendor.Equals("Tungsten Graphics, Inc."))
+ if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")
+ || m_RenderVendor.Equals("Tungsten Graphics, Inc"))
{
+ unsigned major, minor, micro;
+ if(sscanf(m_RenderVersion.c_str(), "%*s Mesa %u.%u.%u", &major, &minor, &micro) == 3)
+ {
+
+ if((major < 7)
+ || (major == 7 && minor < 7)
+ || (major == 7 && minor == 7 && micro < 1))
+ m_renderQuirks |= RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER;
+
+ }
+ else
+ CLog::Log(LOGNOTICE, "CRenderSystemGL::CheckOpenGLQuirks - unable to parse mesa version string");
+
if(m_RenderRenderer.Find("Poulsbo") >= 0)
m_renderCaps &= ~RENDER_CAPS_DXT_NPOT;
}
diff -Naur xbmc-10.1-Dharma/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h
--- xbmc-10.1-Dharma/xbmc/RenderSystem.h 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200
@@ -52,6 +52,11 @@
RENDER_CAPS_DXT_NPOT = (1 << 2)
};
+enum
+{
+ RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0,
+};
+
class CRenderSystemBase
{
public:
@@ -94,6 +99,7 @@
bool SupportsNPOT(bool dxt) const;
unsigned int GetMaxTextureSize() const { return m_maxTextureSize; }
unsigned int GetMinDXTPitch() const { return m_minDXTPitch; }
+ unsigned int GetRenderQuirks() const { return m_renderQuirks; }
protected:
bool m_bRenderCreated;
@@ -108,6 +114,7 @@
int m_RenderVersionMinor;
int m_RenderVersionMajor;
unsigned int m_renderCaps;
+ unsigned int m_renderQuirks;
};
#endif // RENDER_SYSTEM_H

89
packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-035-prefer_yv12_output_from_crystalhd_codec_when_running_nouveau_driver.patch Normal file
View File

@ -0,0 +1,89 @@
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
--- xbmc-10.1-Dharma.patch1/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:07:59.915149830 +0200
+++ xbmc-10.1-Dharma.patch2/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-08-22 05:19:43.825427880 +0200
@@ -39,6 +39,7 @@
#include "utils/fastmemcpy.h"
#include "Codecs/DllSwScale.h"
#include "utils/TimeUtils.h"
+#include "xbmc/WindowingFactory.h"
namespace BCM
{
@@ -233,6 +234,7 @@
int m_width;
int m_height;
uint64_t m_timestamp;
+ bool m_output_YV12;
uint64_t m_PictureNumber;
uint8_t m_color_space;
unsigned int m_color_range;
@@ -335,6 +337,12 @@
m_sw_scale_ctx = NULL;
m_dllSwScale = new DllSwScale;
m_dllSwScale->Load();
+
+
+ if (g_Windowing.GetRenderQuirks() & RENDER_QUIRKS_YV12_PREFERED)
+ m_output_YV12 = true;
+ else
+ m_output_YV12 = false;
}
CMPCOutputThread::~CMPCOutputThread()
@@ -773,15 +781,20 @@
if (!pBuffer)
{
// No free pre-allocated buffers so make one
-#ifdef _WIN32
- // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
-#else
- if (m_color_space == BCM::MODE422_YUY2)
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height);
+ if (m_output_YV12)
+ {
+ // output YV12, nouveau driver has slow NV12, YUY2 capability.
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
+ }
+
else
- pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height);
-#endif
+ {
+ if (m_color_space == BCM::MODE422_YUY2)
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUY2, m_width, m_height);
+ else
+ pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height);
+ }
+
CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count());
while (!m_bStop && m_ReadyList.Count() > 10)
Sleep(1);
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp
--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystemGL.cpp 2011-08-22 05:10:58.079496562 +0200
+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystemGL.cpp 2011-08-22 05:20:56.265383606 +0200
@@ -65,6 +65,9 @@
}
}
#endif
+ if (m_RenderVendor.ToLower() == "nouveau")
+ m_renderQuirks |= RENDER_QUIRKS_YV12_PREFERED;
+
if (m_RenderVendor.Equals("Tungsten Graphics, Inc.")
|| m_RenderVendor.Equals("Tungsten Graphics, Inc"))
{
diff -Naur xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h
--- xbmc-10.1-Dharma.patch1/xbmc/RenderSystem.h 2011-08-22 05:10:38.495238548 +0200
+++ xbmc-10.1-Dharma.patch2/xbmc/RenderSystem.h 2011-08-22 05:19:43.847428169 +0200
@@ -57,6 +57,11 @@
RENDER_QUIRKS_MAJORMEMLEAK_OVERLAYRENDERER = 1 << 0,
};
+enum
+{
+ RENDER_QUIRKS_YV12_PREFERED = 1 << 1,
+};
+
class CRenderSystemBase
{
public:

12
packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
View File

@ -1,12 +0,0 @@
diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 13:30:12.000000000 +0100
+++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2011-02-15 14:08:59.000292217 +0100
@@ -773,7 +773,7 @@
if (!pBuffer)
{
// No free pre-allocated buffers so make one
-#ifdef _WIN32
+#if 1
// force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
#else

12
packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-03-08 02:49:14.000000000 +0100
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp 2011-08-21 17:13:13.382281536 +0200
@@ -74,7 +74,7 @@
if (!PyArg_ParseTupleAndKeywords(
args,
kwds,
- (char*)"iOO|bl",
+ (char*)"iOO|bi",
(char**)keywords,
&handle,
&pURL,

2
packages/x11/driver/xf86-video-intel/meta
View File

@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
PKG_SITE="http://intellinuxgraphics.org/"
PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="udev"
PKG_BUILD_DEPENDS="toolchain util-macros util-macros fontsproto udev xorg-server"
PKG_BUILD_DEPENDS="toolchain util-macros fontsproto udev xorg-server"
PKG_PRIORITY="optional"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips"

3
projects/ATV/options
View File

@ -183,9 +183,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nouveau"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no"

5
projects/Fusion/options
View File

@ -75,7 +75,7 @@
OPTIMIZATIONS="speed"
# Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3"
PROJECT_CFLAGS="-mfpmath=sse -msse2" # -mssse3 removed for Llano compatibility
# LTO (Link Time Optimazion) support
LTO_SUPPORT="no"
@ -183,9 +183,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
GRAPHIC_DRIVERS="fglrx"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no"

5
projects/Generic/options
View File

@ -183,10 +183,7 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware"
# Use VDPAU video# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# acceleration (needs nVidia driver and a supported card)
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes"
# Use VAAPI video acceleration (needs intel i965 driver and a supported card)

3
projects/ION/options
View File

@ -183,9 +183,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes"

3
projects/Intel/options
View File

@ -183,9 +183,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="no"

3
projects/Ultra/options
View File

@ -183,9 +183,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes"

2
scripts/image
View File

@ -139,7 +139,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
# Update support
[ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate
# Update support
# Installer support
[ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer
# Devtools... (not for Release)