mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
xbmc: update VDPAU/XVBA patch
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
d8875ffd47
commit
1bf3b0be72
@ -1,7 +1,57 @@
|
||||
From df3cd6c904ec4361b1373bddbbe2631ef998fe6a Mon Sep 17 00:00:00 2001
|
||||
From e290bfea81823e0728cbceb4593e8f2122734dfc Mon Sep 17 00:00:00 2001
|
||||
From: wsnipex <wsnipex@a1.net>
|
||||
Date: Sun, 4 Nov 2012 14:05:52 +0100
|
||||
Subject: [PATCH 01/61] configure: add --enable-pvraddons-with-dependencies
|
||||
switch for intree building of PVR Addons
|
||||
|
||||
---
|
||||
configure.in | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 366ff4a..5d514b8 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
|
||||
[use_external_ffmpeg=$use_external_libraries])
|
||||
|
||||
### End of external library options
|
||||
+### PVR addons specific
|
||||
+AC_ARG_ENABLE([pvraddons-with-dependencies],
|
||||
+ [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
|
||||
+ [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
|
||||
+ [use_pvraddons_with_deps=$enableval],
|
||||
+ [use_pvraddons_with_deps=no])
|
||||
+
|
||||
+### End PVR addons specific
|
||||
|
||||
if test "x$host_vendor" != "xapple"; then
|
||||
DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
|
||||
@@ -2770,12 +2778,16 @@ XB_CONFIG_MODULE([pvr-addons], [
|
||||
if test "$USE_EXTERNAL_FFMPEG" = 1; then
|
||||
PVR_EXT_FFMPEG="--enable-external-ffmpeg"
|
||||
fi
|
||||
+ if test "$use_pvraddons_with_deps" = "yes"; then
|
||||
+ ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
|
||||
+ fi
|
||||
./configure \
|
||||
--prefix="${prefix}" \
|
||||
--host=$host_alias \
|
||||
--build=$build_alias \
|
||||
--target=$target_alias \
|
||||
$PVR_EXT_FFMPEG \
|
||||
+ $ADDONS_WITH_DEPS \
|
||||
CC="$CC" \
|
||||
CXX="$CXX" \
|
||||
CFLAGS="$CFLAGS" \
|
||||
--
|
||||
1.7.10
|
||||
|
||||
|
||||
From eac8910d654dcf92e16a2d084487829091911136 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:03:31 +0200
|
||||
Subject: [PATCH 01/59] VideoRenerers: add buffering
|
||||
Subject: [PATCH 02/61] VideoRenerers: add buffering
|
||||
|
||||
---
|
||||
xbmc/Application.cpp | 3 +
|
||||
@ -206,10 +256,10 @@ index acebfe0..9f55fcb 100644
|
||||
virtual bool ValidateRenderTarget();
|
||||
virtual void LoadShaders(int field=FIELD_FULL);
|
||||
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
index c7c4f07..522d38a 100644
|
||||
index cb0939f..2a59e2b 100644
|
||||
--- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
@@ -1973,16 +1973,16 @@ EINTERLACEMETHOD CLinuxRendererGLES::AutoInterlaceMethod()
|
||||
@@ -1982,16 +1982,16 @@ EINTERLACEMETHOD CLinuxRendererGLES::AutoInterlaceMethod()
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBOPENMAX
|
||||
@ -984,10 +1034,10 @@ index 3008c25..a4bb1ba 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From a166218ddbefad44da87931293484ba6397c6200 Mon Sep 17 00:00:00 2001
|
||||
From 9adf24ba51db8f6912a4db16b6ccd5c31e9989db Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 2 Oct 2012 10:49:09 +0200
|
||||
Subject: [PATCH 02/59] linuxrenderer: delete all textures on reconfigure
|
||||
Subject: [PATCH 03/61] linuxrenderer: delete all textures on reconfigure
|
||||
|
||||
---
|
||||
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 2 +-
|
||||
@ -1010,10 +1060,10 @@ index a740954..15e5757 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From bdcf265725076d7c96346dd623a7457b301dc219 Mon Sep 17 00:00:00 2001
|
||||
From 56a30fb469c5f0750caf4373c1d63fd6c8feb40f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:17:33 +0200
|
||||
Subject: [PATCH 03/59] drop frame counter in application, ask render manager
|
||||
Subject: [PATCH 04/61] drop frame counter in application, ask render manager
|
||||
instead
|
||||
|
||||
---
|
||||
@ -1192,10 +1242,10 @@ index 34ff8d0..288175e 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 53e2b5542d96c877fbea00ad3ce8e36ee06d614a Mon Sep 17 00:00:00 2001
|
||||
From 0ff5c38a9d5bfb67df2ac5e0277147828f3ae1e6 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:34:39 +0200
|
||||
Subject: [PATCH 04/59] videoplayer: adopt lateness detection and dropping to
|
||||
Subject: [PATCH 05/61] videoplayer: adopt lateness detection and dropping to
|
||||
buffering
|
||||
|
||||
---
|
||||
@ -1734,10 +1784,10 @@ index fe7e12c..4913712 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From af6b099b555a28ec0dfa03c0fc75a2dad6a7990c Mon Sep 17 00:00:00 2001
|
||||
From 9934cf0a707907dc3a3825250295ee61e98d6bbf Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:41:31 +0200
|
||||
Subject: [PATCH 05/59] videoplayer: update frametime, it might change due to
|
||||
Subject: [PATCH 06/61] videoplayer: update frametime, it might change due to
|
||||
fps detection
|
||||
|
||||
---
|
||||
@ -1761,10 +1811,10 @@ index 93908a7..4675556 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 402da0b70ed0908d94bb1f68045430f6afac5b65 Mon Sep 17 00:00:00 2001
|
||||
From 7f759e5529c069b525beb1e9a1074363efde12b2 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:43:06 +0200
|
||||
Subject: [PATCH 06/59] videoplayer: give streams with invalid fps a chance
|
||||
Subject: [PATCH 07/61] videoplayer: give streams with invalid fps a chance
|
||||
for fps detection
|
||||
|
||||
---
|
||||
@ -1788,10 +1838,10 @@ index 4675556..2ef6358 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 59abe0f9df990a738ea6bdf92da459f75076e313 Mon Sep 17 00:00:00 2001
|
||||
From b3f76275338d14819b8265cce7e3988e04f9d3a0 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 10:49:05 +0200
|
||||
Subject: [PATCH 07/59] dvdplayer: allow rewinding at end of stream, do a seek
|
||||
Subject: [PATCH 08/61] dvdplayer: allow rewinding at end of stream, do a seek
|
||||
after rewind
|
||||
|
||||
---
|
||||
@ -1828,10 +1878,10 @@ index 1dc5812..81ef000 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 7002b6769c9c54968a920ce63223281317006e31 Mon Sep 17 00:00:00 2001
|
||||
From 4073dd2bfdf7c7f0daaa7994f2c3c3d26dec4c7d Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 2 Sep 2012 16:05:21 +0200
|
||||
Subject: [PATCH 08/59] video player: present correct pts to user for a/v sync
|
||||
Subject: [PATCH 09/61] video player: present correct pts to user for a/v sync
|
||||
(after buffering in renderer)
|
||||
|
||||
---
|
||||
@ -1922,10 +1972,10 @@ index 4913712..509d5f7 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From ff0183d62f8092925a707671ca0f8a25bdf65cd0 Mon Sep 17 00:00:00 2001
|
||||
From 815c4535a7ad9f36b3d1c5650f3117b499d64565 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 28 May 2012 11:02:29 +0200
|
||||
Subject: [PATCH 09/59] vaapi: adopt to buffering in renderer
|
||||
Subject: [PATCH 10/61] vaapi: adopt to buffering in renderer
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +-
|
||||
@ -1983,10 +2033,10 @@ index 863edc4..417cbc0 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From b2c4948a5560024bce14682643bf4bbd667a71b5 Mon Sep 17 00:00:00 2001
|
||||
From e519fc6636335b3eea634ed3639725ef2838b4f6 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sat, 7 Apr 2012 09:19:00 +0200
|
||||
Subject: [PATCH 10/59] vdpau: redesign
|
||||
Subject: [PATCH 11/61] vdpau: redesign
|
||||
|
||||
---
|
||||
language/English/strings.po | 12 +-
|
||||
@ -8146,10 +8196,10 @@ index e7af3cb..2dd8a9f 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 48e6cfa678de00c4501eef441f42ceef00a246cf Mon Sep 17 00:00:00 2001
|
||||
From 355f4ecfd1d7004db87e594c156f0c7fd921d2f9 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 25 Sep 2012 12:14:15 +0200
|
||||
Subject: [PATCH 11/59] linuxrenderer: drop method RenderMultiPass
|
||||
Subject: [PATCH 12/61] linuxrenderer: drop method RenderMultiPass
|
||||
|
||||
---
|
||||
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++-------
|
||||
@ -8199,10 +8249,10 @@ index 3218cd5..afc78c2 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 7971d6abe45daf051fbc4782da7b18c36dd7213f Mon Sep 17 00:00:00 2001
|
||||
From b43e57e3b4ed09a678726d2abb1bff917108aa46 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 25 Sep 2012 13:20:47 +0200
|
||||
Subject: [PATCH 12/59] linuxrenderer: implement progressive weave for vdpau
|
||||
Subject: [PATCH 13/61] linuxrenderer: implement progressive weave for vdpau
|
||||
|
||||
---
|
||||
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 ++++++++++++++++++-------
|
||||
@ -8330,10 +8380,10 @@ index afc78c2..2fc34ae 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From b9ffecf89d125a90c3c6a4b252a16e9b16539727 Mon Sep 17 00:00:00 2001
|
||||
From 3d381c122c3264bceda691435841ad0ed094d874 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 15:22:05 +0200
|
||||
Subject: [PATCH 13/59] X11: ditch SDL for video and window events
|
||||
Subject: [PATCH 14/61] X11: ditch SDL for video and window events
|
||||
|
||||
---
|
||||
xbmc/Application.cpp | 2 +-
|
||||
@ -9817,10 +9867,10 @@ index 2dd8a9f..9616d17 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From aa14d6e3051f4f3a6c4cc15120ab7b869051536e Mon Sep 17 00:00:00 2001
|
||||
From 1b7b565946106d36101fb96ea9c08dd9f0d54d3d Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 15:24:22 +0200
|
||||
Subject: [PATCH 14/59] X11: Add xbmc icon
|
||||
Subject: [PATCH 15/61] X11: Add xbmc icon
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 126 ++++++++++++++++++++++++++++++++++-
|
||||
@ -10009,10 +10059,10 @@ index 9616d17..debf714 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From d44e43825001ffe1acc763f67f40b20ebdd2fcf4 Mon Sep 17 00:00:00 2001
|
||||
From fc34826ddd68fceba7cb60067f022f445c124cdc Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 20 May 2012 14:11:26 +0200
|
||||
Subject: [PATCH 15/59] X11: add SDL joystick until we have a better solution
|
||||
Subject: [PATCH 16/61] X11: add SDL joystick until we have a better solution
|
||||
|
||||
---
|
||||
xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++
|
||||
@ -10066,10 +10116,10 @@ index 24477ae..2ec86a8 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 105d66cc876cf61565486022a6af4b55840339f4 Mon Sep 17 00:00:00 2001
|
||||
From ac88f1e038565da9d1b6982f1329c048cac47a65 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@xbmc.org>
|
||||
Date: Thu, 5 Jul 2012 12:35:55 +0200
|
||||
Subject: [PATCH 16/59] X11: factor out code handling device reset
|
||||
Subject: [PATCH 17/61] X11: factor out code handling device reset
|
||||
notification
|
||||
|
||||
---
|
||||
@ -10133,10 +10183,10 @@ index debf714..8c28e3f 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 797f2a8dd63022b49ab664ff711304ba0fa110d9 Mon Sep 17 00:00:00 2001
|
||||
From 3a456ebac31cbaf651bce9a470d8cc48a1ca367c Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 15:02:00 +0200
|
||||
Subject: [PATCH 17/59] X11: move xrandr events to WinEventsX11
|
||||
Subject: [PATCH 18/61] X11: move xrandr events to WinEventsX11
|
||||
|
||||
---
|
||||
xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++
|
||||
@ -10280,10 +10330,10 @@ index 70557d0..1cce843 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 23e75c1c78ea9f3490c7e5323ebe5e9bae9444e1 Mon Sep 17 00:00:00 2001
|
||||
From 950c6eb22a9e77619d7b86a5a6c2d8eec4e1fb80 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 12 Apr 2012 15:43:56 +0200
|
||||
Subject: [PATCH 18/59] xrandr: remove method RestoreState
|
||||
Subject: [PATCH 19/61] xrandr: remove method RestoreState
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++--
|
||||
@ -10362,10 +10412,10 @@ index 2a269d0..5b64633 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 27356f9fb696117bd94c37323cb88a660fcf2557 Mon Sep 17 00:00:00 2001
|
||||
From 33dcb58fb04d32df80bea339d055f4a6f157bb23 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 20 May 2012 13:17:10 +0200
|
||||
Subject: [PATCH 19/59] xrandr: observe orientation
|
||||
Subject: [PATCH 20/61] xrandr: observe orientation
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 61 +++++++++++++++++++++++++++++++++--
|
||||
@ -10534,10 +10584,10 @@ index 5b64633..618bd68 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 6d4e17228197f9da952d52e5bbf794588616f289 Mon Sep 17 00:00:00 2001
|
||||
From 70ebd25e85320ee1483e5609df041b449cb12971 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 11:54:15 +0200
|
||||
Subject: [PATCH 20/59] xrandr: allow getting info for multiple screen's
|
||||
Subject: [PATCH 21/61] xrandr: allow getting info for multiple screen's
|
||||
|
||||
Refactored by: Joakim Plate <elupus@xbmc.org>
|
||||
---
|
||||
@ -10712,10 +10762,10 @@ index 618bd68..0824af5 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From fccb34aaa09cabe38b4dd46b693cfd977254faf6 Mon Sep 17 00:00:00 2001
|
||||
From a0873d8dec66b026473970fe96e5cc62d89b7cc8 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 11:44:00 +0200
|
||||
Subject: [PATCH 21/59] X11: fix multi-head setups
|
||||
Subject: [PATCH 22/61] X11: fix multi-head setups
|
||||
|
||||
---
|
||||
language/English/strings.po | 4 +-
|
||||
@ -11447,10 +11497,10 @@ index 93cf5db..71034fc 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 22cd095ee0b01342d4ae2974fd1b67e89ba10c19 Mon Sep 17 00:00:00 2001
|
||||
From d9ec0cfa1033d27f676e3e8fe5349e1cd4655b91 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 11:36:32 +0200
|
||||
Subject: [PATCH 22/59] X11: remove all DefaultScreen and RootWindow macros
|
||||
Subject: [PATCH 23/61] X11: remove all DefaultScreen and RootWindow macros
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 6 +++---
|
||||
@ -11518,10 +11568,10 @@ index f858f88..d192697 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 277da851992e981ee50e5d4c1ea81063d0ba09a2 Mon Sep 17 00:00:00 2001
|
||||
From d8cfaed88af8cc1f99fc3227ed4cfa243ef7b25c Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 11:45:22 +0200
|
||||
Subject: [PATCH 23/59] X11: remove all DefaultScreen and RootWindow macros
|
||||
Subject: [PATCH 24/61] X11: remove all DefaultScreen and RootWindow macros
|
||||
(VideoRefClock)
|
||||
|
||||
Note this is on a separate display connection.
|
||||
@ -11593,10 +11643,10 @@ index 9785fe7..0004e07 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 0994ac9f61010955f2e0e18208ac2c96565dc5a2 Mon Sep 17 00:00:00 2001
|
||||
From d9c12136f70104c087bee5ca73aadf0c4c21163e Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Wed, 20 Jun 2012 17:37:11 +0200
|
||||
Subject: [PATCH 24/59] X11: recreate gl context after output has changed
|
||||
Subject: [PATCH 25/61] X11: recreate gl context after output has changed
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++----------
|
||||
@ -11747,10 +11797,10 @@ index d192697..0f2d1d2 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From f56417bcd425dd14f9ae3245a3fb759e7ec6534d Mon Sep 17 00:00:00 2001
|
||||
From f9b66d7f62b4173d0eace0de8419ad105276e631 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 12:06:25 +0200
|
||||
Subject: [PATCH 25/59] X11: hook video reference clock in windowing
|
||||
Subject: [PATCH 26/61] X11: hook video reference clock in windowing
|
||||
|
||||
---
|
||||
xbmc/video/VideoReferenceClock.cpp | 71 ++++++++++++++++++++++++++----------
|
||||
@ -11955,10 +12005,10 @@ index dcc4f09..7eb6317 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From cc38a73ecba33cfa8ff933164dbf1c230f2d975d Mon Sep 17 00:00:00 2001
|
||||
From d691026746d3a2319611819f47f68039d75b9ff1 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 21 Jun 2012 17:26:51 +0200
|
||||
Subject: [PATCH 26/59] X11: fix video calibrations
|
||||
Subject: [PATCH 27/61] X11: fix video calibrations
|
||||
|
||||
---
|
||||
xbmc/settings/Settings.cpp | 1 +
|
||||
@ -12063,10 +12113,10 @@ index cc28f56..c046c86 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 682203619db3e1e5381bb52fa74e372641d07430 Mon Sep 17 00:00:00 2001
|
||||
From 20e09b87013ef69dfbfa00c54d326b3075f359b9 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 12:00:26 +0200
|
||||
Subject: [PATCH 27/59] X11: deactivate screen saver on startup
|
||||
Subject: [PATCH 28/61] X11: deactivate screen saver on startup
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++
|
||||
@ -12136,10 +12186,10 @@ index c046c86..e953d2d 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 0593d5f3915dc4360c80f5b1adf708c084e4927b Mon Sep 17 00:00:00 2001
|
||||
From b4ccd13b3b5a855de8b4cae6a0ac4ec634e98f29 Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Thu, 5 Jul 2012 12:10:09 +0200
|
||||
Subject: [PATCH 28/59] X11: change method of going full-screen
|
||||
Subject: [PATCH 29/61] X11: change method of going full-screen
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++-
|
||||
@ -12183,10 +12233,10 @@ index b3e7ab5..91f92c1 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From f03be0f0fd20b91519d6723a2b87957211860066 Mon Sep 17 00:00:00 2001
|
||||
From a6507479dee958a863a14ee286637876a845a1e7 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 28 Jun 2012 19:12:39 +0200
|
||||
Subject: [PATCH 29/59] X11: reset key repeat and key modifier on focus lost
|
||||
Subject: [PATCH 30/61] X11: reset key repeat and key modifier on focus lost
|
||||
and gain
|
||||
|
||||
---
|
||||
@ -12218,10 +12268,10 @@ index 6c22358..d86205d 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 40e9b1fe262817c392daf111834f6a8c34d11fcd Mon Sep 17 00:00:00 2001
|
||||
From e32ca50e59de38f20503c0fcf4cc330858d5d449 Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@xbmc.org>
|
||||
Date: Thu, 5 Jul 2012 14:18:46 +0200
|
||||
Subject: [PATCH 30/59] X11: replace custom utf8 to unicode with charset
|
||||
Subject: [PATCH 31/61] X11: replace custom utf8 to unicode with charset
|
||||
convertor (squash to x11 events)
|
||||
|
||||
---
|
||||
@ -12438,10 +12488,10 @@ index 6100933..72955ad 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From eaaec3ab2335ed678eed63d8e57aaa744e53f1f8 Mon Sep 17 00:00:00 2001
|
||||
From 6f7809634fc4d590141300d2c6d5622762b3bd5b Mon Sep 17 00:00:00 2001
|
||||
From: Joakim Plate <elupus@xbmc.org>
|
||||
Date: Thu, 5 Jul 2012 14:23:54 +0200
|
||||
Subject: [PATCH 31/59] X11: fixed invalid usage of sizeof() (squash into x11
|
||||
Subject: [PATCH 32/61] X11: fixed invalid usage of sizeof() (squash into x11
|
||||
changes)
|
||||
|
||||
---
|
||||
@ -12505,10 +12555,10 @@ index 72955ad..102a076 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From c60aa57751d70011ce0fd0330c33220d838bb9fa Mon Sep 17 00:00:00 2001
|
||||
From af4f99c009060a87a65e763275b8edd316e460a9 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sat, 9 Jun 2012 18:23:53 +0200
|
||||
Subject: [PATCH 32/59] add missing keys to xbmc keytable
|
||||
Subject: [PATCH 33/61] add missing keys to xbmc keytable
|
||||
|
||||
---
|
||||
xbmc/input/XBMC_keytable.cpp | 2 ++
|
||||
@ -12531,10 +12581,10 @@ index dbc28a7..0ab6e78 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From eb00fddcf80cc26943789f5110ff34eb741670fa Mon Sep 17 00:00:00 2001
|
||||
From f94a3bf847743a2c5650cc31f8928c2b6ef2fc9f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Fri, 16 Mar 2012 15:57:51 +0100
|
||||
Subject: [PATCH 33/59] videorefclock: temp deactivate of nv settings
|
||||
Subject: [PATCH 34/61] videorefclock: temp deactivate of nv settings
|
||||
|
||||
---
|
||||
xbmc/video/VideoReferenceClock.cpp | 2 +-
|
||||
@ -12557,10 +12607,10 @@ index fa8e35a..85e36c7 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From a0d5f344326030df66e56fb8b3c693188a4cd447 Mon Sep 17 00:00:00 2001
|
||||
From b064af66ef65af6d6bc6cad67d63d0143d4c629f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 20 Aug 2012 09:09:09 +0200
|
||||
Subject: [PATCH 34/59] videorefclock: ask graphics context for refresh rate
|
||||
Subject: [PATCH 35/61] videorefclock: ask graphics context for refresh rate
|
||||
|
||||
---
|
||||
xbmc/video/VideoReferenceClock.cpp | 3 ++-
|
||||
@ -12591,10 +12641,10 @@ index 85e36c7..8209163 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 4e414b8a29f3f09f6716a33fd41f33b976a9ac5c Mon Sep 17 00:00:00 2001
|
||||
From 059d0b964f71d42fd4a4b01a1623eff85ac6170f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 9 Jul 2012 14:00:18 +0200
|
||||
Subject: [PATCH 35/59] X11: fix icon texture after
|
||||
Subject: [PATCH 36/61] X11: fix icon texture after
|
||||
cc5ed3c2474084ebc0373a3046410e6f766e03f4
|
||||
|
||||
---
|
||||
@ -12702,10 +12752,10 @@ index 91f92c1..174ccef 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 9641aa4585e2966abda96614c16a6410acf07f47 Mon Sep 17 00:00:00 2001
|
||||
From 2a7586c8232db9c0c2b89395a6a9ea3a6d96de61 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 10 Jul 2012 11:14:12 +0200
|
||||
Subject: [PATCH 36/59] X11: check for window manager
|
||||
Subject: [PATCH 37/61] X11: check for window manager
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++-
|
||||
@ -12826,10 +12876,10 @@ index e953d2d..0b7c10a 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 2f28294d8e612ebd07613c6af193d0fc3f5482bc Mon Sep 17 00:00:00 2001
|
||||
From f1156451c98565d15c38a10b6861356b0ccf0aac Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 12 Jul 2012 11:11:47 +0200
|
||||
Subject: [PATCH 37/59] X11: dont set window on xrandr if no mode available
|
||||
Subject: [PATCH 38/61] X11: dont set window on xrandr if no mode available
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++-----
|
||||
@ -12866,10 +12916,10 @@ index 4f1ae26..c11ea89 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 4f4d3485beaef146a133cdff8046466bd8ea990a Mon Sep 17 00:00:00 2001
|
||||
From 7aa6e58b09e5e829e36f00e097c275787d52ac41 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 26 Jul 2012 09:34:28 +0200
|
||||
Subject: [PATCH 38/59] X11: fix crash after a resolution change on startup
|
||||
Subject: [PATCH 39/61] X11: fix crash after a resolution change on startup
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 3 ++-
|
||||
@ -12893,10 +12943,10 @@ index c11ea89..0bd72d4 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 28b45c214640eca751baa91ff9193d339dc5b82f Mon Sep 17 00:00:00 2001
|
||||
From dfb73eadb4824ec8b00421188132ac14c9ee43f8 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sat, 15 Sep 2012 18:27:29 +0200
|
||||
Subject: [PATCH 39/59] X11: lock graphics context in NotifyXRREvent
|
||||
Subject: [PATCH 40/61] X11: lock graphics context in NotifyXRREvent
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11.cpp | 2 ++
|
||||
@ -12919,10 +12969,10 @@ index 0bd72d4..ef83133 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From db39155fc537a91377fe6e42d9414eec730dbd0e Mon Sep 17 00:00:00 2001
|
||||
From c44fd8084ad5199d5612e1fb3e25d27eb51a9733 Mon Sep 17 00:00:00 2001
|
||||
From: Rainer Hochecker <fernetmenta@online.de>
|
||||
Date: Sat, 8 Oct 2011 16:45:13 +0200
|
||||
Subject: [PATCH 40/59] ffmpeg: add xvba hwaccel
|
||||
Subject: [PATCH 41/61] ffmpeg: add xvba hwaccel
|
||||
|
||||
---
|
||||
lib/ffmpeg/configure | 8 ++
|
||||
@ -13789,10 +13839,10 @@ index f0d9c01..0f8cf7b 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From f0ac9783e599023a7140a724edc2889e87355389 Mon Sep 17 00:00:00 2001
|
||||
From f77ea1452624709381c70f729fa0545b3671cc6b Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 12 Apr 2012 12:09:31 +0200
|
||||
Subject: [PATCH 41/59] xvba: add decoder
|
||||
Subject: [PATCH 42/61] xvba: add decoder
|
||||
|
||||
---
|
||||
configure.in | 48 +
|
||||
@ -17239,10 +17289,10 @@ index f25d10d..f6b1ea4 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From bf8c46257fcedc3b34861faa82fef00f88d1590f Mon Sep 17 00:00:00 2001
|
||||
From e27639ffe6adab42f86f62af8c16a0e6d1ae0890 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 23 Aug 2012 19:39:49 +0200
|
||||
Subject: [PATCH 42/59] ffmpeg: add av_find_default_stream_index to interface
|
||||
Subject: [PATCH 43/61] ffmpeg: add av_find_default_stream_index to interface
|
||||
|
||||
---
|
||||
lib/DllAvFormat.h | 4 ++++
|
||||
@ -17288,10 +17338,10 @@ index 9bda3f3..bf31fcb 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 3a355c48b98c0d590b444163ff46dd2754706ee2 Mon Sep 17 00:00:00 2001
|
||||
From ac12e29a35a8dd7bccc12402df6d4990e90cc773 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 20 Aug 2012 16:06:39 +0200
|
||||
Subject: [PATCH 43/59] dvdplayer: observe pts counter overflow
|
||||
Subject: [PATCH 44/61] dvdplayer: observe pts counter overflow
|
||||
|
||||
---
|
||||
.../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 +++++++++++++++++++-
|
||||
@ -17577,10 +17627,10 @@ index 2b5f2e8..e0acf29 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 6744d6446f8d526cd25be5c09ca2851de4f7e205 Mon Sep 17 00:00:00 2001
|
||||
From 2a6e110e0564edc4a11fc2ece5519b4f090df146 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 2 Oct 2012 13:02:10 +0200
|
||||
Subject: [PATCH 44/59] dvdplayer: avoid short screen flicker caused by
|
||||
Subject: [PATCH 45/61] dvdplayer: avoid short screen flicker caused by
|
||||
unnecessary reconfigure of renderer
|
||||
|
||||
---
|
||||
@ -17613,10 +17663,10 @@ index e5e71f3..8b02d81 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From ebea481adc008ae3b81bbc7b1c857fcaa7157213 Mon Sep 17 00:00:00 2001
|
||||
From 0dd86aa019d6963ac042829848cb7c00f8aa81f2 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sat, 16 Jun 2012 12:46:30 +0200
|
||||
Subject: [PATCH 45/59] xvba: do not use vaapi if xvba is present
|
||||
Subject: [PATCH 46/61] xvba: do not use vaapi if xvba is present
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++
|
||||
@ -17646,10 +17696,10 @@ index a2b9195..43a05b3 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 730fafc91c8d0eb57332d4505ece0aa74cfaf989 Mon Sep 17 00:00:00 2001
|
||||
From e216f5d53518309399e11af294b5265f3839bf65 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 11 Oct 2012 12:05:50 +0200
|
||||
Subject: [PATCH 46/59] vdpau: advanced settings for auto deinterlacing
|
||||
Subject: [PATCH 47/61] vdpau: advanced settings for auto deinterlacing
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++----
|
||||
@ -17715,10 +17765,10 @@ index 0a4cc01..050d33f 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 871095f4adee62a03408c2be443cc7df4e1c901a Mon Sep 17 00:00:00 2001
|
||||
From 48bb7d006b6937ab5ba6bb62595f9cfb560623e8 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 11 Oct 2012 13:01:08 +0200
|
||||
Subject: [PATCH 47/59] dvdplayer: correct determination if video is playing
|
||||
Subject: [PATCH 48/61] dvdplayer: correct determination if video is playing
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++--
|
||||
@ -17751,10 +17801,10 @@ index 81ef000..0a5d818 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From c6e9fecccf60ef179a8236fbf82fe69f6e0d92e2 Mon Sep 17 00:00:00 2001
|
||||
From 8d3dd793d4f2a28d7aa20997802af69ebc60bd7f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 14 Oct 2012 13:46:54 +0200
|
||||
Subject: [PATCH 48/59] rendermanager: fix stuttering in non full-screen mode,
|
||||
Subject: [PATCH 49/61] rendermanager: fix stuttering in non full-screen mode,
|
||||
squash to add buffering
|
||||
|
||||
---
|
||||
@ -17780,10 +17830,10 @@ index 0506823..b141c80 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 7cbde0f6d56c34a1ba286ec930c1682fb9960737 Mon Sep 17 00:00:00 2001
|
||||
From 2fee3d1c45c022a4ee67f43e45c8838bd14cc88d Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 14 Oct 2012 17:54:02 +0200
|
||||
Subject: [PATCH 49/59] rendermanager: forgot to set flip event if buffering
|
||||
Subject: [PATCH 50/61] rendermanager: forgot to set flip event if buffering
|
||||
is not used
|
||||
|
||||
---
|
||||
@ -17826,10 +17876,10 @@ index b141c80..9290f80 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From ebe95bf2f6d32355b2d7853f8457f4c6d2d630ad Mon Sep 17 00:00:00 2001
|
||||
From 77a0a285afeceae0d209069532ae25412a948f3f Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Fri, 26 Oct 2012 15:30:22 +0200
|
||||
Subject: [PATCH 50/59] vdpau: fix small mem leak
|
||||
Subject: [PATCH 51/61] vdpau: fix small mem leak
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 2 ++
|
||||
@ -17852,10 +17902,10 @@ index d95797b..fec4b88 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 7dd95b18e9e66dfc90e838467aac3c1bb906bef9 Mon Sep 17 00:00:00 2001
|
||||
From c5f01abd2808e37b86fe32c711ec32e9fb1a89b8 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Mon, 29 Oct 2012 18:25:56 +0100
|
||||
Subject: [PATCH 51/59] xvba: do not render if there is no valid texture
|
||||
Subject: [PATCH 52/61] xvba: do not render if there is no valid texture
|
||||
|
||||
---
|
||||
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 8 +++-----
|
||||
@ -17889,10 +17939,10 @@ index 723ab34..4a6ab25 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 12489a2692ee537259b4ff02847ca027c89e17bd Mon Sep 17 00:00:00 2001
|
||||
From 218e504f9b26da2da71eddc8921ea34fdb68d7b2 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Fri, 2 Nov 2012 13:20:03 +0100
|
||||
Subject: [PATCH 52/59] player: fix rewind
|
||||
Subject: [PATCH 53/61] player: fix rewind
|
||||
|
||||
---
|
||||
xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++-
|
||||
@ -18137,10 +18187,10 @@ index 509d5f7..7cddda7 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 8f9a3476cf1aeb736877698134d4f2bf62185558 Mon Sep 17 00:00:00 2001
|
||||
From 61ab924178d878322e3d583efe656340a4a3474f Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Fri, 2 Nov 2012 17:56:12 +0100
|
||||
Subject: [PATCH 53/59] xvba: do not create decoder for surfaces larger than
|
||||
Subject: [PATCH 54/61] xvba: do not create decoder for surfaces larger than
|
||||
width 2048 or height 1536
|
||||
|
||||
---
|
||||
@ -18177,10 +18227,10 @@ index e8e376a..b73c48a 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From f20ae3c612863d9493af5f97ecad288e7a6450d4 Mon Sep 17 00:00:00 2001
|
||||
From 7c97bf63f385ccbfa13dfaa21412be1e8a6665b2 Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Sun, 4 Nov 2012 16:24:10 +0100
|
||||
Subject: [PATCH 54/59] xvba: add string for available decoders - we are
|
||||
Subject: [PATCH 55/61] xvba: add string for available decoders - we are
|
||||
important so make sure we are there
|
||||
|
||||
---
|
||||
@ -18207,10 +18257,10 @@ index 0cea7a9..6fb74b7 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From 6a0030d69d05ac648b8b0fc7ee56e3190cd25aa7 Mon Sep 17 00:00:00 2001
|
||||
From 9c99f1843060f37044dc1d5d8f88ad44d2993212 Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <Peter.Fruehberger@gmail.com>
|
||||
Date: Thu, 22 Nov 2012 21:32:21 +0100
|
||||
Subject: [PATCH 55/59] xvba: revisit Artefacts. There are more broken video
|
||||
Subject: [PATCH 56/61] xvba: revisit Artefacts. There are more broken video
|
||||
files out there
|
||||
|
||||
---
|
||||
@ -18244,10 +18294,10 @@ index a077442..87af687 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From c2d15233697c7b872ed9ccf32d5b36a3c5fa180f Mon Sep 17 00:00:00 2001
|
||||
From 5da415008732f204bec8d1783e337c9f97643f63 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Fri, 23 Nov 2012 09:42:02 +0100
|
||||
Subject: [PATCH 56/59] xvba: reactivate accidently disabled
|
||||
Subject: [PATCH 57/61] xvba: reactivate accidently disabled
|
||||
IsDecodingFinished
|
||||
|
||||
---
|
||||
@ -18271,10 +18321,10 @@ index b73c48a..47ff25f 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From e40ab705e4a9057e723e2c16f6a9ff7d0b15e653 Mon Sep 17 00:00:00 2001
|
||||
From 119affbc28f77ed6ac5f2bd9741cb376a9064af0 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Fri, 23 Nov 2012 17:41:12 +0100
|
||||
Subject: [PATCH 57/59] xrandr: fix query for multiple screens
|
||||
Subject: [PATCH 58/61] xrandr: fix query for multiple screens
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/XRandR.cpp | 10 ++++++----
|
||||
@ -18315,10 +18365,10 @@ index cc933b9..533e03d 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From be6205093cda42414c07776760632dbb1460caaa Mon Sep 17 00:00:00 2001
|
||||
From 5ba661499bd1f7150ecca86aaff862102f8c0d04 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Sun, 2 Dec 2012 15:46:55 +0100
|
||||
Subject: [PATCH 58/59] X11: add debug log to print out refresh after xrr
|
||||
Subject: [PATCH 59/61] X11: add debug log to print out refresh after xrr
|
||||
event
|
||||
|
||||
---
|
||||
@ -18346,10 +18396,10 @@ index ef83133..76c6362 100644
|
||||
1.7.10
|
||||
|
||||
|
||||
From efd2b27ce9ca7f179bf8e0071f45105a66fcec4e Mon Sep 17 00:00:00 2001
|
||||
From bc389dedf69461d7c6b0a69a6726b5f0d41a8247 Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Tue, 11 Dec 2012 11:08:13 +0100
|
||||
Subject: [PATCH 59/59] X11: dont call XCloseDisplay on shutdown, it crashes
|
||||
Subject: [PATCH 60/61] X11: dont call XCloseDisplay on shutdown, it crashes
|
||||
when powered doen by cec on ATI
|
||||
|
||||
---
|
||||
@ -18373,3 +18423,161 @@ index 76c6362..e4e25b2 100644
|
||||
--
|
||||
1.7.10
|
||||
|
||||
|
||||
From 4cd5d2b9ab8a52dafb0f36ecdb083d58421447bf Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Wed, 12 Dec 2012 09:52:17 +0100
|
||||
Subject: [PATCH 61/61] vdpau: make interop gl default and remove setting,
|
||||
rename and intvert interop yuv
|
||||
|
||||
---
|
||||
language/English/strings.po | 2 +-
|
||||
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 17 ++++++++++-------
|
||||
xbmc/settings/GUISettings.cpp | 3 +--
|
||||
xbmc/settings/GUIWindowSettingsCategory.cpp | 23 +++--------------------
|
||||
4 files changed, 15 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/language/English/strings.po b/language/English/strings.po
|
||||
index f53dd60..bebd068 100644
|
||||
--- a/language/English/strings.po
|
||||
+++ b/language/English/strings.po
|
||||
@@ -5121,7 +5121,7 @@ msgid "Allow Vdpau OpenGL interop"
|
||||
msgstr ""
|
||||
|
||||
msgctxt "#13436"
|
||||
-msgid "Allow Vdpau OpenGL interop YUV"
|
||||
+msgid "Prefer VDPAU Video Mixer"
|
||||
msgstr ""
|
||||
|
||||
msgctxt "#13437"
|
||||
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
index fec4b88..ad140fb 100644
|
||||
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
@@ -365,12 +365,15 @@ bool CDecoder::Supports(EINTERLACEMETHOD method)
|
||||
|| method == VS_INTERLACEMETHOD_AUTO)
|
||||
return true;
|
||||
|
||||
- if (g_guiSettings.GetBool("videoplayer.usevdpauinteropyuv"))
|
||||
+ if (!m_vdpauConfig.usePixmaps)
|
||||
{
|
||||
if (method == VS_INTERLACEMETHOD_RENDER_BOB)
|
||||
return true;
|
||||
}
|
||||
|
||||
+ if (method == VS_INTERLACEMETHOD_VDPAU_INVERSE_TELECINE)
|
||||
+ return false;
|
||||
+
|
||||
for(SInterlaceMapping* p = g_interlace_mapping; p->method != VS_INTERLACEMETHOD_NONE; p++)
|
||||
{
|
||||
if(p->method == method)
|
||||
@@ -1847,7 +1850,7 @@ void CMixer::SetDeinterlacing()
|
||||
|
||||
SetDeintSkipChroma();
|
||||
|
||||
- m_config.useInteropYuv = g_guiSettings.GetBool("videoplayer.usevdpauinteropyuv");
|
||||
+ m_config.useInteropYuv = !g_guiSettings.GetBool("videoplayer.usevdpaumixer");
|
||||
}
|
||||
|
||||
void CMixer::SetDeintSkipChroma()
|
||||
@@ -2039,7 +2042,7 @@ void CMixer::Init()
|
||||
m_vdpError = false;
|
||||
|
||||
m_config.upscale = g_advancedSettings.m_videoVDPAUScaling;
|
||||
- m_config.useInteropYuv = g_guiSettings.GetBool("videoplayer.usevdpauinteropyuv");
|
||||
+ m_config.useInteropYuv = !g_guiSettings.GetBool("videoplayer.usevdpaumixer");
|
||||
|
||||
CreateVdpauMixer();
|
||||
}
|
||||
@@ -2149,11 +2152,12 @@ void CMixer::InitCycle()
|
||||
DVP_FLAG_INTERLACED);
|
||||
m_config.useInteropYuv = false;
|
||||
}
|
||||
- else if (method == VS_INTERLACEMETHOD_RENDER_BOB && m_config.useInteropYuv)
|
||||
+ else if (method == VS_INTERLACEMETHOD_RENDER_BOB)
|
||||
{
|
||||
m_mixersteps = 1;
|
||||
m_mixerfield = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME;
|
||||
m_mixerInput[1].DVDPic.format = RENDER_FMT_VDPAU_420;
|
||||
+ m_config.useInteropYuv = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3185,7 +3189,7 @@ bool COutput::GLInit()
|
||||
glVDPAUGetSurfaceivNV = NULL;
|
||||
#endif
|
||||
|
||||
- m_config.usePixmaps = !g_guiSettings.GetBool("videoplayer.usevdpauinterop");
|
||||
+ m_config.usePixmaps = false;
|
||||
|
||||
#ifdef GL_NV_vdpau_interop
|
||||
if (glewIsSupported("GL_NV_vdpau_interop"))
|
||||
@@ -3217,8 +3221,7 @@ bool COutput::GLInit()
|
||||
#endif
|
||||
{
|
||||
m_config.usePixmaps = true;
|
||||
- g_guiSettings.SetBool("videoplayer.usevdpauinterop",false);
|
||||
- g_guiSettings.SetBool("videoplayer.usevdpauinteropyuv",false);
|
||||
+ g_guiSettings.SetBool("videoplayer.usevdpaumixer",true);
|
||||
}
|
||||
if (!glXBindTexImageEXT)
|
||||
glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glXGetProcAddress((GLubyte *) "glXBindTexImageEXT");
|
||||
diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
|
||||
index 0926dd9..b8a3c09 100644
|
||||
--- a/xbmc/settings/GUISettings.cpp
|
||||
+++ b/xbmc/settings/GUISettings.cpp
|
||||
@@ -691,8 +691,7 @@ void CGUISettings::Initialize()
|
||||
|
||||
#ifdef HAVE_LIBVDPAU
|
||||
AddBool(vp, "videoplayer.usevdpau", 13425, true);
|
||||
- AddBool(vp, "videoplayer.usevdpauinterop", 13435, true);
|
||||
- AddBool(vp, "videoplayer.usevdpauinteropyuv", 13436, false);
|
||||
+ AddBool(vp, "videoplayer.usevdpaumixer", 13436, true);
|
||||
#endif
|
||||
#ifdef HAVE_LIBVA
|
||||
AddBool(vp, "videoplayer.usevaapi", 13426, true);
|
||||
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
index bc7afa1..5545d0b 100644
|
||||
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
|
||||
@@ -602,9 +602,9 @@ void CGUIWindowSettingsCategory::UpdateSettings()
|
||||
pControl->SetEnabled(true);
|
||||
}
|
||||
}
|
||||
- else if (strSetting.Equals("videoplayer.usevdpauinteropyuv"))
|
||||
+ else if (strSetting.Equals("videoplayer.usevdpaumixer"))
|
||||
{
|
||||
- bool hasInterop = g_guiSettings.GetBool("videoplayer.usevdpauinterop");
|
||||
+ bool hasInterop = true;
|
||||
#ifndef GL_NV_vdpau_interop
|
||||
hasInterop = false;
|
||||
#endif
|
||||
@@ -616,24 +616,7 @@ void CGUIWindowSettingsCategory::UpdateSettings()
|
||||
else
|
||||
{
|
||||
pControl->SetEnabled(false);
|
||||
- g_guiSettings.SetBool("videoplayer.usevdpauinteropyuv",false);
|
||||
- }
|
||||
- }
|
||||
- else if (strSetting.Equals("videoplayer.usevdpauinterop"))
|
||||
- {
|
||||
- bool hasInterop = g_guiSettings.GetBool("videoplayer.usevdpau");
|
||||
-#ifndef GL_NV_vdpau_interop
|
||||
- hasInterop = false;
|
||||
-#endif
|
||||
- CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
|
||||
- if (pControl && hasInterop && glewIsSupported("GL_NV_vdpau_interop"))
|
||||
- {
|
||||
- pControl->SetEnabled(true);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- pControl->SetEnabled(false);
|
||||
- g_guiSettings.SetBool("videoplayer.usevdpauinterop",false);
|
||||
+ g_guiSettings.SetBool("videoplayer.usevdpaumixer",true);
|
||||
}
|
||||
}
|
||||
else
|
||||
--
|
||||
1.7.10
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user