From f1fbb09e26699e15a7d31c2c9b279c0f963fa506 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 22 Jan 2014 21:24:54 +0200 Subject: [PATCH] xbmc: update to xbmc-13.alpha-910ac62 --- .../xbmc-theme-Confluence/package.mk | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- ...bmc-995.01-fernetmenta-fixes-a66a9b9.patch | 769 +++++++++++------- 3 files changed, 492 insertions(+), 281 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index 6db74703e1..e63d6be522 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-63e652f" +PKG_VERSION="13.alpha-910ac62" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index dc3e5858b7..ff3df5db3e 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-63e652f" +PKG_VERSION="13.alpha-910ac62" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch index ba4f12a9fd..e67b30216d 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch @@ -1,7 +1,7 @@ -From 9e8f9907c7e1bfa61888e0e5a2d677de2d5b53be Mon Sep 17 00:00:00 2001 +From a36ec9ed1fa6caadec673f3d1e71c3d62905be9c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/89] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/88] videoplayer: adapt lateness detection and dropping to buffering --- @@ -582,10 +582,10 @@ index f8ad541..186e271 100644 1.8.5.1 -From 8ed898b48ea0028717a20c17e4ac989340fae4df Mon Sep 17 00:00:00 2001 +From 2654cfff6b9849045ee445e6cc7d3aed61a8b2be Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/89] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/88] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -653,10 +653,10 @@ index 186e271..59c7f09 100644 1.8.5.1 -From 17ee0122aec66522b6edc693a07448d3b8d90358 Mon Sep 17 00:00:00 2001 +From c32ea4b0c363e410547db7babd88c129b7cb3483 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/89] videoplayer: some rework and documentation +Subject: [PATCH 03/88] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -767,10 +767,10 @@ index c3b5e37..392d971 100644 1.8.5.1 -From 44d58b9f19ebbb22755dc0103f41f0655b036336 Mon Sep 17 00:00:00 2001 +From aeaff4f455f0b699e447534c0c2ff93f28e8e21d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/89] renderer: bump buffers to 5 +Subject: [PATCH 04/88] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -793,10 +793,10 @@ index dc2712a..9edfbd4 100644 1.8.5.1 -From 58ff471a148660a62eeb5cb40827d2427e8dc23a Mon Sep 17 00:00:00 2001 +From 5964e3a3cab754424f54cd4633be1bb6a8faa4e8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/89] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/88] videoplayer: update frametime, it might change due to fps detection --- @@ -820,10 +820,10 @@ index 392d971..b650ccb 100644 1.8.5.1 -From ab372f802f5134eddaf4f352a1380f485b42296c Mon Sep 17 00:00:00 2001 +From ee4eaa0afe04c5b8d3b9bbb9716182c28df6dc2f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/89] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/88] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -847,10 +847,10 @@ index b650ccb..3c517f2 100644 1.8.5.1 -From 3b3293d5843295f833d7b3c01b2602192e4ba16b Mon Sep 17 00:00:00 2001 +From 7b01d3785dc7257b2cba5ee43079af7bdb6464b2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/89] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/88] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -858,10 +858,10 @@ Subject: [PATCH 07/89] dvdplayer: allow rewinding at end of stream, do a seek 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index a698b8f..a845c7e 100644 +index 050a1a0..d0d5a9a 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1663,7 +1663,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1666,7 +1666,7 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 @@ -870,7 +870,7 @@ index a698b8f..a845c7e 100644 && m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts() && m_SpeedState.lasttime != GetTime()) { -@@ -2328,6 +2328,12 @@ void CDVDPlayer::HandleMessages() +@@ -2331,6 +2331,12 @@ void CDVDPlayer::HandleMessages() pvrinputstream->Pause( speed == 0 ); } @@ -887,10 +887,10 @@ index a698b8f..a845c7e 100644 1.8.5.1 -From 969eb976c74b34580fcbd677061cf987aec10a05 Mon Sep 17 00:00:00 2001 +From c6fd2439671f9bcab9beb2f2f8d9b20d90a5fb25 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/89] X11: ditch SDL for video and window events +Subject: [PATCH 08/88] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -906,7 +906,7 @@ Subject: [PATCH 08/89] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 0b6ebef..1aa5e0f 100644 +index 1072efc..8f9536c 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -857,7 +857,7 @@ bool CApplication::CreateGUI() @@ -2427,10 +2427,10 @@ index b1464d0..34b912f 100644 1.8.5.1 -From c7bcd146f685eb310224d0a49a5e2fb4ec30a948 Mon Sep 17 00:00:00 2001 +From 83da3df917bdf8ba861e0883e1a3eb5dd7fcf1a1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/89] X11: Add xbmc icon +Subject: [PATCH 09/88] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2620,10 +2620,10 @@ index 34b912f..352e90e 100644 1.8.5.1 -From f1d9a6efba8101a5386d907564bd2483d7d0c1e5 Mon Sep 17 00:00:00 2001 +From f4a750c1032d5901b1efbcc15725968ddaad2d12 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/89] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/88] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2677,10 +2677,10 @@ index ad58aad..6f57a87 100644 1.8.5.1 -From d47a65a3583753fde83f9594949e4c065cab8a8d Mon Sep 17 00:00:00 2001 +From 22b485db95727aed953a42b03b43b0e47e5100fe Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/89] X11: factor out code handling device reset notification +Subject: [PATCH 11/88] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2743,10 +2743,10 @@ index 352e90e..3f91b9b 100644 1.8.5.1 -From 3d37269b5f1c45314d2b68b605d1f459cd794859 Mon Sep 17 00:00:00 2001 +From dacc4a3f9b559118beaf692440ab9440e83cf60b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/89] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/88] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2890,10 +2890,10 @@ index 304dac8..16b13aa 100644 1.8.5.1 -From d35184f094a9d545826483d4aae5a519e8426591 Mon Sep 17 00:00:00 2001 +From 6595d81c9c7c6ff5b4ae5a142252812f2c1413f3 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/89] xrandr: remove method RestoreState +Subject: [PATCH 13/88] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2972,10 +2972,10 @@ index 0aec487..00b49dc 100644 1.8.5.1 -From 5bc70b5828ce7351893663f03ed071fd796388c1 Mon Sep 17 00:00:00 2001 +From 5c9f23ca3feabebf16c8eb10230c91dee812af8e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/89] xrandr: observe orientation +Subject: [PATCH 14/88] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3190,10 +3190,10 @@ index 00b49dc..508604d 100644 1.8.5.1 -From cf656f52ccb4746f87e89373737216cc8c59cbd4 Mon Sep 17 00:00:00 2001 +From 76802e7aa6ec21278ff22e911e6839abed7607e8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/89] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/88] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3368,10 +3368,10 @@ index 508604d..d37838a 100644 1.8.5.1 -From a7916c4d9f821e986f7a0fa2cea0fbaef939dc4a Mon Sep 17 00:00:00 2001 +From ae9ef467299cf532a82a853f554f08baf419bd19 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/89] X11: fix multi-head setups +Subject: [PATCH 16/88] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3386,7 +3386,7 @@ Subject: [PATCH 16/89] X11: fix multi-head setups 9 files changed, 227 insertions(+), 113 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 38fa82e..0bc9bcd 100755 +index b5e95fc..3685bd9 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3401,10 +3401,10 @@ index 38fa82e..0bc9bcd 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 6879121..08d0a89 100644 +index 2a1cb46..8e74f3d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2067,6 +2067,15 @@ +@@ -2076,6 +2076,15 @@
@@ -3420,7 +3420,7 @@ index 6879121..08d0a89 100644 0 0 -@@ -2088,6 +2097,7 @@ +@@ -2097,6 +2106,7 @@ -1 @@ -3428,7 +3428,7 @@ index 6879121..08d0a89 100644 -@@ -2105,6 +2115,7 @@ +@@ -2114,6 +2124,7 @@ -1 @@ -3555,7 +3555,7 @@ index 8ee1be2..bead24b 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 4917ceb..17fb36f 100644 +index 8cf00f7..355419d 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -406,6 +406,7 @@ void CSettings::Uninitialize() @@ -4130,10 +4130,10 @@ index 4175aab..94584ab 100644 1.8.5.1 -From 8ea222de6a7c4ee1d0df7f7a3406538a3671e646 Mon Sep 17 00:00:00 2001 +From c6cff3b5d8690a22ff707285cc8682cf0a5c5b80 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/89] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/88] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4201,10 +4201,10 @@ index 6383754..21e7dc5 100644 1.8.5.1 -From 1d63184a156f48067fff78a0478dc0e22d03463b Mon Sep 17 00:00:00 2001 +From 88af31cd2d127f2822d3cf16cdd5cffd12b4c52c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/89] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/88] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4276,10 +4276,10 @@ index 0b3950a..ca43b5a 100644 1.8.5.1 -From 6695e32fe18968f58f43fbe35610b6ac298b7739 Mon Sep 17 00:00:00 2001 +From a79a55997e62df98961bf7d9975afd3d7afd4eba Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/89] X11: recreate gl context after output has changed +Subject: [PATCH 19/88] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4430,10 +4430,10 @@ index 21e7dc5..8e68d5d 100644 1.8.5.1 -From d8f3920852834b6dc54651835ac120339915e258 Mon Sep 17 00:00:00 2001 +From b644000e0c100f4c5a50a4633067fc0d2f032cfa Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/89] X11: hook video reference clock in windowing +Subject: [PATCH 20/88] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4638,10 +4638,10 @@ index dd65a1b..afd71fc 100644 1.8.5.1 -From 8d572be09cdf1696a4f1c75ae4db4a0ddb56b10d Mon Sep 17 00:00:00 2001 +From 97074d40bff3581d50cfa9828bacdeedf247c852 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/89] X11: fix video calibrations +Subject: [PATCH 21/88] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4733,10 +4733,10 @@ index 9666cc3..5b52d6c 100644 1.8.5.1 -From 1c28c1319449ae2b4558078cd20f41b68bb00087 Mon Sep 17 00:00:00 2001 +From c28299181812bff8803769f0249dfe42ac0fa569 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/89] X11: deactivate screen saver on startup +Subject: [PATCH 22/88] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4806,10 +4806,10 @@ index 5b52d6c..b2bd5a0 100644 1.8.5.1 -From a3fc59d8901cda525c5fad1f3e85e6226c57ffa1 Mon Sep 17 00:00:00 2001 +From c73f7b7c2d50d0b723220e823ded7c139f7c706c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/89] X11: change method of going full-screen +Subject: [PATCH 23/88] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4853,10 +4853,10 @@ index b76b229..869baa8 100644 1.8.5.1 -From c7e9ef5c1b88ccc8c53f8ed17571ab6c8024772d Mon Sep 17 00:00:00 2001 +From 229946d4ee93e4f7655c066a95d4d20b79e94360 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/89] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/88] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4888,10 +4888,10 @@ index d98f12f..743aca9 100644 1.8.5.1 -From 821c1cdf0c43215e1a46f7a2769809e757fea8eb Mon Sep 17 00:00:00 2001 +From 90ed451f6c36e1d37beac70ae32ea948a73885d4 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/89] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/88] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5108,10 +5108,10 @@ index a412f32..9a8a912 100644 1.8.5.1 -From e571aa3c98c5dd38763e4f6fbc9fba74fe44c2ac Mon Sep 17 00:00:00 2001 +From e6316695c839ff2dd5113b1e4eb1bb866cd4c161 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/89] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/88] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5175,10 +5175,10 @@ index 9a8a912..c69169c 100644 1.8.5.1 -From a2d991c7c354f7580edbcaa85092a38d8c480fbd Mon Sep 17 00:00:00 2001 +From 9f35e783509ba3e3ed85afbfc170b94345bcbfcf Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/89] add missing keys to xbmc keytable +Subject: [PATCH 27/88] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5201,10 +5201,10 @@ index d57f4d3..b807897 100644 1.8.5.1 -From 3eb378ac02bb123043fc65b5e883ff2e44ab1918 Mon Sep 17 00:00:00 2001 +From 01773e404f804d67c1862c17668e2ba45ea6a20f Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/89] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/88] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5227,10 +5227,10 @@ index 0ddf102..3ae7107 100644 1.8.5.1 -From b416327bb422596bcd7838d18faefee2396053e7 Mon Sep 17 00:00:00 2001 +From e10aaa3b763528002255b91f2fd724f00e27e637 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/89] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/88] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5261,10 +5261,10 @@ index 3ae7107..27bebde 100644 1.8.5.1 -From 03af2c2ae298f36fed6c395fa11012b27b6becd7 Mon Sep 17 00:00:00 2001 +From 080775cad7b56c27987894887b766268d27b2d3e Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/89] X11: fix icon texture after +Subject: [PATCH 30/88] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5372,10 +5372,10 @@ index 869baa8..bfe3797 100644 1.8.5.1 -From 727bc2d39c63b7a0beb1716e030b6c6a8f3b0ad0 Mon Sep 17 00:00:00 2001 +From 0c1568f52a1d53f3b61339471788861b15e715ed Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/89] X11: check for window manager +Subject: [PATCH 31/88] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5496,10 +5496,10 @@ index b2bd5a0..3e62cd8 100644 1.8.5.1 -From 79b005dad71ee8381446fbe802c37cddf4fdb72d Mon Sep 17 00:00:00 2001 +From a252b058f4eccab0ec68888ecd0b47bfddc2309e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/89] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/88] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5536,10 +5536,10 @@ index af82061..4f33c68 100644 1.8.5.1 -From e1c1428672b72b078b210aa00524128cb027c06e Mon Sep 17 00:00:00 2001 +From 57c4031c9a900bf44c4c3b024576702fe9a9333f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/89] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/88] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5563,10 +5563,10 @@ index 4f33c68..bc4e963 100644 1.8.5.1 -From e9a10ce11313359ba324d2ff24400cb0dc66ab98 Mon Sep 17 00:00:00 2001 +From b09b2bdb45b0c45e7121625cb43b1aeb6be98f5d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/89] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/88] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5589,10 +5589,10 @@ index bc4e963..57a8d20 100644 1.8.5.1 -From 66a18c2f103d87206f11462288e8cdf90ac0be2a Mon Sep 17 00:00:00 2001 +From b601b6b71ea358d842859c885525c0091d6246e0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 35/89] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 35/88] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -5638,10 +5638,10 @@ index 0016c0b..3514856 100644 1.8.5.1 -From 008247d59cc28c3af07e9fde49d8774f21cbcdbc Mon Sep 17 00:00:00 2001 +From e134d847fe3b1b358c6fa4bf5433bbe9225381d5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 36/89] dvdplayer: observe pts counter overflow +Subject: [PATCH 36/88] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -5928,10 +5928,10 @@ index aef5ab1..35abbdf 100644 1.8.5.1 -From 7344934096b2cefa832025b37e8c7abddcfafb81 Mon Sep 17 00:00:00 2001 +From 4aa7e370a1619663b990b6045b73f80057cc8857 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 37/89] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 37/88] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5964,10 +5964,10 @@ index 3c517f2..5d4875c 100644 1.8.5.1 -From 4272d6e85de6619721ebe0be2bb45c089859cc18 Mon Sep 17 00:00:00 2001 +From fdf9e19b588a39bb519946377fcbfa475eec3e14 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 38/89] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 38/88] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -6033,10 +6033,10 @@ index 88d2cde..0f0a24e 100644 1.8.5.1 -From bbc2fb9cdbdefb861fd067d909cdfb18695267ad Mon Sep 17 00:00:00 2001 +From e143dab0d796d1e9c34bd04f3e2aa8b195935ecb Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 39/89] player: fix rewind +Subject: [PATCH 39/88] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6084,10 +6084,10 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index a845c7e..ad851e9 100644 +index d0d5a9a..8228b7c 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1664,11 +1664,13 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1667,11 +1667,13 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 && (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file @@ -6102,7 +6102,7 @@ index a845c7e..ad851e9 100644 // check how much off clock video is when ff/rw:ing // a problem here is that seeking isn't very accurate // and since the clock will be resynced after seek -@@ -1687,7 +1689,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1690,7 +1692,7 @@ void CDVDPlayer::HandlePlaySpeed() { CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up"); int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL); @@ -6111,7 +6111,7 @@ index a845c7e..ad851e9 100644 } } } -@@ -2173,7 +2175,7 @@ void CDVDPlayer::HandleMessages() +@@ -2176,7 +2178,7 @@ void CDVDPlayer::HandleMessages() else m_StateInput.dts = start; @@ -6120,7 +6120,7 @@ index a845c7e..ad851e9 100644 } else CLog::Log(LOGWARNING, "error while seeking"); -@@ -2313,9 +2315,10 @@ void CDVDPlayer::HandleMessages() +@@ -2316,9 +2318,10 @@ void CDVDPlayer::HandleMessages() double offset; offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -6132,7 +6132,7 @@ index a845c7e..ad851e9 100644 m_State.timestamp = CDVDClock::GetAbsoluteClock(); } -@@ -2331,7 +2334,8 @@ void CDVDPlayer::HandleMessages() +@@ -2334,7 +2337,8 @@ void CDVDPlayer::HandleMessages() // do a seek after rewind, clock is not in sync with current pts if (m_playSpeed < 0 && speed >= 0) { @@ -6142,7 +6142,7 @@ index a845c7e..ad851e9 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -3318,7 +3322,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3321,7 +3325,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -6151,7 +6151,7 @@ index a845c7e..ad851e9 100644 { double startpts; if(accurate) -@@ -3330,19 +3334,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3333,19 +3337,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -6179,7 +6179,7 @@ index a845c7e..ad851e9 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3386,7 +3394,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3389,7 +3397,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -6251,10 +6251,10 @@ index 59c7f09..65dea76 100644 1.8.5.1 -From 4138c27936501a7f0f32168ecbe6079af9eb76e9 Mon Sep 17 00:00:00 2001 +From cf018c04f3a06d47d56da7bb2efd499f472d7287 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 40/89] xrandr: fix query for multiple screens +Subject: [PATCH 40/88] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6295,10 +6295,10 @@ index 4685413..e610150 100644 1.8.5.1 -From 6e490eb3b6f7985c645248dcb97ec97e8218514d Mon Sep 17 00:00:00 2001 +From d94222948ff31b3550ca1b13fc9a8a77172809ae Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 41/89] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 41/88] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6325,10 +6325,10 @@ index 57a8d20..a237dc0 100644 1.8.5.1 -From d1a6ee381382e1932452ee7bf67764536fe52550 Mon Sep 17 00:00:00 2001 +From 945478d00bed09b4310bf8408bdf5a7c88a0e8c9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 42/89] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 42/88] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6353,10 +6353,10 @@ index a237dc0..ab660b1 100644 1.8.5.1 -From ade126254e31ef173ea6786c9ed33152cfb79454 Mon Sep 17 00:00:00 2001 +From 74d2abbbcad0af062021342367893104b64bd46f 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 43/89] x11: support for multiple x screens +Subject: [PATCH 43/88] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6379,10 +6379,10 @@ index e610150..5c53574 100644 1.8.5.1 -From 8ad569e65b7ffcc02dfe6d971448ded360fb1841 Mon Sep 17 00:00:00 2001 +From f855d5b5c64b7e6b6aa42c0810d11a7f27b8e6e5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 44/89] pvr: increase changes counter of stream on stream +Subject: [PATCH 44/88] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6416,10 +6416,10 @@ index e5f8234..96c9e89 100644 1.8.5.1 -From 26e8ade5c24a91d6a2c234cda300125d7746c122 Mon Sep 17 00:00:00 2001 +From 72a70f4174a5e07630b0cfe929cbeb3148dadd92 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 45/89] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 45/88] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6441,10 +6441,10 @@ index a62521f..263cb5a 100644 1.8.5.1 -From 3ef383727ab93fa3fb100fcf39a108fab8d6ccc8 Mon Sep 17 00:00:00 2001 +From 8efb203070ad41a35ec633694cd46b3c6a5ce499 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 46/89] X11: remove toggle full screen after resume +Subject: [PATCH 46/88] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6470,10 +6470,10 @@ index 590a887..35b5a21 100644 1.8.5.1 -From baf120bc4979f421e23947567e176030d40225e0 Mon Sep 17 00:00:00 2001 +From 5098bc43dd0158391ede8318cd288ad0b360a9b5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 47/89] xrandr: set screen on mode change command +Subject: [PATCH 47/88] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6496,10 +6496,10 @@ index 5c53574..4355ef7 100644 1.8.5.1 -From 53b30c168dab6260a28f0e08b5fb6af056c0c670 Mon Sep 17 00:00:00 2001 +From 6256983df53862579334cc230fa949558f93367d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 48/89] X11: recreate glx context when output changes +Subject: [PATCH 48/88] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6550,10 +6550,10 @@ index 3e62cd8..2a1fb41 100644 1.8.5.1 -From 6390f62e82118a8aca1bb41c364637cecc61d743 Mon Sep 17 00:00:00 2001 +From dea87f4e73bd075f4acc9ff2688dd05608708024 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 49/89] pvr: do not show selection dialog for a single menu +Subject: [PATCH 49/88] pvr: do not show selection dialog for a single menu hook --- @@ -6591,10 +6591,10 @@ index 14c9cde..57b18a5 100644 1.8.5.1 -From 4e70f782373dfecad3d1523641ac94d1ad31ad97 Mon Sep 17 00:00:00 2001 +From dda2126879cdb55be9bbf6f1c2a7a22ce38746b0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 50/89] X11: use default screen parameters if no output +Subject: [PATCH 50/88] X11: use default screen parameters if no output connected --- @@ -6698,10 +6698,10 @@ index 4329a22..2adf8a0 100644 1.8.5.1 -From d7b565c23ce6eefe3a3f924f1147f3efe7ffbef1 Mon Sep 17 00:00:00 2001 +From 8d3bc76ace6cc04a07c3dc70bf14bfd01dbcff40 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 51/89] X11: create parent window +Subject: [PATCH 51/88] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6967,10 +6967,10 @@ index 2a1fb41..e8993f1 100644 1.8.5.1 -From 1ac6c3b2f2d4385a5342b3a2bdca345cb75c636e Mon Sep 17 00:00:00 2001 +From 98b63bb8b0816fcfaa33a68e57c294f98bb2e1a2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 52/89] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 52/88] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7172,10 +7172,10 @@ index c69169c..6429291 100644 1.8.5.1 -From 5f64bc85826da93d1fc976c27237edc9ab1b270c Mon Sep 17 00:00:00 2001 +From e761e0a1733c2ec383a7395e9f79509bcfc20776 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 53/89] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 53/88] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7213,20 +7213,20 @@ index c06b8c5..4390d2e 100644 1.8.5.1 -From 717a8039834c98b01da851037f58f15de078cfff Mon Sep 17 00:00:00 2001 +From 1abb45e865141641f0948664d727343ded00ceac Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 54/89] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 54/88] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index e391c0e..ad06062 100644 +index c039d80..73dff34 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2577,7 +2577,8 @@ void COMXPlayer::HandleMessages() +@@ -2580,7 +2580,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -7240,17 +7240,17 @@ index e391c0e..ad06062 100644 1.8.5.1 -From 0f895c66d1b5124735e6a54b1ea23a531126fd24 Mon Sep 17 00:00:00 2001 +From 1479d765c8473e71b0cbaaeb0c0407de0b48015e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 55/89] fix incorrect display of fps when dr kicks in +Subject: [PATCH 55/88] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 1aa5e0f..1f04f7e 100644 +index 8f9536c..28c4ba8 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2254,10 +2254,11 @@ void CApplication::Render() @@ -7270,10 +7270,10 @@ index 1aa5e0f..1f04f7e 100644 1.8.5.1 -From be58b6d6ac97bd42b3acee287a639b83e56e4da9 Mon Sep 17 00:00:00 2001 +From 0ba7f81c400e9ad48cd2de7645904e51e9082a31 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 56/89] X11: fix mouse coverage +Subject: [PATCH 56/88] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7339,10 +7339,10 @@ index e8993f1..5cccfb7 100644 1.8.5.1 -From bef2f3ba30bc2b016b9209dd8b72c0e1decffe48 Mon Sep 17 00:00:00 2001 +From 87491eeb6832203e76c63407e81e4b49e55176e5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 57/89] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 57/88] X11: fix incorrectly used screen num in desktop resolution --- @@ -7377,10 +7377,10 @@ index 2acb36d..101ba98 100644 1.8.5.1 -From 33352b251a0a9a3ada7bdeaecf6a314431693396 Mon Sep 17 00:00:00 2001 +From 8a624e6a020d42c66c994660a56d620bd02980ad Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 58/89] X11: do not overwrite user selected monitor with +Subject: [PATCH 58/88] X11: do not overwrite user selected monitor with fallback --- @@ -7505,10 +7505,10 @@ index 5cccfb7..1b658e2 100644 1.8.5.1 -From cb9466982f167333638fde20ad8b5d01a1679183 Mon Sep 17 00:00:00 2001 +From c9506cf1a42057204566cc5c61117bed584774c5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 59/89] xrandr: add turn on/off to wrapper +Subject: [PATCH 59/88] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7674,10 +7674,10 @@ index d37838a..059062f 100644 1.8.5.1 -From bb2ebac526b481262fb18cb8976c66564d024fbe Mon Sep 17 00:00:00 2001 +From c0607246d149a4f750607da47e2e8aaf47a80194 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 60/89] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 60/88] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7734,10 +7734,10 @@ index 059062f..ab7cc63 100644 1.8.5.1 -From 045cfc6e01ecc50cce3454ad8f72070e55a99070 Mon Sep 17 00:00:00 2001 +From 8a7486ba091f1fb79e2c47ede458d09c81b9a690 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 61/89] X11: multi-head improvement - poll for desired output +Subject: [PATCH 61/88] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7752,10 +7752,10 @@ Subject: [PATCH 61/89] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 0bc9bcd..c842711 100755 +index 3685bd9..c61379c 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6464,7 +6464,7 @@ msgctxt "#14071" +@@ -6469,7 +6469,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -7764,7 +7764,7 @@ index 0bc9bcd..c842711 100755 msgctxt "#14074" msgid "Set timezone" -@@ -6596,7 +6596,12 @@ msgctxt "#14100" +@@ -6601,7 +6601,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -7779,10 +7779,10 @@ index 0bc9bcd..c842711 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 08d0a89..bc55152 100644 +index 8e74f3d..eae71de 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2076,6 +2076,11 @@ +@@ -2085,6 +2085,11 @@ @@ -7794,7 +7794,7 @@ index 08d0a89..bc55152 100644 0 0 -@@ -2128,6 +2133,7 @@ +@@ -2137,6 +2142,7 @@ @@ -8018,10 +8018,10 @@ index 62003f5..8525ede 100644 1.8.5.1 -From d21608c481856f3ba2a1caa7e2e7f3dc3a626821 Mon Sep 17 00:00:00 2001 +From ce4085dcd88fb0bc67cfd79925c2a4cc7f5e9489 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 62/89] X11: ignore mouse move event form other windows +Subject: [PATCH 62/88] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8053,10 +8053,10 @@ index 908c8b6..938ad26 100644 1.8.5.1 -From a160d9304cd95aa57fa3c400d98fff7e6d0fdfba Mon Sep 17 00:00:00 2001 +From edcc8c62bf3180e7ceb82218d17fc3ae750b1e9f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 63/89] renderer: allow some lateness within vblank interval +Subject: [PATCH 63/88] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8116,10 +8116,10 @@ index 949c652b..d84ff6c 100644 1.8.5.1 -From 8e97b2ea19dd4c1b3db778ac5d9ee20e8b3c9d36 Mon Sep 17 00:00:00 2001 +From e463a6c781d76ac9926222a402d9833117fcc541 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 64/89] X11: another fix for mouse coverage +Subject: [PATCH 64/88] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8152,10 +8152,10 @@ index 938ad26..e4ca56d 100644 1.8.5.1 -From b73e0cf7e840ae31c65630941ec159b859137f8a Mon Sep 17 00:00:00 2001 +From 8c661a1abe7549eced2d44aceaacb5221c72c8e2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 65/89] X11: set windows class name +Subject: [PATCH 65/88] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8197,20 +8197,20 @@ index b3fe5102..df5fe9b 100644 1.8.5.1 -From f7d5986074d9c3e386a00f7695162a069f6fc7f6 Mon Sep 17 00:00:00 2001 +From acbddb577b46bc6a8217e3aee2c11f520b974f96 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 66/89] fixed: typo +Subject: [PATCH 66/88] fixed: typo --- language/English/strings.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index c842711..3339cf1 100755 +index c61379c..41ad4ec 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6598,7 +6598,7 @@ msgstr "" +@@ -6603,7 +6603,7 @@ msgstr "" #: xbmc/settings/settings.xml msgctxt "#14101" @@ -8223,17 +8223,17 @@ index c842711..3339cf1 100755 1.8.5.1 -From 2c19023f1e6241cd68a12fc4dab082b768c081ec Mon Sep 17 00:00:00 2001 +From 46a626999e638af0c7f16a515523a4c44520709f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 67/89] ActiveAE: slightly reduce buffer size +Subject: [PATCH 67/88] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 23f0deb..61cf8e9 100644 +index 76e0fa8..eaf59f1 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8251,10 +8251,10 @@ index 23f0deb..61cf8e9 100644 1.8.5.1 -From c141bcbae7a5ca3ac88937d1d1f3f4a4f42378c4 Mon Sep 17 00:00:00 2001 +From 48e5eb12f11b7b06c45e27b0b1c0aa80bddc62b5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 68/89] Revert "vdpau: comment some features that will be added +Subject: [PATCH 68/88] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8310,10 +8310,10 @@ index 3292461..c04f161 100644 1.8.5.1 -From aae5ab05a139cee15218e426f6c20bae8c10d279 Mon Sep 17 00:00:00 2001 +From ff501bb58485df6630954205ea12768ffaca8625 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 69/89] X11: fix keysyms +Subject: [PATCH 69/88] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8336,10 +8336,10 @@ index e4ca56d..b20130c 100644 1.8.5.1 -From 4860eabd68b05e6574449182de5cb438e15ed3da Mon Sep 17 00:00:00 2001 +From 233dd85891ab23733c14cc4ff082c2ac6e2b3627 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 70/89] X11: fix keysym for non-IM +Subject: [PATCH 70/88] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8362,10 +8362,10 @@ index b20130c..a38890c 100644 1.8.5.1 -From 97d076e7fb8026e00038e37854b4c898a023a250 Mon Sep 17 00:00:00 2001 +From 1bdf139e5f1d107111c7d3d1c9f3330c402549c0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 71/89] add some missing multi media keys +Subject: [PATCH 71/88] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8420,10 +8420,10 @@ index ee6bb69..364b45a 100644 1.8.5.1 -From 60e7f0c50d0991307d6c907f8ae014c234a353b9 Mon Sep 17 00:00:00 2001 +From 8c8f071a5bc44b4aa9573e64fa7a8d4c8c5e5ba1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 72/89] X11: squash multi +Subject: [PATCH 72/88] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8446,10 +8446,10 @@ index df5fe9b..d8e04d6 100644 1.8.5.1 -From caaa59c428f770859c0282154aa396494ee2c037 Mon Sep 17 00:00:00 2001 +From 42426f420a6ad65b89f63fb86e54a5a909cb1850 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 73/89] X11: do not poll default monitor +Subject: [PATCH 73/88] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8472,10 +8472,10 @@ index d8e04d6..01f5272 100644 1.8.5.1 -From cb2a7fff52648d8d3c6288ac9568e74989dc239c Mon Sep 17 00:00:00 2001 +From 6e3ae0588d3b10db7c81d889162d6ad88ab76b71 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 74/89] X11: fix broken monitor switching +Subject: [PATCH 74/88] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8483,10 +8483,10 @@ Subject: [PATCH 74/89] X11: fix broken monitor switching 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index bc55152..a3cda66 100644 +index eae71de..9ffa8ea 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2120,7 +2120,6 @@ +@@ -2129,7 +2129,6 @@ -1 @@ -8578,10 +8578,10 @@ index 40bc3b3..1663836 100644 1.8.5.1 -From b8686045a22c2663873b9f823343f015e2b02519 Mon Sep 17 00:00:00 2001 +From 6fa031ba471551aa720db0b0581db18924185796 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 75/89] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 75/88] X11: remove polling for connected outputs, use xrr events --- @@ -8882,10 +8882,10 @@ index 7ec5be4..14622cb 100644 1.8.5.1 -From 7b1f8cc18b0f14cc445634d8744d975f275209be Mon Sep 17 00:00:00 2001 +From fe171e68dc24a86c891789d8e7fb3dc7b5f63a07 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 76/89] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 76/88] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -9003,10 +9003,10 @@ index 14622cb..d1c8729 100644 1.8.5.1 -From fab89ab3e42985729e2cbe1211cea9e1ec8759eb Mon Sep 17 00:00:00 2001 +From b28b20e279b69e9db0bc817f7d752666b2d6b853 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 77/89] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 77/88] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -9032,10 +9032,10 @@ index 695b352..e55583c 100644 1.8.5.1 -From 7f8cde9142f7fc805a5375894ecbe4ba85f01c71 Mon Sep 17 00:00:00 2001 +From cb3d515f6de87bc1549046b29953a28c774e2fb0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 78/89] X11: drop shortcuts, have WM do this +Subject: [PATCH 78/88] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9097,20 +9097,20 @@ index 6429291..4334d21 100644 1.8.5.1 -From e231cf4206bf95a4ac51b06ec3bf7ecedbc1778b Mon Sep 17 00:00:00 2001 +From ede82914a5f9aeb35831a23832b4ffa4a9f63537 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 -Subject: [PATCH 79/89] X11: adapt to new settings +Subject: [PATCH 79/88] X11: adapt to new settings --- system/settings/settings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index a3cda66..89316b0 100644 +index 9ffa8ea..fd9a039 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2080,6 +2080,7 @@ +@@ -2089,6 +2089,7 @@ HAS_GLX 0 false @@ -9122,10 +9122,10 @@ index a3cda66..89316b0 100644 1.8.5.1 -From 113a9dffc6b33334bb2544aca839318b33546c68 Mon Sep 17 00:00:00 2001 +From cbaba8b8a1102711f77e494d90773be1bb2fafa0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 -Subject: [PATCH 80/89] X11: adapt to changes in cstdstring +Subject: [PATCH 80/88] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9173,63 +9173,10 @@ index 8525ede..c94f2e3 100644 1.8.5.1 -From 42220c7c9a5b05c6fbb42c5691ba76c55e2cada2 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Thu, 14 Nov 2013 18:50:57 +0100 -Subject: [PATCH 81/89] dvdplayer: fix failed to get stream message, lookup - streams the same way as getting the index - ---- - xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index ad851e9..60475a3 100644 ---- a/xbmc/cores/dvdplayer/DVDPlayer.cpp -+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -110,7 +110,7 @@ void CSelectionStreams::Clear(StreamType type, StreamSource source) - int count = -1; - for(int i=0;i<(int)m_Streams.size();i++) - { -- if(m_Streams[i].type != type) -+ if(type && m_Streams[i].type != type) - continue; - count++; - if(count == index) --- -1.8.5.1 - - -From 3784778e6b3181f13c030bb717eeda96f2dae063 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Thu, 14 Nov 2013 19:22:01 +0100 -Subject: [PATCH 82/89] omxplayer: fix failed to get stream message - ---- - xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index ad06062..2300372 100644 ---- a/xbmc/cores/omxplayer/OMXPlayer.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -341,7 +341,7 @@ bool COMXSelectionStreams::Get(StreamType type, CDemuxStream::EFlags flag, OMXSe - CSingleLock lock(m_section); - for(int i=0;i<(int)m_Streams.size();i++) - { -- if(m_Streams[i].type != type) -+ if(type && m_Streams[i].type != type) - continue; - if((m_Streams[i].flags & flag) != flag) - continue; --- -1.8.5.1 - - -From 45c060fbefa28d506bd58e1c8efe1f0b9a6bb2b3 Mon Sep 17 00:00:00 2001 +From 41ec2d57870c203245e39e6f5b655baec293903a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 83/89] ActiveAE: correct time of buffered samples by resample +Subject: [PATCH 81/88] ActiveAE: correct time of buffered samples by resample ratio --- @@ -9238,7 +9185,7 @@ Subject: [PATCH 83/89] ActiveAE: correct time of buffered samples by resample 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 61cf8e9..1c5776c 100644 +index eaf59f1..861fb14 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -101,7 +101,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) @@ -9266,10 +9213,10 @@ index c6e1a6e..200dad3 100644 1.8.5.1 -From e961a5a310cbc0d547b86a0203f334a1bbaa0c0c Mon Sep 17 00:00:00 2001 +From 381f8be4f9bfaec506931b2b8c0a1bee21c6345d Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 -Subject: [PATCH 84/89] ffmpeg demuxer: faster channel change for PVR addons +Subject: [PATCH 82/88] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix, Whaupt @@ -9630,10 +9577,10 @@ index ca689d0..f383563 100644 1.8.5.1 -From f69606a60e531d5b388b1f5239b6bb73e5c68893 Mon Sep 17 00:00:00 2001 +From fd5cafe8bae432090bcb8b9314d23e47a3e8973e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 -Subject: [PATCH 85/89] ffmpeg demuxer: make sure we start mpegts video with an +Subject: [PATCH 83/88] ffmpeg demuxer: make sure we start mpegts video with an i-frame --- @@ -9717,10 +9664,10 @@ index acde9a8..9ec0877 100644 1.8.5.1 -From 92640ec9b14ff205723f4ce46153081958e45705 Mon Sep 17 00:00:00 2001 +From 4322ece57cc63f45ff28cb12488cf145fddb2dcd Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 -Subject: [PATCH 86/89] DVDFactoryDemuxer: skip streaminfo for udp tcp and +Subject: [PATCH 84/88] DVDFactoryDemuxer: skip streaminfo for udp tcp and pvr-channels --- @@ -9769,7 +9716,7 @@ index f383563..d6580fd 100644 if(demuxer->Open(pInputStream, streaminfo)) return demuxer.release(); diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp -index 1f44d6f..45a2add 100644 +index 95b8091..515cd5c 100644 --- a/xbmc/utils/URIUtils.cpp +++ b/xbmc/utils/URIUtils.cpp @@ -788,6 +788,36 @@ bool URIUtils::IsFTP(const CStdString& strFile) @@ -9809,7 +9756,7 @@ index 1f44d6f..45a2add 100644 bool URIUtils::IsDAV(const CStdString& strFile) { CStdString strFile2(strFile); -@@ -1249,3 +1279,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) +@@ -1242,3 +1272,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) strFilename = newFilename; return true; } @@ -9844,10 +9791,10 @@ index cf7ea3f..7857c3b 100644 1.8.5.1 -From 9f0d3c00d31dd1a34666b9c553bf98bd12eb3d5b Mon Sep 17 00:00:00 2001 +From c20be22233a3e918372c133b7a08291b637703cb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 22 Dec 2013 14:52:29 +0100 -Subject: [PATCH 87/89] linux: add shared lib for sse4 operations +Subject: [PATCH 85/88] linux: add shared lib for sse4 operations --- Makefile.in | 8 ++- @@ -9862,7 +9809,7 @@ Subject: [PATCH 87/89] linux: add shared lib for sse4 operations create mode 100644 xbmc/linux/sse4/Makefile.in diff --git a/Makefile.in b/Makefile.in -index 76936d4..0890432 100644 +index e62222d..fa34e25 100644 --- a/Makefile.in +++ b/Makefile.in @@ -323,6 +323,12 @@ CHECK_LIBADD=@WAYLAND_TEST_LIBS@ @@ -9888,7 +9835,7 @@ index 76936d4..0890432 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index 7231ff8..dc8e6b8 100644 +index 2056ee1..657bae5 100644 --- a/configure.in +++ b/configure.in @@ -875,6 +875,19 @@ elif test "$use_arch" = "arm"; then @@ -9911,7 +9858,7 @@ index 7231ff8..dc8e6b8 100644 # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_CHOWN -@@ -2573,6 +2586,10 @@ if test "$use_codec_libstagefright" = "yes"; then +@@ -2578,6 +2591,10 @@ if test "$use_codec_libstagefright" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" fi @@ -9922,7 +9869,7 @@ index 7231ff8..dc8e6b8 100644 OUTPUT_FILES="$OUTPUT_FILES \ xbmc/interfaces/python/Makefile \ xbmc/interfaces/python/test/Makefile" -@@ -2647,6 +2664,7 @@ AC_SUBST(USE_ANDROID) +@@ -2652,6 +2669,7 @@ AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) @@ -10142,10 +10089,10 @@ index 0000000..45aa826 1.8.5.1 -From 7e24d4479f9dce205abe2405438762c77088b0ee Mon Sep 17 00:00:00 2001 +From 088bf9dd7c05c2d8816f73f4bd75f348ab7acaec Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 19 Dec 2013 15:36:11 +0100 -Subject: [PATCH 88/89] vaapi: option to enable sw filters +Subject: [PATCH 86/88] vaapi: option to enable sw filters --- language/English/strings.po | 14 +- @@ -10160,10 +10107,10 @@ Subject: [PATCH 88/89] vaapi: option to enable sw filters 9 files changed, 271 insertions(+), 41 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 3339cf1..cf77d48 100755 +index 41ad4ec..3388f8e 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6001,7 +6001,12 @@ msgctxt "#13440" +@@ -6006,7 +6006,12 @@ msgctxt "#13440" msgid "Frame Multi Threaded Decoding (less reliable)" msgstr "" @@ -10177,29 +10124,29 @@ index 3339cf1..cf77d48 100755 #: system/settings/settings.xml msgctxt "#13500" -@@ -14745,7 +14750,12 @@ msgctxt "#36428" - msgid "Record" +@@ -14760,7 +14765,12 @@ msgctxt "#36429" + msgid "Select this if the audio out connection only supports multichannel audio as Dolby Digital 5.1, this allows multichannel audio such as AAC5.1 or FLAC5.1 to be listened to in 5.1 surround sound. Note - transcoding can lead to a reduction in sound quality" msgstr "" --#empty strings from id 36429 to 36499 +-#empty strings from id 36430 to 36499 +#: system/settings/settings.xml -+msgctxt "#36429" ++msgctxt "#36430" +msgid "This option enables the deinterlacing methods available for software decoding. It gives the possiblity to use high quality deinterlacers in combination with VAAPI." +msgstr "" + -+#empty strings from id 36430 to 36499 ++#empty strings from id 36431 to 36499 #end reservation #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 89316b0..c6cba39 100644 +index fd9a039..e0f2016 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -436,6 +436,15 @@ +@@ -445,6 +445,15 @@ true -+ ++ + HAVE_LIBVA + + true @@ -10769,10 +10716,10 @@ index 59c5e40..1227c5c 100644 1.8.5.1 -From d97e9b51f8fc40e3a51d5147f816a85d90a34d0d Mon Sep 17 00:00:00 2001 +From 582994122e3c8338ffc17b8cc385ba7d9fea9c67 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 3 Jan 2014 20:50:46 +0100 -Subject: [PATCH 89/89] X11: check for user output on resize window +Subject: [PATCH 87/88] X11: check for user output on resize window --- xbmc/windowing/X11/WinSystemX11.cpp | 17 ++++++++++++++--- @@ -10816,3 +10763,267 @@ index 9962f08..c95f4ec 100644 -- 1.8.5.1 + +From 790d20dbfca0f2d751179e881f93cc2f244ed7ae Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sat, 18 Jan 2014 13:02:21 +0100 +Subject: [PATCH 88/88] vdpau: map/unmap surfaces on every cycle, requested by + AMD + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 176 +++++++++++++++---------- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 3 +- + 2 files changed, 107 insertions(+), 72 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +index c04f161..d138990 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +@@ -3036,7 +3036,7 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() + m_config.useInteropYuv = false; + m_bufferPool.numOutputSurfaces = NUM_RENDER_PICS; + EnsureBufferPool(); +- GLMapSurfaces(); ++ GLMapSurface(false, procPic.outputSurface); + retPic->sourceIdx = procPic.outputSurface; + retPic->texture[0] = m_bufferPool.glOutputSurfaceMap[procPic.outputSurface].texture[0]; + retPic->texWidth = m_config.outWidth; +@@ -3049,7 +3049,7 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() + else + { + m_config.useInteropYuv = true; +- GLMapSurfaces(); ++ GLMapSurface(true, procPic.videoSurface); + retPic->sourceIdx = procPic.videoSurface; + for (unsigned int i=0; i<4; ++i) + retPic->texture[i] = m_bufferPool.glVideoSurfaceMap[procPic.videoSurface].texture[i]; +@@ -3165,6 +3165,7 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) + return; + } + VdpVideoSurface surf = it->second.sourceVuv; ++ GLUnmapSurface(true, surf); + m_config.videoSurfaces->ClearRender(surf); + } + else if (pic->DVDPic.format == RENDER_FMT_VDPAU) +@@ -3177,6 +3178,7 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) + return; + } + VdpOutputSurface outSurf = it->second.sourceRgb; ++ GLUnmapSurface(false, outSurf); + m_mixer.m_dataPort.SendOutMessage(CMixerDataProtocol::BUFFER, &outSurf, sizeof(outSurf)); + } + } +@@ -3385,95 +3387,127 @@ bool COutput::GLInit() + return true; + } + +-void COutput::GLMapSurfaces() ++void COutput::GLMapSurface(bool yuv, uint32_t source) + { + #ifdef GL_NV_vdpau_interop + +- if (m_config.useInteropYuv) ++ if (yuv) + { +- VdpauBufferPool::GLVideoSurface glSurface; +- VdpVideoSurface surf; +- if (m_config.videoSurfaces->Size() != m_bufferPool.glVideoSurfaceMap.size()) ++ std::map::iterator it; ++ it = m_bufferPool.glVideoSurfaceMap.find(source); ++ if (it == m_bufferPool.glVideoSurfaceMap.end()) + { +- for (unsigned int i = 0; i < m_config.videoSurfaces->Size(); i++) +- { +- surf = m_config.videoSurfaces->GetAtIndex(i); ++ VdpauBufferPool::GLVideoSurface glSurface; ++ VdpVideoSurface surf = source; + +- if (surf == VDP_INVALID_HANDLE) +- continue; ++ if (surf == VDP_INVALID_HANDLE) ++ return; + +- if (m_bufferPool.glVideoSurfaceMap.find(surf) == m_bufferPool.glVideoSurfaceMap.end()) +- { +- glSurface.sourceVuv = surf; +- while (glGetError() != GL_NO_ERROR) ; +- glGenTextures(4, glSurface.texture); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error creating texture"); +- m_vdpError = true; +- } +- glSurface.glVdpauSurface = glVDPAURegisterVideoSurfaceNV(reinterpret_cast(surf), ++ glSurface.sourceVuv = surf; ++ while (glGetError() != GL_NO_ERROR) ; ++ glGenTextures(4, glSurface.texture); ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error creating texture"); ++ m_vdpError = true; ++ } ++ glSurface.glVdpauSurface = glVDPAURegisterVideoSurfaceNV(reinterpret_cast(surf), + GL_TEXTURE_2D, 4, glSurface.texture); + +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error register video surface"); +- m_vdpError = true; +- } +- glVDPAUSurfaceAccessNV(glSurface.glVdpauSurface, GL_READ_ONLY); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error setting access"); +- m_vdpError = true; +- } +- glVDPAUMapSurfacesNV(1, &glSurface.glVdpauSurface); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error mapping surface"); +- m_vdpError = true; +- } +- m_bufferPool.glVideoSurfaceMap[surf] = glSurface; +- if (m_vdpError) +- return; +- CLog::Log(LOGNOTICE, "VDPAU::COutput registered surface"); +- } ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error register video surface"); ++ m_vdpError = true; + } ++ glVDPAUSurfaceAccessNV(glSurface.glVdpauSurface, GL_READ_ONLY); ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error setting access"); ++ m_vdpError = true; ++ } ++ m_bufferPool.glVideoSurfaceMap[surf] = glSurface; ++ ++ CLog::Log(LOGNOTICE, "VDPAU::COutput registered surface"); + } ++ ++ while (glGetError() != GL_NO_ERROR) ; ++ glVDPAUMapSurfacesNV(1, &m_bufferPool.glVideoSurfaceMap[source].glVdpauSurface); ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error mapping surface"); ++ m_vdpError = true; ++ } ++ ++ if (m_vdpError) ++ return; + } + else + { +- if (m_bufferPool.glOutputSurfaceMap.size() != m_bufferPool.numOutputSurfaces) ++ std::map::iterator it; ++ it = m_bufferPool.glOutputSurfaceMap.find(source); ++ if (it == m_bufferPool.glOutputSurfaceMap.end()) + { +- VdpauBufferPool::GLVideoSurface glSurface; +- for (unsigned int i = m_bufferPool.glOutputSurfaceMap.size(); i(m_bufferPool.outputSurfaces[i]), ++ if (m_bufferPool.outputSurfaces[idx] == source) ++ break; ++ } ++ ++ VdpauBufferPool::GLVideoSurface glSurface; ++ glSurface.sourceRgb = m_bufferPool.outputSurfaces[idx]; ++ glGenTextures(1, glSurface.texture); ++ glSurface.glVdpauSurface = glVDPAURegisterOutputSurfaceNV(reinterpret_cast(m_bufferPool.outputSurfaces[idx]), + GL_TEXTURE_2D, 1, glSurface.texture); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error register output surface"); +- m_vdpError = true; +- } +- glVDPAUSurfaceAccessNV(glSurface.glVdpauSurface, GL_READ_ONLY); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error setting access"); +- m_vdpError = true; +- } +- glVDPAUMapSurfacesNV(1, &glSurface.glVdpauSurface); +- if (glGetError() != GL_NO_ERROR) +- { +- CLog::Log(LOGERROR, "VDPAU::COutput error mapping surface"); +- m_vdpError = true; +- } +- m_bufferPool.glOutputSurfaceMap[m_bufferPool.outputSurfaces[i]] = glSurface; +- if (m_vdpError) +- return; ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error register output surface"); ++ m_vdpError = true; ++ } ++ glVDPAUSurfaceAccessNV(glSurface.glVdpauSurface, GL_READ_ONLY); ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error setting access"); ++ m_vdpError = true; + } ++ m_bufferPool.glOutputSurfaceMap[source] = glSurface; + CLog::Log(LOGNOTICE, "VDPAU::COutput registered output surfaces"); + } ++ ++ while (glGetError() != GL_NO_ERROR) ; ++ glVDPAUMapSurfacesNV(1, &m_bufferPool.glOutputSurfaceMap[source].glVdpauSurface); ++ if (glGetError() != GL_NO_ERROR) ++ { ++ CLog::Log(LOGERROR, "VDPAU::COutput error mapping surface"); ++ m_vdpError = true; ++ } ++ ++ if (m_vdpError) ++ return; ++ } ++#endif ++} ++ ++void COutput::GLUnmapSurface(bool yuv, uint32_t source) ++{ ++#ifdef GL_NV_vdpau_interop ++ if (yuv) ++ { ++ std::map::iterator it; ++ it = m_bufferPool.glVideoSurfaceMap.find(source); ++ if (it != m_bufferPool.glVideoSurfaceMap.end()) ++ { ++ glVDPAUUnmapSurfacesNV(1, &(it->second.glVdpauSurface)); ++ } ++ } ++ else ++ { ++ std::map::iterator it; ++ it = m_bufferPool.glVideoSurfaceMap.find(source); ++ if (it != m_bufferPool.glVideoSurfaceMap.end()) ++ { ++ glVDPAUUnmapSurfacesNV(1, &(it->second.glVdpauSurface)); ++ } + } + #endif + } +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h +index 2dd3c28..1f5ff65 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h +@@ -443,7 +443,8 @@ class COutput : private CThread + void PreCleanup(); + void InitMixer(); + bool GLInit(); +- void GLMapSurfaces(); ++ void GLMapSurface(bool yuv, uint32_t source); ++ void GLUnmapSurface(bool yuv, uint32_t source); + void GLUnmapSurfaces(); + bool CheckStatus(VdpStatus vdp_st, int line); + CEvent m_outMsgEvent; +-- +1.8.5.1 +