From ff28651650667c6823272cab6a492019a594ccb4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Mar 2013 18:28:33 +0100 Subject: [PATCH 1/3] xbmc: update XVBA/VDPAU patch Signed-off-by: Stephan Raue --- ...=> xbmc-995.01-xvba_support-6b6e856.patch} | 779 +++++++++--------- 1 file changed, 388 insertions(+), 391 deletions(-) rename packages/mediacenter/xbmc/patches/{xbmc-995.01-xvba_support-080a915.patch => xbmc-995.01-xvba_support-6b6e856.patch} (97%) diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-080a915.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-6b6e856.patch similarity index 97% rename from packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-080a915.patch rename to packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-6b6e856.patch index 2920b85e4e..d02792cf8e 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-080a915.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-6b6e856.patch @@ -1,25 +1,25 @@ -From bce8eda45c6f219e08141a5ed0456749689f58ec Mon Sep 17 00:00:00 2001 +From 371c47da0b14523fd3ca43dc7b7259723593536b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:03:31 +0200 Subject: [PATCH 01/88] VideoRenerers: add buffering --- - xbmc/Application.cpp | 3 + - xbmc/cores/IPlayer.h | 2 + - xbmc/cores/VideoRenderers/BaseRenderer.h | 5 +- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 41 ++-- - xbmc/cores/VideoRenderers/LinuxRendererGL.h | 13 +- - xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 8 +- - xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 4 +- - xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 24 +- - xbmc/cores/VideoRenderers/OverlayRenderer.h | 9 +- - xbmc/cores/VideoRenderers/RenderManager.cpp | 294 +++++++++++++++++++---- - xbmc/cores/VideoRenderers/RenderManager.h | 63 ++++- - xbmc/cores/VideoRenderers/WinRenderer.cpp | 8 +- - xbmc/cores/VideoRenderers/WinRenderer.h | 2 +- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 5 + - xbmc/cores/dvdplayer/DVDPlayer.h | 2 + - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 34 ++- + xbmc/Application.cpp | 3 + + xbmc/cores/IPlayer.h | 2 + + xbmc/cores/VideoRenderers/BaseRenderer.h | 5 +- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 41 ++-- + xbmc/cores/VideoRenderers/LinuxRendererGL.h | 13 +- + xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 8 +- + xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 4 +- + xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 24 +- + xbmc/cores/VideoRenderers/OverlayRenderer.h | 9 +- + xbmc/cores/VideoRenderers/RenderManager.cpp | 294 ++++++++++++++++++++---- + xbmc/cores/VideoRenderers/RenderManager.h | 63 ++++- + xbmc/cores/VideoRenderers/WinRenderer.cpp | 8 +- + xbmc/cores/VideoRenderers/WinRenderer.h | 2 +- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 5 + + xbmc/cores/dvdplayer/DVDPlayer.h | 2 + + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 34 ++- 16 files changed, 417 insertions(+), 100 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp @@ -1120,17 +1120,17 @@ index 3008c25..19496a7 100644 return result; #else -- -1.7.10 +1.8.1.5 -From fc749b852e877940fae6bd28895ca00701b7ae37 Mon Sep 17 00:00:00 2001 +From 1f98cce6a5ad1c2868ce2a65fef4edf96ae6b919 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 08:32:18 +0100 Subject: [PATCH 02/88] add buffering for GLES --- - xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 10 ---------- - xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 6 ++++-- + xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 10 ---------- + xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp @@ -1207,17 +1207,17 @@ index c6b69db..5bae10d 100644 virtual bool ValidateRenderTarget(); virtual void LoadShaders(int field=FIELD_FULL); -- -1.7.10 +1.8.1.5 -From 9cf2521adc8410f14f863f275d994234300cacd0 Mon Sep 17 00:00:00 2001 +From 2f07bcddc82eb680d349beaa8dafc5ae81df3c84 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 16 Feb 2013 11:17:02 +0100 Subject: [PATCH 03/88] WinRenderer: add buffering --- - xbmc/cores/VideoRenderers/WinRenderer.cpp | 14 ++++++-------- - xbmc/cores/VideoRenderers/WinRenderer.h | 12 +++++------- + xbmc/cores/VideoRenderers/WinRenderer.cpp | 14 ++++++-------- + xbmc/cores/VideoRenderers/WinRenderer.h | 12 +++++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/xbmc/cores/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoRenderers/WinRenderer.cpp @@ -1290,16 +1290,16 @@ index f493ba7..b3448ed 100644 #else -- -1.7.10 +1.8.1.5 -From 9bee284bde02e98a6f990b3e990bf9799135aa1d Mon Sep 17 00:00:00 2001 +From 6980d499dbb5ac60896a7ebdfe580216738b460e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 16 Feb 2013 11:17:32 +0100 Subject: [PATCH 04/88] DXVA: activate buffering in renderer --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -1316,16 +1316,16 @@ index 19496a7..3bfe180 100644 case RENDER_FMT_VAAPI: formatstr = "VAAPI"; -- -1.7.10 +1.8.1.5 -From 32dc43bb8acb435d297424280a01bc6906d6bc76 Mon Sep 17 00:00:00 2001 +From 137710ba70a4082a72d8c50c4112cd61b98d5f24 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 10:49:09 +0200 Subject: [PATCH 05/88] linuxrenderer: delete all textures on reconfigure --- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 2 +- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp @@ -1342,20 +1342,20 @@ index b32a7ea..a2dc2be 100644 // trigger update of video filters -- -1.7.10 +1.8.1.5 -From 32e38ded4fe66857928c6ccf051fadd5e6096fdf Mon Sep 17 00:00:00 2001 +From 5cb6cbda0c123209396234d70fc96ce43acfd6e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:17:33 +0200 Subject: [PATCH 06/88] drop frame counter in application, ask render manager instead --- - xbmc/Application.cpp | 50 +++++---------------------- - xbmc/Application.h | 6 ++-- - xbmc/cores/VideoRenderers/RenderManager.cpp | 11 ++++++ - xbmc/cores/VideoRenderers/RenderManager.h | 1 + + xbmc/Application.cpp | 50 ++++++----------------------- + xbmc/Application.h | 6 ++-- + xbmc/cores/VideoRenderers/RenderManager.cpp | 11 +++++++ + xbmc/cores/VideoRenderers/RenderManager.h | 1 + 4 files changed, 23 insertions(+), 45 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp @@ -1524,18 +1524,18 @@ index 96ab53f..1e44233 100644 void DiscardBuffer(); -- -1.7.10 +1.8.1.5 -From 362789cbd9f10c180129205e6908c9369ec4dd96 Mon Sep 17 00:00:00 2001 +From 9b336ea3514f8bac3fec5697f14e9220a7473181 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 11:02:29 +0200 Subject: [PATCH 07/88] vaapi: adopt to buffering in renderer --- - xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 3 ++- - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 1 + + xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 3 ++- + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -1585,17 +1585,17 @@ index 863edc4..417cbc0 100644 int m_refs; std::list m_surfaces_used; -- -1.7.10 +1.8.1.5 -From 84307398fbc6075a5d461ac41748774f61e79bde Mon Sep 17 00:00:00 2001 +From 8384c0d5b9f9e0a4d32db8614f4aab9c76f0fbe1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 20:17:29 +0100 Subject: [PATCH 08/88] add buffering - some documentation --- - xbmc/cores/IPlayer.h | 3 +++ - xbmc/cores/VideoRenderers/RenderManager.h | 40 +++++++++++++++++++++++++++++ + xbmc/cores/IPlayer.h | 3 +++ + xbmc/cores/VideoRenderers/RenderManager.h | 40 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h @@ -1678,18 +1678,18 @@ index 1e44233..49da2ed 100644 protected: -- -1.7.10 +1.8.1.5 -From 2ccac0cb01b7c93ef1c4f58b1d8caa786b770f36 Mon Sep 17 00:00:00 2001 +From 1708e30ded68b715882ec90ad72d6cb71b081ce3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 18 Feb 2013 10:42:00 +0100 Subject: [PATCH 09/88] RenderManager: only flip free buffer if player has added something --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 29 +++++++++++++++++++++++---- - xbmc/cores/VideoRenderers/RenderManager.h | 7 ++----- + xbmc/cores/VideoRenderers/RenderManager.cpp | 29 +++++++++++++++++++++++++---- + xbmc/cores/VideoRenderers/RenderManager.h | 7 ++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -1794,21 +1794,21 @@ index 49da2ed..afb6b1f 100644 struct -- -1.7.10 +1.8.1.5 -From 9645d9fbf8ae5bf96d3b7013940da43125d08976 Mon Sep 17 00:00:00 2001 +From 7d51ae1a8ef7b8546d46b247e13499ae4b7715f9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 19 Feb 2013 09:06:22 +0100 Subject: [PATCH 10/88] move NUM_BUFFERS up to BaseRenderer.h --- - xbmc/cores/VideoRenderers/BaseRenderer.h | 3 ++- - xbmc/cores/VideoRenderers/LinuxRendererGL.h | 2 -- - xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 2 -- - xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 2 +- - xbmc/cores/VideoRenderers/OverlayRenderer.h | 3 ++- - xbmc/cores/VideoRenderers/WinRenderer.h | 2 -- + xbmc/cores/VideoRenderers/BaseRenderer.h | 3 ++- + xbmc/cores/VideoRenderers/LinuxRendererGL.h | 2 -- + xbmc/cores/VideoRenderers/LinuxRendererGLES.h | 2 -- + xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 2 +- + xbmc/cores/VideoRenderers/OverlayRenderer.h | 3 ++- + xbmc/cores/VideoRenderers/WinRenderer.h | 2 -- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/xbmc/cores/VideoRenderers/BaseRenderer.h b/xbmc/cores/VideoRenderers/BaseRenderer.h @@ -1902,20 +1902,20 @@ index b3448ed..b099697 100644 #define CLAMP(a, min, max) ((a) > (max) ? (max) : ( (a) < (min) ? (min) : a )) -- -1.7.10 +1.8.1.5 -From a15613e2ca8794cfcbc6aaea9162811f389ed325 Mon Sep 17 00:00:00 2001 +From db9a33ac36254e51a06593f8decd004224098302 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Feb 2013 09:55:00 +0100 Subject: [PATCH 11/88] OverlayRenderer: align buffers with index in renderManager --- - xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 26 ++++++++++++++++--------- - xbmc/cores/VideoRenderers/OverlayRenderer.h | 8 ++++---- - xbmc/cores/VideoRenderers/RenderManager.cpp | 11 +++++++---- - xbmc/cores/VideoRenderers/RenderManager.h | 1 + + xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 26 +++++++++++++++++--------- + xbmc/cores/VideoRenderers/OverlayRenderer.h | 8 ++++---- + xbmc/cores/VideoRenderers/RenderManager.cpp | 11 +++++++---- + xbmc/cores/VideoRenderers/RenderManager.h | 1 + 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/xbmc/cores/VideoRenderers/OverlayRenderer.cpp b/xbmc/cores/VideoRenderers/OverlayRenderer.cpp @@ -2080,21 +2080,21 @@ index afb6b1f..3f95793 100644 struct -- -1.7.10 +1.8.1.5 -From 0491865d0ae52f6d9ce990aa12a94766b9db1548 Mon Sep 17 00:00:00 2001 +From 43a41ed14d31b8b5517e6860a465f7e3f3842a14 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 26 Feb 2013 09:00:21 +0100 Subject: [PATCH 12/88] add buffering - submit absolute time to render buffers --- - xbmc/cores/IPlayer.h | 5 ----- - xbmc/cores/VideoRenderers/RenderManager.cpp | 20 +++----------------- - xbmc/cores/VideoRenderers/RenderManager.h | 5 ++--- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 5 ----- - xbmc/cores/dvdplayer/DVDPlayer.h | 2 -- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- + xbmc/cores/IPlayer.h | 5 ----- + xbmc/cores/VideoRenderers/RenderManager.cpp | 20 +++----------------- + xbmc/cores/VideoRenderers/RenderManager.h | 5 ++--- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 5 ----- + xbmc/cores/dvdplayer/DVDPlayer.h | 2 -- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h @@ -2240,16 +2240,16 @@ index 3bfe180..a90c141 100644 return result; #else -- -1.7.10 +1.8.1.5 -From fb26f752da42328867f3bcc969aab8bf9bc3629f Mon Sep 17 00:00:00 2001 +From c330413204b1d127f74a1d9cb9dd577f4cee3462 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 08:05:00 +0100 Subject: [PATCH 13/88] RenderManager: some rework, squash add buffering --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 18 ++++++++++-------- + xbmc/cores/VideoRenderers/RenderManager.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -2307,16 +2307,16 @@ index a2001c0..09daaef 100644 return -1; } -- -1.7.10 +1.8.1.5 -From 2497cbe8eb510aec111de64657807fd76f0012a3 Mon Sep 17 00:00:00 2001 +From ba28c236f2325504745341bd69b2f2a4082687bd Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 08:07:07 +0100 Subject: [PATCH 14/88] dvdplayer: disable buffering unil dropping is improved --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 16 ++++++++-------- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -2368,16 +2368,16 @@ index a90c141..c02bb96 100644 case RENDER_FMT_VAAPI: formatstr = "VAAPI"; -- -1.7.10 +1.8.1.5 -From 5b6132fb576fe3f44c1dd46de4b81a2a47259bd6 Mon Sep 17 00:00:00 2001 +From 12b0fa866c4fe674f553b6721f2f67654a0a0c0f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:00:51 +0100 Subject: [PATCH 15/88] RenderManager: skip very late frames in render buffer --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 21 +++++++++++++++++++-- + xbmc/cores/VideoRenderers/RenderManager.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -2418,17 +2418,17 @@ index 09daaef..9897f1c 100644 if (g_graphicsContext.IsFullScreenVideo() || presenttime <= clocktime + frametime) { -- -1.7.10 +1.8.1.5 -From 629484a8841cf258f17efa0f9f083ccb5206c923 Mon Sep 17 00:00:00 2001 +From 18dc1d1231fb086a8a53d635deb084e4459fe929 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:10:17 +0100 Subject: [PATCH 16/88] renderbuffers: drop enable/disable in this iteration --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 4 ++++ - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 4 ---- + xbmc/cores/VideoRenderers/RenderManager.cpp | 4 ++++ + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -2491,18 +2491,18 @@ index c02bb96..1d3c7e3 100644 // guess next frame pts. iDuration is always valid -- -1.7.10 +1.8.1.5 -From 08321050686201f18836373e7d746fcda6444e50 Mon Sep 17 00:00:00 2001 +From 9c247b20b3bb7c661dc053286601c20d8bba6a22 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:31:11 +0100 Subject: [PATCH 17/88] RenderManager: add method SetSpeed --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 10 +++++++--- - xbmc/cores/VideoRenderers/RenderManager.h | 8 ++++++-- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 3 ++- + xbmc/cores/VideoRenderers/RenderManager.cpp | 10 +++++++--- + xbmc/cores/VideoRenderers/RenderManager.h | 8 ++++++-- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -2596,16 +2596,16 @@ index 1d3c7e3..db4f7bd 100644 return result; #else -- -1.7.10 +1.8.1.5 -From 7c18da65dcda554ac45eacc669523ce3b1cd1c05 Mon Sep 17 00:00:00 2001 +From 6497df81fd5043a62602a64d077bc321d5b7d0fd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 10 Feb 2013 18:40:30 +0100 Subject: [PATCH 18/88] OMXPlayer: adapt to buffering --- - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 25 ++++++++----------------- + xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp @@ -2655,19 +2655,19 @@ index fe86561..4c43e6c 100644 CLog::Log(LOGERROR, "%s - failed to configure renderer", __FUNCTION__); return; -- -1.7.10 +1.8.1.5 -From e12846f87d8837979020c6526580a5e03b0cc91f Mon Sep 17 00:00:00 2001 +From b1cbb33d1a94f39a6dfd240e497f951038ed27ec Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 20:42:10 +0100 Subject: [PATCH 19/88] overlays: squash to b0b5c7c825b0265c5e7c888a48a76d11eb719246 --- - xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 19 +++++++++---------- - xbmc/cores/VideoRenderers/OverlayRenderer.h | 4 ++-- - xbmc/cores/VideoRenderers/RenderManager.cpp | 4 +++- + xbmc/cores/VideoRenderers/OverlayRenderer.cpp | 19 +++++++++---------- + xbmc/cores/VideoRenderers/OverlayRenderer.h | 4 ++-- + xbmc/cores/VideoRenderers/RenderManager.cpp | 4 +++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xbmc/cores/VideoRenderers/OverlayRenderer.cpp b/xbmc/cores/VideoRenderers/OverlayRenderer.cpp @@ -2754,23 +2754,23 @@ index dc984cf..1343a71 100644 } } -- -1.7.10 +1.8.1.5 -From 94342481ef44987605c6523207230167dd4f2fc5 Mon Sep 17 00:00:00 2001 +From 8c9125b145b837f99951abbab3eb65c9f6e59c36 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 Subject: [PATCH 20/88] videoplayer: adapt lateness detection and dropping to buffering --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 17 +- - xbmc/cores/VideoRenderers/RenderManager.h | 11 +- - .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 14 ++ - .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 31 +++ - .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 7 + - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 226 ++++++++++++++++---- - xbmc/cores/dvdplayer/DVDPlayerVideo.h | 24 +++ + xbmc/cores/VideoRenderers/RenderManager.cpp | 17 +- + xbmc/cores/VideoRenderers/RenderManager.h | 11 +- + .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 14 ++ + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 31 +++ + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 7 + + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 226 ++++++++++++++++----- + xbmc/cores/dvdplayer/DVDPlayerVideo.h | 24 +++ 7 files changed, 282 insertions(+), 48 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -3371,18 +3371,18 @@ index fe7e12c..4913712 100644 }; -- -1.7.10 +1.8.1.5 -From 241c6e3a504adeb471063a2f5004dd1cd73c38d9 Mon Sep 17 00:00:00 2001 +From ae200962c7b12d0b6493dfa4ced624a7f70f6765 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 Subject: [PATCH 21/88] video player: present correct pts to user for a/v sync (after buffering in renderer) --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 41 +++++++++++++++++++------------ - xbmc/cores/dvdplayer/DVDPlayerVideo.h | 2 +- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 41 ++++++++++++++++++++------------- + xbmc/cores/dvdplayer/DVDPlayerVideo.h | 2 +- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -3465,19 +3465,19 @@ index 4913712..509d5f7 100644 double GetOutputDelay(); /* returns the expected delay, from that a packet is put in queue */ -- -1.7.10 +1.8.1.5 -From a5f2819743a9c9d33cf94b154f0107320be203fe Mon Sep 17 00:00:00 2001 +From 718bf177a582fbcfd47e2038cbdf92a96f8125f2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 Subject: [PATCH 22/88] videoplayer: some rework and documentation --- - .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++-- - .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 11 ++++++++ - .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 2 +- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- + .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 11 ++++++++ + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 2 +- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h @@ -3579,10 +3579,10 @@ index 8ac5a32..12b08ac 100644 if (iDecoderPts == DVD_NOPTS_VALUE) iDecoderPts = pts; -- -1.7.10 +1.8.1.5 -From 3709e790d7e09a4716c49985ffd2229bef484ca9 Mon Sep 17 00:00:00 2001 +From 09149cb7d2f1ad6ad75ac1e8930d69030c9efde2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 09:57:16 +0100 Subject: [PATCH 23/88] Revert "dvdplayer: disable buffering unit dropping is @@ -3590,7 +3590,7 @@ Subject: [PATCH 23/88] Revert "dvdplayer: disable buffering unit dropping is This reverts commit de1caf5686c1fb53cb7ab11b356e6c22770740db. --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 16 ++++++++-------- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -3642,17 +3642,17 @@ index 12b08ac..3297513 100644 case RENDER_FMT_VAAPI: formatstr = "VAAPI"; -- -1.7.10 +1.8.1.5 -From 8ea05a892745e451b30db71f8e90726f0e75304f Mon Sep 17 00:00:00 2001 +From d6f6ee55f62610c56ed1cad1a25a82d31bd40d9d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 Subject: [PATCH 24/88] videoplayer: update frametime, it might change due to fps detection --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 ++ + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -3669,17 +3669,17 @@ index 3297513..8eb2eda 100644 { m_codecname = m_pVideoCodec->GetName(); -- -1.7.10 +1.8.1.5 -From a7d70d3c297a3734ca1a624b0686414c9304adcf Mon Sep 17 00:00:00 2001 +From da263c0b83590d2b49efa9fade7390c38099aa09 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 25/88] videoplayer: give streams with invalid fps a chance - for fps detection +Subject: [PATCH 25/88] videoplayer: give streams with invalid fps a chance for + fps detection --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -3696,17 +3696,17 @@ index 8eb2eda..d004153 100644 //reset the stored framerates if no good framerate was detected m_fStableFrameRate = 0.0; -- -1.7.10 +1.8.1.5 -From 2cdcdc555fcc3f0e6c4f3017be7c649347dd132e Mon Sep 17 00:00:00 2001 +From 05e393dda78630adb5e40fa4dbed6073893e1bce Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 Subject: [PATCH 26/88] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 8 +++++++- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -3736,10 +3736,10 @@ index 0cd2510..3737419 100644 // audioplayer, stops outputing audio to audiorendere, but still tries to // sleep an correct amount for each packet -- -1.7.10 +1.8.1.5 -From e3d4c866d705209e6116a268e9fdd51e53340bd6 Mon Sep 17 00:00:00 2001 +From 249b24cd3bda9d427c1dcceb89ce69ddf580c760 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 Subject: [PATCH 27/88] vdpau: redesign @@ -9887,20 +9887,20 @@ index e7af3cb..2dd8a9f 100644 protected: bool RefreshGlxContext(); -- -1.7.10 +1.8.1.5 -From dba5c10deaded20ad13517dfd8f981465ede5ff1 Mon Sep 17 00:00:00 2001 +From eec55a6168e20f46a63a7c408cf932e6e6457d74 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 Subject: [PATCH 28/88] 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 +++-------------------- + 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 @@ -10045,19 +10045,19 @@ index d988598..2af9315 100644 } else -- -1.7.10 +1.8.1.5 -From f21b11e4f5f4262009932a6e67f63a70f106dfd9 Mon Sep 17 00:00:00 2001 +From f12af3f28d7074e76c718dd94ca58301c12e37f0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 18:34:47 +0100 Subject: [PATCH 29/88] vdpau: drop studio level conversion --- - language/English/strings.po | 6 +- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 94 +----------------------- - xbmc/settings/GUISettings.cpp | 1 - + language/English/strings.po | 6 +- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 4 +- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 94 ++------------------------ + xbmc/settings/GUISettings.cpp | 1 - 4 files changed, 7 insertions(+), 98 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po @@ -10231,17 +10231,17 @@ index 33467d9..4cec1b3 100644 #endif AddSeparator(vp, "videoplayer.sep5"); -- -1.7.10 +1.8.1.5 -From b5243a442080fc2780b8403fcd3ff0e02dc6665b Mon Sep 17 00:00:00 2001 +From f3b1f9824e0f0b0f5bd8f6a24c190967b82ed073 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 Subject: [PATCH 30/88] vdpau: observe ffmpeg tags for color space --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++-------- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 1 + + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++++-------- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 1 + 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -10338,16 +10338,16 @@ index 4d1559c..471ad68 100644 VdpVideoMixerPictureStructure m_mixerfield; int m_mixerstep; -- -1.7.10 +1.8.1.5 -From 8909f19f24015940e468b56a73856839defbea96 Mon Sep 17 00:00:00 2001 +From a0bcf33456b53c9bbcda36d10ce9146d717cd802 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 Subject: [PATCH 31/88] vdpau: switch off de-interlacing on ff --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -10367,17 +10367,17 @@ index 34cc320..5de75ab 100644 if((method == VS_INTERLACEMETHOD_AUTO && interlaced) || method == VS_INTERLACEMETHOD_VDPAU_BOB -- -1.7.10 +1.8.1.5 -From 0b4f0ffbe7eaebfbf85a2022201f35ae85342d6c Mon Sep 17 00:00:00 2001 +From 1f888b21be4870dba92cb1a261c791f9979ca966 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Feb 2013 13:17:09 +0100 Subject: [PATCH 32/88] vdpau: fix mp4 part2 decoding, activate by default --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++------ - xbmc/settings/AdvancedSettings.cpp | 2 +- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++------ + xbmc/settings/AdvancedSettings.cpp | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -10425,17 +10425,17 @@ index 844f8e8..04a7c7c 100644 m_videoDisableBackgroundDeinterlace = false; m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect -- -1.7.10 +1.8.1.5 -From 2bc5b327115e22bbcf9f7a2814a0dd4e7872396a Mon Sep 17 00:00:00 2001 +From 4688a8f39fa763315faee214e8197fef9a9726d0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 Subject: [PATCH 33/88] linuxrenderer: drop method RenderMultiPass --- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- - xbmc/cores/VideoRenderers/LinuxRendererGL.h | 1 - + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- + xbmc/cores/VideoRenderers/LinuxRendererGL.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp @@ -10478,17 +10478,17 @@ index 329ddee..08f8234 100644 void RenderFromFBO(); void RenderSinglePass(int renderBuffer, int field); // single pass glsl renderer -- -1.7.10 +1.8.1.5 -From 036f18950598b9de6b1cdc309699f4c49b94b72f Mon Sep 17 00:00:00 2001 +From 1a8a1ede4a277d3e0e246a301ab0d71608fec825 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 Subject: [PATCH 34/88] linuxrenderer: implement progressive weave for vdpau --- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 ++++++++++++++++++------- - xbmc/cores/VideoRenderers/LinuxRendererGL.h | 4 +- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 +++++++++++++++++++-------- + xbmc/cores/VideoRenderers/LinuxRendererGL.h | 4 +- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp @@ -10609,23 +10609,23 @@ index 08f8234..13217ce 100644 struct -- -1.7.10 +1.8.1.5 -From b6600cf87d47ab61f959875b92639d3a4eeb4ee7 Mon Sep 17 00:00:00 2001 +From dd87bbaa5e096f7daefe8e439fd54c90a3bd83af Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 Subject: [PATCH 35/88] X11: ditch SDL for video and window events --- - xbmc/Application.cpp | 2 +- - xbmc/system.h | 5 + - xbmc/windowing/Makefile | 1 + - xbmc/windowing/WinEvents.h | 4 + - xbmc/windowing/WinEventsX11.cpp | 765 +++++++++++++++++++++++++++++++++++ - xbmc/windowing/WinEventsX11.h | 57 +++ - xbmc/windowing/X11/WinSystemX11.cpp | 370 ++++++++++++----- - xbmc/windowing/X11/WinSystemX11.h | 9 +- + xbmc/Application.cpp | 2 +- + xbmc/system.h | 5 + + xbmc/windowing/Makefile | 1 + + xbmc/windowing/WinEvents.h | 4 + + xbmc/windowing/WinEventsX11.cpp | 765 ++++++++++++++++++++++++++++++++++++ + xbmc/windowing/WinEventsX11.h | 57 +++ + xbmc/windowing/X11/WinSystemX11.cpp | 370 ++++++++++++----- + xbmc/windowing/X11/WinSystemX11.h | 9 +- 8 files changed, 1112 insertions(+), 101 deletions(-) create mode 100644 xbmc/windowing/WinEventsX11.cpp create mode 100644 xbmc/windowing/WinEventsX11.h @@ -12096,17 +12096,17 @@ index 2dd8a9f..9616d17 100644 CCriticalSection m_resourceSection; std::vector m_resources; -- -1.7.10 +1.8.1.5 -From 4102a3b81bbf36e88d9bc386864ddfcfade5e3c0 Mon Sep 17 00:00:00 2001 +From fd384c7f3570c1dc291372923c3a710bf6ed6a8c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 Subject: [PATCH 36/88] X11: Add xbmc icon --- - xbmc/windowing/X11/WinSystemX11.cpp | 126 ++++++++++++++++++++++++++++++++++- - xbmc/windowing/X11/WinSystemX11.h | 2 + + xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- + xbmc/windowing/X11/WinSystemX11.h | 2 + 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -12288,16 +12288,16 @@ index 9616d17..debf714 100644 CStopWatch m_screensaverReset; }; -- -1.7.10 +1.8.1.5 -From fa084fe59f831d9cdfa66cf2b2adee1071d29396 Mon Sep 17 00:00:00 2001 +From acadf4fb3993499540fa06bb6d8466cf7344e5e0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 Subject: [PATCH 37/88] X11: add SDL joystick until we have a better solution --- - xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ + xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -12345,18 +12345,17 @@ index 24477ae..2ec86a8 100644 } -- -1.7.10 +1.8.1.5 -From 408aefcc36879b8c9ac3b935fcb5ecd370409dd1 Mon Sep 17 00:00:00 2001 +From d09be92fa49276300db794b8e7a6f7aaf40ddd96 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 38/88] X11: factor out code handling device reset - notification +Subject: [PATCH 38/88] X11: factor out code handling device reset notification --- - xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- - xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- + xbmc/windowing/X11/WinSystemX11.h | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -12412,18 +12411,18 @@ index debf714..8c28e3f 100644 protected: bool RefreshGlxContext(); -- -1.7.10 +1.8.1.5 -From 642a7f85e69dfab72df3414fb1038781eeff2f9f Mon Sep 17 00:00:00 2001 +From 43d1d3b1a8e1878c2ea324b507e146cb45e36d21 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 Subject: [PATCH 39/88] X11: move xrandr events to WinEventsX11 --- - xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++ - xbmc/windowing/WinEventsX11.h | 5 +++++ - xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++- + xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ + xbmc/windowing/WinEventsX11.h | 5 +++++ + xbmc/windowing/X11/WinSystemX11.cpp | 6 +++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -12559,18 +12558,18 @@ index 70557d0..1cce843 100644 void CWinSystemX11::Register(IDispResource *resource) -- -1.7.10 +1.8.1.5 -From 0de9685663d4fa3d898463a8575e679ac6e88609 Mon Sep 17 00:00:00 2001 +From 682f85081cc169627a495e24536a45030076e3be Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 Subject: [PATCH 40/88] xrandr: remove method RestoreState --- - xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- - xbmc/windowing/X11/XRandR.cpp | 19 ------------------- - xbmc/windowing/X11/XRandR.h | 1 - + xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- + xbmc/windowing/X11/XRandR.cpp | 19 ------------------- + xbmc/windowing/X11/XRandR.h | 1 - 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -12641,19 +12640,19 @@ index 2a269d0..5b64633 100644 //bool Has1080p(); //bool Has720p(); -- -1.7.10 +1.8.1.5 -From 5f5b2aa008d9a95d2c867e3ef08ca4a66e480723 Mon Sep 17 00:00:00 2001 +From 1f368f7fed71094c91de304882a4e6cb95b36c62 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 Subject: [PATCH 41/88] xrandr: observe orientation --- - xbmc/windowing/X11/WinSystemX11.cpp | 61 +++++++++++++++++++++++++++++++++-- - xbmc/windowing/X11/WinSystemX11.h | 2 ++ - xbmc/windowing/X11/XRandR.cpp | 7 ++++ - xbmc/windowing/X11/XRandR.h | 1 + + xbmc/windowing/X11/WinSystemX11.cpp | 61 +++++++++++++++++++++++++++++++++++-- + xbmc/windowing/X11/WinSystemX11.h | 2 ++ + xbmc/windowing/X11/XRandR.cpp | 7 +++++ + xbmc/windowing/X11/XRandR.h | 1 + 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -12813,18 +12812,18 @@ index 5b64633..618bd68 100644 class CXRandR -- -1.7.10 +1.8.1.5 -From 0773e42c12d91c4266dae95fdeb93e0ad5f967b8 Mon Sep 17 00:00:00 2001 +From a1dc5ac80ccb6ff4e48075987248e887fba7064d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 Subject: [PATCH 42/88] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- - xbmc/windowing/X11/XRandR.cpp | 65 ++++++++++++++++++++++++++++++++--------- - xbmc/windowing/X11/XRandR.h | 8 +++-- + xbmc/windowing/X11/XRandR.cpp | 65 +++++++++++++++++++++++++++++++++---------- + xbmc/windowing/X11/XRandR.h | 8 ++++-- 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp @@ -12991,23 +12990,23 @@ index 618bd68..0824af5 100644 extern CXRandR g_xrandr; -- -1.7.10 +1.8.1.5 -From d9874d6f16538222bff1085f07be9cff9b2c7cb8 Mon Sep 17 00:00:00 2001 +From 5e59bd5258a6390fb8b8258cbb2832b24e664c7e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 Subject: [PATCH 43/88] X11: fix multi-head setups --- - language/English/strings.po | 4 +- - xbmc/rendering/gl/RenderSystemGL.h | 1 + - xbmc/settings/GUISettings.cpp | 5 + - xbmc/settings/GUIWindowSettingsCategory.cpp | 60 +++++- - xbmc/settings/GUIWindowSettingsCategory.h | 1 + - xbmc/windowing/WinEventsX11.cpp | 7 + - xbmc/windowing/X11/WinSystemX11.cpp | 262 ++++++++++++++++----------- - xbmc/windowing/X11/WinSystemX11.h | 10 +- + language/English/strings.po | 4 +- + xbmc/rendering/gl/RenderSystemGL.h | 1 + + xbmc/settings/GUISettings.cpp | 5 + + xbmc/settings/GUIWindowSettingsCategory.cpp | 60 ++++++- + xbmc/settings/GUIWindowSettingsCategory.h | 1 + + xbmc/windowing/WinEventsX11.cpp | 7 + + xbmc/windowing/X11/WinSystemX11.cpp | 262 ++++++++++++++++------------ + xbmc/windowing/X11/WinSystemX11.h | 10 +- 8 files changed, 235 insertions(+), 115 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po @@ -13726,18 +13725,18 @@ index 93cf5db..71034fc 100644 private: bool IsSuitableVisual(XVisualInfo *vInfo); -- -1.7.10 +1.8.1.5 -From 78e8e301056c445a8615e23249349bb9610a777a Mon Sep 17 00:00:00 2001 +From 032cd69a1c8ea5eccbe46787118ce26a2ee1f6a0 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 Subject: [PATCH 44/88] X11: remove all DefaultScreen and RootWindow macros --- - xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- - xbmc/windowing/X11/WinSystemX11.h | 1 + - xbmc/windowing/X11/WinSystemX11GL.cpp | 2 +- + xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- + xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/windowing/X11/WinSystemX11GL.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -13797,10 +13796,10 @@ index f858f88..d192697 100644 CLog::Log(LOGDEBUG, "GLX_EXTENSIONS:%s", m_glxext.c_str()); -- -1.7.10 +1.8.1.5 -From 5263c0fd5de731423d498611d35e4906faa82486 Mon Sep 17 00:00:00 2001 +From 0ccb8aa4e116c98ab9b592337bdec933a97448b1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 Subject: [PATCH 45/88] X11: remove all DefaultScreen and RootWindow macros @@ -13808,7 +13807,7 @@ Subject: [PATCH 45/88] X11: remove all DefaultScreen and RootWindow macros Note this is on a separate display connection. --- - xbmc/video/VideoReferenceClock.cpp | 15 ++++++++------- + xbmc/video/VideoReferenceClock.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp @@ -13872,18 +13871,18 @@ index 9785fe7..0004e07 100644 XRRFreeScreenConfigInfo(CurrInfo); -- -1.7.10 +1.8.1.5 -From b577a6f159cbc63446d1f9ea353fa5847c4c7413 Mon Sep 17 00:00:00 2001 +From 3959adaf7e1ea39079fac59d28cea6da895fe50d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 Subject: [PATCH 46/88] X11: recreate gl context after output has changed --- - xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- - xbmc/windowing/X11/WinSystemX11.h | 1 + - xbmc/windowing/X11/WinSystemX11GL.cpp | 9 +++++++++ + xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- + xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/windowing/X11/WinSystemX11GL.cpp | 9 +++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -14026,17 +14025,17 @@ index d192697..0f2d1d2 100644 } -- -1.7.10 +1.8.1.5 -From f6a095ccc348ce9476587f19f3f78f951cbfe6db Mon Sep 17 00:00:00 2001 +From e667b22788bc91de725308a6b47aaeb3359d3c92 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 Subject: [PATCH 47/88] X11: hook video reference clock in windowing --- - xbmc/video/VideoReferenceClock.cpp | 71 ++++++++++++++++++++++++++---------- - xbmc/video/VideoReferenceClock.h | 13 ++++++- + xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- + xbmc/video/VideoReferenceClock.h | 13 ++++++- 2 files changed, 63 insertions(+), 21 deletions(-) diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp @@ -14234,19 +14233,19 @@ index dcc4f09..7eb6317 100644 bool m_UseNvSettings; bool m_bIsATI; -- -1.7.10 +1.8.1.5 -From 60bdfd6f4d5ea6d9881ed42c46a47c7e436eda4f Mon Sep 17 00:00:00 2001 +From 80247befe0d208649a8b148944b3b309485cdcb3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 Subject: [PATCH 48/88] X11: fix video calibrations --- - xbmc/settings/Settings.cpp | 1 + - xbmc/windowing/WinSystem.h | 1 + - xbmc/windowing/X11/WinSystemX11.cpp | 36 ++++++++++++++++++++++++++++++++++- - xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/settings/Settings.cpp | 1 + + xbmc/windowing/WinSystem.h | 1 + + xbmc/windowing/X11/WinSystemX11.cpp | 36 +++++++++++++++++++++++++++++++++++- + xbmc/windowing/X11/WinSystemX11.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp @@ -14342,17 +14341,17 @@ index cc28f56..c046c86 100644 // Local to WinSystemX11 only Display* GetDisplay() { return m_dpy; } -- -1.7.10 +1.8.1.5 -From abb0b804384c663b02e8645752130ab1f17fa0b3 Mon Sep 17 00:00:00 2001 +From 63048f89c495e78041361427f6d13406961d8893 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 Subject: [PATCH 49/88] X11: deactivate screen saver on startup --- - xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ - xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ + xbmc/windowing/X11/WinSystemX11.h | 1 + 2 files changed, 30 insertions(+) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -14415,16 +14414,16 @@ index c046c86..e953d2d 100644 virtual void NotifyAppActiveChange(bool bActivated); virtual void NotifyAppFocusChange(bool bGaining); -- -1.7.10 +1.8.1.5 -From 0bc01b5d9fbbec1c6f2bf3633d95ac40214aa835 Mon Sep 17 00:00:00 2001 +From 21c05c81343e519ea20bf51030a6c418010aff46 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 Subject: [PATCH 50/88] X11: change method of going full-screen --- - xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- + xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -14462,17 +14461,17 @@ index b3e7ab5..91f92c1 100644 Pixmap bitmapNoData; XColor black; -- -1.7.10 +1.8.1.5 -From b2ec0d4a35eb0c5717fb6aa1e5a1493e82e1a945 Mon Sep 17 00:00:00 2001 +From 9212003fae17bcab353bbe97bf3ee952e75dda29 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 Subject: [PATCH 51/88] X11: reset key repeat and key modifier on focus lost and gain --- - xbmc/windowing/WinEventsX11.cpp | 3 +++ + xbmc/windowing/WinEventsX11.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -14497,18 +14496,18 @@ index 6c22358..d86205d 100644 serial = xevent.xfocus.serial; break; -- -1.7.10 +1.8.1.5 -From 207c66c726e8841fd3f7235bd17a89c4fee0403d Mon Sep 17 00:00:00 2001 +From c4ee707bf959ff258b7ea04206eaa6d2c2677d35 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 Subject: [PATCH 52/88] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- - xbmc/windowing/WinEventsX11.cpp | 119 ++++----------------------------------- - xbmc/windowing/WinEventsX11.h | 2 - + xbmc/windowing/WinEventsX11.cpp | 119 ++++------------------------------------ + xbmc/windowing/WinEventsX11.h | 2 - 2 files changed, 11 insertions(+), 110 deletions(-) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -14717,18 +14716,18 @@ index 6100933..72955ad 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.7.10 +1.8.1.5 -From e29bc1f6b32f20a6e430f1cdb068c75d0e22428b Mon Sep 17 00:00:00 2001 +From 6aac957a645ffc1bab50f6c192cef4a2518af622 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 Subject: [PATCH 53/88] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- - xbmc/windowing/WinEventsX11.cpp | 11 +++++++---- - xbmc/windowing/WinEventsX11.h | 1 + + xbmc/windowing/WinEventsX11.cpp | 11 +++++++---- + xbmc/windowing/WinEventsX11.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -14784,16 +14783,16 @@ index 72955ad..102a076 100644 XIC m_xic; XBMC_Event m_lastKey; -- -1.7.10 +1.8.1.5 -From 6d0c0c24448f9b8eef9d8db08a255740f06af1ac Mon Sep 17 00:00:00 2001 +From b8934342d7df312e13458a80391066c4126f29f3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 Subject: [PATCH 54/88] add missing keys to xbmc keytable --- - xbmc/input/XBMC_keytable.cpp | 2 ++ + xbmc/input/XBMC_keytable.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp @@ -14810,16 +14809,16 @@ index aaf65ba..9d7922f 100644 // Function keys , { XBMCK_F1, 0, 0, XBMCVK_F1, "f1"} -- -1.7.10 +1.8.1.5 -From b753c7dd29d3671631837cead0d993ae9286d511 Mon Sep 17 00:00:00 2001 +From fa735dd19b136620e982af6db7864f87d7f9c83e Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 Subject: [PATCH 55/88] videorefclock: temp deactivate of nv settings --- - xbmc/video/VideoReferenceClock.cpp | 2 +- + xbmc/video/VideoReferenceClock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp @@ -14836,16 +14835,16 @@ index fa8e35a..85e36c7 100644 #endif } -- -1.7.10 +1.8.1.5 -From 58e426ceb9babc0901577a7d22fe9f1dd42a6e26 Mon Sep 17 00:00:00 2001 +From d4f8bf4e72e7bd94559f74faec4c4833ffe8b9bc Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 Subject: [PATCH 56/88] videorefclock: ask graphics context for refresh rate --- - xbmc/video/VideoReferenceClock.cpp | 3 ++- + xbmc/video/VideoReferenceClock.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp @@ -14870,17 +14869,17 @@ index 85e36c7..8209163 100644 CLog::Log(LOGDEBUG, "CVideoReferenceClock: Detected refreshrate: %i hertz", (int)m_RefreshRate); -- -1.7.10 +1.8.1.5 -From 3505c1cda815b1a4dd2ab459ad7bae10b6e9e9eb Mon Sep 17 00:00:00 2001 +From 172d40e8404d636217b41692ffda28ee34e9626f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 Subject: [PATCH 57/88] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- - xbmc/windowing/X11/WinSystemX11.cpp | 43 +++++++++++++++++++++-------------- + xbmc/windowing/X11/WinSystemX11.cpp | 43 ++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -14981,17 +14980,17 @@ index 91f92c1..174ccef 100644 } -- -1.7.10 +1.8.1.5 -From 3e52d9a932faca81eafa733c5059dbbe606a7f73 Mon Sep 17 00:00:00 2001 +From b6c42f32119b032ef359c9db98f2977c1c80305b Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 Subject: [PATCH 58/88] X11: check for window manager --- - xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++- - xbmc/windowing/X11/WinSystemX11.h | 1 + + xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- + xbmc/windowing/X11/WinSystemX11.h | 1 + 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -15105,16 +15104,16 @@ index e953d2d..0b7c10a 100644 CStopWatch m_screensaverReset; }; -- -1.7.10 +1.8.1.5 -From 6c1c75d8a5b59ec944c1fc3a89a5687acf1e50f4 Mon Sep 17 00:00:00 2001 +From 5084e3e61675fa89ab0959a08935c3ac5993cc0c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 Subject: [PATCH 59/88] X11: dont set window on xrandr if no mode available --- - xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- + xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -15145,16 +15144,16 @@ index 4f1ae26..c11ea89 100644 CStdString currentOutput = g_guiSettings.GetString("videoscreen.monitor"); -- -1.7.10 +1.8.1.5 -From b6eb7e5783d67a959342fe4bb4ec0540f5f66174 Mon Sep 17 00:00:00 2001 +From e42fef16d3475bdfba4f1122ae14aaee78545e9d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 Subject: [PATCH 60/88] X11: fix crash after a resolution change on startup --- - xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- + xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -15172,16 +15171,16 @@ index c11ea89..0bd72d4 100644 #endif -- -1.7.10 +1.8.1.5 -From 6785dbb314452accc1c36d850f2d6c6ccc9a28e1 Mon Sep 17 00:00:00 2001 +From 5e994c0cd385f8ceda4135fef24ccbed7f1a99bd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 Subject: [PATCH 61/88] X11: lock graphics context in NotifyXRREvent --- - xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ + xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -15198,29 +15197,29 @@ index 0bd72d4..ef83133 100644 { CLog::Log(LOGERROR, "WinSystemX11::RefreshWindow - failed to query xrandr"); -- -1.7.10 +1.8.1.5 -From a8cd6bf3d810f7b08dedbc3a321d086699c20c7c Mon Sep 17 00:00:00 2001 +From 167663e44c9fb025ff64529659b739755ec2b72d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 Subject: [PATCH 62/88] ffmpeg: add xvba hwaccel --- - lib/ffmpeg/configure | 8 ++ - lib/ffmpeg/libavcodec/Makefile | 7 +- - lib/ffmpeg/libavcodec/allcodecs.c | 4 + - lib/ffmpeg/libavcodec/h264.c | 1 + - lib/ffmpeg/libavcodec/mpegvideo.c | 1 + - lib/ffmpeg/libavcodec/xvba.c | 66 +++++++++++ - lib/ffmpeg/libavcodec/xvba.h | 71 ++++++++++++ - lib/ffmpeg/libavcodec/xvba_h264.c | 195 +++++++++++++++++++++++++++++++++ - lib/ffmpeg/libavcodec/xvba_internal.h | 24 ++++ - lib/ffmpeg/libavcodec/xvba_mpeg2.c | 52 +++++++++ - lib/ffmpeg/libavcodec/xvba_vc1.c | 190 ++++++++++++++++++++++++++++++++ - lib/ffmpeg/libavcodec/xvmc_internal.h | 4 +- - lib/ffmpeg/libavutil/pixdesc.c | 6 + - lib/ffmpeg/libavutil/pixfmt.h | 1 + + lib/ffmpeg/configure | 8 ++ + lib/ffmpeg/libavcodec/Makefile | 7 +- + lib/ffmpeg/libavcodec/allcodecs.c | 4 + + lib/ffmpeg/libavcodec/h264.c | 1 + + lib/ffmpeg/libavcodec/mpegvideo.c | 1 + + lib/ffmpeg/libavcodec/xvba.c | 66 ++++++++++++ + lib/ffmpeg/libavcodec/xvba.h | 71 +++++++++++++ + lib/ffmpeg/libavcodec/xvba_h264.c | 195 ++++++++++++++++++++++++++++++++++ + lib/ffmpeg/libavcodec/xvba_internal.h | 24 +++++ + lib/ffmpeg/libavcodec/xvba_mpeg2.c | 52 +++++++++ + lib/ffmpeg/libavcodec/xvba_vc1.c | 190 +++++++++++++++++++++++++++++++++ + lib/ffmpeg/libavcodec/xvmc_internal.h | 4 +- + lib/ffmpeg/libavutil/pixdesc.c | 6 ++ + lib/ffmpeg/libavutil/pixfmt.h | 1 + 14 files changed, 628 insertions(+), 2 deletions(-) create mode 100644 lib/ffmpeg/libavcodec/xvba.c create mode 100644 lib/ffmpeg/libavcodec/xvba.h @@ -16074,10 +16073,10 @@ index f0d9c01..0f8cf7b 100644 PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0 -- -1.7.10 +1.8.1.5 -From 8aa0da396f46da9c2d01523a9d7eeea417c1e23d Mon Sep 17 00:00:00 2001 +From f5e8b95f85c7ed230c6253e2642f18ce70715b38 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 Subject: [PATCH 63/88] xvba: add decoder @@ -16103,7 +16102,7 @@ Subject: [PATCH 63/88] xvba: add decoder create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/configure.in b/configure.in -index 4472e3e..309df98 100644 +index 78104ad..4bf2f52 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" @@ -19524,17 +19523,17 @@ index f25d10d..f6b1ea4 100644 /* remove unsupported methods */ for(vector >::iterator it = entries.begin(); it != entries.end();) -- -1.7.10 +1.8.1.5 -From 9b6fd9416e871e213be10f7f5e14d6f7153ce63c Mon Sep 17 00:00:00 2001 +From 6ed1317a52a25107a70ef8066efc32636f64478b Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 4 Nov 2012 16:24:10 +0100 Subject: [PATCH 64/88] xvba: add string for available decoders - we are important so make sure we are there --- - xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 5 +++++ + xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -19554,16 +19553,16 @@ index 0cea7a9..6fb74b7 100644 CLog::Log(LOGDEBUG, "CDVDFactoryCodec: compiled in hardware support: %s", hwSupport.c_str()); -- -1.7.10 +1.8.1.5 -From c19b114ea427b26e2b01a50237d724c5b33a7eeb Mon Sep 17 00:00:00 2001 +From 1954285997005efabdab1767801cce099ccf8583 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 Subject: [PATCH 65/88] xvba: do not use vaapi if xvba is present --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp @@ -19587,16 +19586,16 @@ index a2b9195..43a05b3 100644 VAProfile profile; -- -1.7.10 +1.8.1.5 -From bbd13cc5aae0d2d5d6b5e76c1ad4dac5d0e943d3 Mon Sep 17 00:00:00 2001 +From 585eacfbd0a50fc121351112ede57bfadd79dffc Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 Subject: [PATCH 66/88] ffmpeg: add av_find_default_stream_index to interface --- - lib/DllAvFormat.h | 4 ++++ + lib/DllAvFormat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h @@ -19636,17 +19635,17 @@ index 9bda3f3..bf31fcb 100644 /* dependencies of libavformat */ -- -1.7.10 +1.8.1.5 -From 215fda50bf849d8825dae7ea0df266ec2a48aa40 Mon Sep 17 00:00:00 2001 +From 9f4ba7941d92a5fe4c0ac5e40f476171020b480b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 Subject: [PATCH 67/88] dvdplayer: observe pts counter overflow --- - .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 +++++++++++++++++++- - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 4 + + .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 4 + 2 files changed, 201 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -19925,17 +19924,17 @@ index 2b5f2e8..e0acf29 100644 }; -- -1.7.10 +1.8.1.5 -From bce9685c861c0e15e13ae7c8ab2fca536cc7953a Mon Sep 17 00:00:00 2001 +From 310484992451576db827010ed3a1bf8dbeb4798c Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 Subject: [PATCH 68/88] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 4 ++-- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -19961,18 +19960,18 @@ index 1e5d2ac5..69f45d4 100644 m_output.extended_format = pPicture->extended_format; m_output.color_matrix = pPicture->color_matrix; -- -1.7.10 +1.8.1.5 -From 0521db37199b474812a634cd18301254c32b31cb Mon Sep 17 00:00:00 2001 +From 16bd756474f3e1b5c6d1234908b0f7f034af2e9a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 Subject: [PATCH 69/88] vdpau: advanced settings for auto deinterlacing --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- - xbmc/settings/AdvancedSettings.cpp | 4 ++++ - xbmc/settings/AdvancedSettings.h | 2 ++ + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- + xbmc/settings/AdvancedSettings.cpp | 4 ++++ + xbmc/settings/AdvancedSettings.h | 2 ++ 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 @@ -20030,16 +20029,16 @@ index 72718e5..aaa4702 100644 bool m_videoVDPAUdeintSkipChromaHD; bool m_musicUseTimeSeeking; -- -1.7.10 +1.8.1.5 -From 4eb4175110629170486488354011f56beef15890 Mon Sep 17 00:00:00 2001 +From 82a52b56ca4756a818ae56550be3002c82630d73 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 13:01:08 +0200 Subject: [PATCH 70/88] dvdplayer: correct determination if video is playing --- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++-- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -20066,20 +20065,20 @@ index 3737419..890d99e 100644 bool CDVDPlayer::HasAudio() const -- -1.7.10 +1.8.1.5 -From 8b52f9ad898af2ab64513107e2a7df6bc77f5b64 Mon Sep 17 00:00:00 2001 +From b1c80c0544b7ab6d0aa8b4ad1a19533c6bb685bd Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 Subject: [PATCH 71/88] player: fix rewind --- - xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 30 +++++++++++++++++++----------- - xbmc/cores/dvdplayer/DVDPlayer.h | 7 ++++--- - xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 10 ++++++---- - xbmc/cores/dvdplayer/DVDPlayerVideo.h | 1 + + xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 30 +++++++++++++++++++----------- + xbmc/cores/dvdplayer/DVDPlayer.h | 7 ++++--- + xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 10 ++++++---- + xbmc/cores/dvdplayer/DVDPlayerVideo.h | 1 + 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDMessage.h b/xbmc/cores/dvdplayer/DVDMessage.h @@ -20301,16 +20300,16 @@ index 509d5f7..7cddda7 100644 unsigned int m_dropRequests; bool m_requestOutputDrop; -- -1.7.10 +1.8.1.5 -From 54ee3dc7d89c404b034537c9587ca28aac9be6b6 Mon Sep 17 00:00:00 2001 +From d076e9767c434787e5aff94d409f9e6a6eb25ee9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 Subject: [PATCH 72/88] xrandr: fix query for multiple screens --- - xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- + xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp @@ -20345,17 +20344,16 @@ index cc933b9..533e03d 100644 FILE* file = popen(cmd.c_str(),"r"); if (!file) -- -1.7.10 +1.8.1.5 -From d8c0ae8c060fb1e123da397d0f81fa57447e904f Mon Sep 17 00:00:00 2001 +From 8417fda6ad107d4ae3b03f627b5d632acd2f425a Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 73/88] X11: add debug log to print out refresh after xrr - event +Subject: [PATCH 73/88] X11: add debug log to print out refresh after xrr event --- - xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ + xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -20376,17 +20374,17 @@ index ef83133..76c6362 100644 unsigned int i; bool found(false); -- -1.7.10 +1.8.1.5 -From 19b45b9338d652f73ca03bc76ee219cf613f21c7 Mon Sep 17 00:00:00 2001 +From f9d195799c457e9e17dd263aeb4042d2d89471cc Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 Subject: [PATCH 74/88] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- - xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- + xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -20404,16 +20402,16 @@ index 76c6362..e4e25b2 100644 // m_SDLSurface is free()'d by SDL_Quit(). -- -1.7.10 +1.8.1.5 -From bd3962ceca4193be1bf10a852cb1cad62ad471f6 Mon Sep 17 00:00:00 2001 +From ff01dc2931958d9a29c17fb7fe08fef858b48b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 Subject: [PATCH 75/88] x11: support for multiple x screens --- - xbmc/windowing/X11/XRandR.cpp | 2 +- + xbmc/windowing/X11/XRandR.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp @@ -20430,16 +20428,16 @@ index 533e03d..7a16488 100644 // TODO ERROR return false; -- -1.7.10 +1.8.1.5 -From b28fc9040fe778aba24a54763939b4a4fd976ba8 Mon Sep 17 00:00:00 2001 +From cbbf172b193f1b1e70f48c880ba3c8cfa228097b Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 20 Dec 2012 19:35:38 +0100 Subject: [PATCH 76/88] fix compile error after recent change --- - xbmc/settings/GUIWindowSettingsCategory.cpp | 2 +- + xbmc/settings/GUIWindowSettingsCategory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -20456,18 +20454,17 @@ index b9f18e4..cacb32a 100644 { control->SetDelayed(); -- -1.7.10 +1.8.1.5 -From aea8330d2cf15b29e045da2a22f6d0b3922fd6d2 Mon Sep 17 00:00:00 2001 +From fbffd910ebe5cc247e04f9179bd6d737380b05e7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 Subject: [PATCH 77/88] pvr: increase changes counter of stream on stream - change, cosmetics after - dd307930d39d92f145a01a16600cd00e01ec39be + change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp | 5 ++--- + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -20494,16 +20491,16 @@ index 8c984f6..034e545 100644 else if (props.stream[i].iCodecType == AVMEDIA_TYPE_VIDEO) { -- -1.7.10 +1.8.1.5 -From 666266929af66e0f478483d6302c242de83278a3 Mon Sep 17 00:00:00 2001 +From 45a473289401e87fc4f88108ce33826c64b7d14e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 Subject: [PATCH 78/88] X11: add keymapping for XF86XK_Sleep --- - xbmc/windowing/WinEventsX11.cpp | 1 + + xbmc/windowing/WinEventsX11.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp @@ -20519,16 +20516,16 @@ index c31877e..ed31c04 100644 , {XK_Undo, XBMCK_UNDO} /* Media keys */ -- -1.7.10 +1.8.1.5 -From 8d46c6af024dcf9582439d61e82af04bb40bc2ab Mon Sep 17 00:00:00 2001 +From 6d677ef21716824d8dc55005d0c0d82865479f9e Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 Subject: [PATCH 79/88] X11: remove toggle full screen after resume --- - xbmc/powermanagement/PowerManager.cpp | 5 ----- + xbmc/powermanagement/PowerManager.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp @@ -20548,16 +20545,16 @@ index a5534c9..7e2ddc6 100644 } g_application.ResetScreenSaver(); -- -1.7.10 +1.8.1.5 -From 86e8a355f670f5627b0b881d2935b8de6b34a8c1 Mon Sep 17 00:00:00 2001 +From e357259f9a059fdcb0cfe0a464aa098ed2a64861 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 Subject: [PATCH 80/88] xrandr: set screen on mode change command --- - xbmc/windowing/X11/XRandR.cpp | 2 +- + xbmc/windowing/X11/XRandR.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp @@ -20574,17 +20571,17 @@ index 7a16488..6531ba3 100644 return false; CLog::Log(LOGINFO, "XRANDR: %s", cmd); -- -1.7.10 +1.8.1.5 -From caa7824f63623d723c238124d4c7aacc92fdba19 Mon Sep 17 00:00:00 2001 +From e6d8e6fb213d865da33f1358a08601ded8017e82 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 Subject: [PATCH 81/88] X11: recreate glx context when output changes --- - xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- - xbmc/windowing/X11/WinSystemX11.h | 2 +- + xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- + xbmc/windowing/X11/WinSystemX11.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -20628,16 +20625,16 @@ index 0b7c10a..33b1739 100644 void OnLostDevice(); bool SetWindow(int width, int height, bool fullscreen, const CStdString &output); -- -1.7.10 +1.8.1.5 -From c8c6c6211dfb4b341fe90fe069b53a5bb5003bd2 Mon Sep 17 00:00:00 2001 +From 552750dfe22ea24e87b7e34f1bdc9531c1518051 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Jan 2013 15:16:38 +0100 Subject: [PATCH 82/88] multi-screen: fix compilation on windows --- - xbmc/settings/GUIWindowSettingsCategory.cpp | 11 ++++++++++- + xbmc/settings/GUIWindowSettingsCategory.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -20704,17 +20701,17 @@ index cacb32a..cbf0acb 100644 g_guiSettings.SetResolution(nextRes); g_graphicsContext.SetVideoResolution(nextRes, outputChanged); -- -1.7.10 +1.8.1.5 -From 27cba3ae83ba58a542dd22e2a040e8a3ce54f60a Mon Sep 17 00:00:00 2001 +From 3d58b5c8775cd2ee7db52defe5201f709e451647 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 Subject: [PATCH 83/88] pvr: do not show selection dialog for a single menu hook --- - xbmc/pvr/addons/PVRClients.cpp | 19 +++++++++++-------- + xbmc/pvr/addons/PVRClients.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp @@ -20750,17 +20747,17 @@ index ae11936..69d8b0d 100644 client->CallMenuHook(hooks->at(selection)); } -- -1.7.10 +1.8.1.5 -From 31ffef39ec8efac8236a2875f1ff0bbeb96f68d1 Mon Sep 17 00:00:00 2001 +From 99ad5025648cb96a4d7e7426875bc80266f14ca9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 Subject: [PATCH 84/88] X11: use default screen parameters if no output connected --- - xbmc/windowing/X11/WinSystemX11.cpp | 55 +++++++++++++++++++++-------------- + xbmc/windowing/X11/WinSystemX11.cpp | 55 ++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp @@ -20857,17 +20854,17 @@ index b87e264..3cadd13 100644 mask, &swa); -- -1.7.10 +1.8.1.5 -From 6cc1f5ab9a771d0f0d2ad681c99f32fa7ea34a72 Mon Sep 17 00:00:00 2001 +From ef6533b1a6f83cce56ac6e6e8cbee8cf469b2c16 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 25 Feb 2013 08:47:10 +0100 Subject: [PATCH 85/88] vdpau: release more resources on pre-cleanup --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 72 ++++++++++++++++++++++-- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 2 + + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 72 +++++++++++++++++++++++--- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 2 + 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -20998,16 +20995,16 @@ index 471ad68..e33b6f5 100644 bool GLInit(); void GLMapSurfaces(); -- -1.7.10 +1.8.1.5 -From fd68b0c6c3cd7aa249c5d3fac34ce919de90faf0 Mon Sep 17 00:00:00 2001 +From 5d68fc5b17c40590390449d2e192fa9c152e70e6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 5 Mar 2013 17:01:53 +0100 Subject: [PATCH 86/88] LinuxRendererGL: do not upscale if source equals dest --- - xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 8 ++++++++ + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp @@ -21030,17 +21027,17 @@ index 0bb924b..b5b0838 100644 { m_pVideoFilterShader->Free(); -- -1.7.10 +1.8.1.5 -From 619ec392575563dffb8a7779ede8eb0905a658cc Mon Sep 17 00:00:00 2001 +From a700248019c5a565aa9879fc9ee6c34fc67d6974 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 Subject: [PATCH 87/88] vdpau: set deinterlacing method to auto, if default method not supported --- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 4 +++- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -21065,16 +21062,16 @@ index 38ef375..b69ae8c 100644 } else -- -1.7.10 +1.8.1.5 -From 080a915329a2ca5438b233f3d7e1522a996b80fc Mon Sep 17 00:00:00 2001 +From 6b6e85640899317290649d8d577e2fe8287236ea Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Mar 2013 14:04:15 +0100 Subject: [PATCH 88/88] buffering: do not drop in RenderManager --- - xbmc/cores/VideoRenderers/RenderManager.cpp | 24 ++++++++++++------------ + xbmc/cores/VideoRenderers/RenderManager.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -21113,5 +21110,5 @@ index c99a555..bc764da 100644 double presenttime = m_renderBuffers[idx].timestamp; -- -1.7.10 +1.8.1.5 From 19d7e8ee43ddbc05876baf3d6215ea4d656c8961 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Mar 2013 18:28:53 +0100 Subject: [PATCH 2/3] xbmc: add upstream patch Signed-off-by: Stephan Raue --- ...ly_free_unused_textures_after_a_flip.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-995.02-only_free_unused_textures_after_a_flip.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.02-only_free_unused_textures_after_a_flip.patch b/packages/mediacenter/xbmc/patches/xbmc-995.02-only_free_unused_textures_after_a_flip.patch new file mode 100644 index 0000000000..6ee705e97f --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-995.02-only_free_unused_textures_after_a_flip.patch @@ -0,0 +1,29 @@ +From f3ffe4e25bfca41379e4e2ffba75ad55d13ba30e Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Thu, 21 Mar 2013 07:53:20 +0100 +Subject: [PATCH] only free unused textures after a flip + +--- + xbmc/Application.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index fa0e71d..5bd2d72 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -2363,11 +2363,10 @@ void CApplication::Render() + { + g_graphicsContext.Flip(dirtyRegions); + g_renderManager.NotifyDisplayFlip(); ++ g_TextureManager.FreeUnusedTextures(); + } + CTimeUtils::UpdateFrameTime(flip); + +- g_TextureManager.FreeUnusedTextures(); +- + g_renderManager.UpdateResolution(); + g_renderManager.ManageCaptures(); + } +-- +1.8.1.5 + From f73054755f992e0652361b6c5ea401621c6863f0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 21 Mar 2013 18:32:40 +0100 Subject: [PATCH 3/3] xf86-video-intel: update to xf86-video-intel-2.21.5 Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-intel/build | 2 +- packages/x11/driver/xf86-video-intel/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build index bef9fe65f0..7cb119e38b 100755 --- a/packages/x11/driver/xf86-video-intel/build +++ b/packages/x11/driver/xf86-video-intel/build @@ -22,7 +22,7 @@ . config/options $1 -# TODO: xf86-video-intel-2.21.4 dont link with LTO enabled +# TODO: xf86-video-intel-2.21.5 dont link with LTO enabled strip_lto xorg_drv_configure_prepend diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index ee623c3d58..44015e5d20 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.21.4" +PKG_VERSION="2.21.5" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS"