diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index f5f2e14235..efb346cf2d 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-5cd779b" +PKG_VERSION="13.alpha-4b23e1e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index f9fd196ae6..9d3277e297 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-5cd779b" +PKG_VERSION="13.alpha-4b23e1e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch index 6524ff27ac..0e96e535db 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch @@ -1,7 +1,7 @@ -From 186846d4e45bc6b7e40097ed0fea0f923174e29f Mon Sep 17 00:00:00 2001 +From 6d995e2ac52920ac6ff033a59b97fb720638f549 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/96] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/93] videoplayer: adapt lateness detection and dropping to buffering --- @@ -159,10 +159,10 @@ index f6751f4..fb34463 100644 + virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index a028d5e..e436e5c 100644 +index 9b6a34d..413151d 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -163,6 +163,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() +@@ -164,6 +164,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() m_iLastKeyframe = 0; m_dts = DVD_NOPTS_VALUE; m_started = false; @@ -170,7 +170,7 @@ index a028d5e..e436e5c 100644 } CDVDVideoCodecFFmpeg::~CDVDVideoCodecFFmpeg() -@@ -354,6 +355,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) +@@ -355,6 +356,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) { if( m_pCodecContext ) { @@ -185,7 +185,7 @@ index a028d5e..e436e5c 100644 // i don't know exactly how high this should be set // couldn't find any good docs on it. think it varies // from codec to codec on what it does -@@ -555,6 +564,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -556,6 +565,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p void CDVDVideoCodecFFmpeg::Reset() { m_started = false; @@ -193,7 +193,7 @@ index a028d5e..e436e5c 100644 m_iLastKeyframe = m_pCodecContext->has_b_frames; m_dllAvCodec.avcodec_flush_buffers(m_pCodecContext); -@@ -664,6 +674,22 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -665,6 +675,22 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) else pDvdVideoPicture->pts = DVD_NOPTS_VALUE; @@ -216,7 +216,7 @@ index a028d5e..e436e5c 100644 if(!m_started) pDvdVideoPicture->iFlags |= DVP_FLAG_DROPPED; -@@ -923,3 +949,8 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() +@@ -924,3 +950,8 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() else return 0; } @@ -584,10 +584,10 @@ index f8ad541..186e271 100644 1.9.0 -From 1f20d20f59a29698e21cabce118341544774cdcd Mon Sep 17 00:00:00 2001 +From 63a09309c976039ac24b94d6d083da4e88c13291 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/96] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/93] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -655,10 +655,10 @@ index 186e271..59c7f09 100644 1.9.0 -From f242458c50815491a4c0cc17ba72351e8b24c1df Mon Sep 17 00:00:00 2001 +From bbce2138fe94e96958aaf77af22f7f17b58089ad Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/96] videoplayer: some rework and documentation +Subject: [PATCH 03/93] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 28 ++++++++++++++++++++-- @@ -717,10 +717,10 @@ index fb34463..ecd325c 100644 virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index e436e5c..18e8828 100644 +index 413151d..b59c1ee 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -950,6 +950,17 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() +@@ -951,6 +951,17 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() return 0; } @@ -768,10 +768,10 @@ index 1d29b6f..ee07f30 100644 1.9.0 -From 1008e1351410f06cd263bae89e7083ea1f6f2069 Mon Sep 17 00:00:00 2001 +From 3a09b4d089e8bf71f601dde9606e1f15dfb92a1a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/96] renderer: bump buffers to 5 +Subject: [PATCH 04/93] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -794,10 +794,10 @@ index dc2712a..9edfbd4 100644 1.9.0 -From 9d551309514bf57a6f0195610e6bf3324eb70ed5 Mon Sep 17 00:00:00 2001 +From 260842a6cee74dc6f2b6561a9228d6f5631fb98c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/96] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/93] videoplayer: update frametime, it might change due to fps detection --- @@ -821,10 +821,10 @@ index ee07f30..b3175cd 100644 1.9.0 -From aa554d9421a2f7753c325910c34d41a6bae71e33 Mon Sep 17 00:00:00 2001 +From 839923110254df4db9d4d767455c80a6762d3b27 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/96] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/93] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -848,10 +848,10 @@ index b3175cd..9c36bdb 100644 1.9.0 -From 417f2f953475ca870f1275fa3388edd6fc8ae313 Mon Sep 17 00:00:00 2001 +From 4a594b29c3ee7153ca848940fec14e49f52f78be Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/96] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/93] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -859,10 +859,10 @@ Subject: [PATCH 07/96] 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 380dcdc..0a46909 100644 +index b056c8b..0d2b4ae 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1649,7 +1649,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1633,7 +1633,7 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 @@ -871,7 +871,7 @@ index 380dcdc..0a46909 100644 && m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts() && m_SpeedState.lasttime != GetTime()) { -@@ -2310,6 +2310,12 @@ void CDVDPlayer::HandleMessages() +@@ -2294,6 +2294,12 @@ void CDVDPlayer::HandleMessages() pvrinputstream->Pause( speed == 0 ); } @@ -888,10 +888,10 @@ index 380dcdc..0a46909 100644 1.9.0 -From 265d000e6b14ea852ea1b7edd07b19724fa04c48 Mon Sep 17 00:00:00 2001 +From 02e0f1052593811983b5376300cdcd676d990891 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/96] X11: ditch SDL for video and window events +Subject: [PATCH 08/93] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -2428,10 +2428,10 @@ index b1464d0..34b912f 100644 1.9.0 -From dc063d452595ef255ff1c453385bb9b927c0e41f Mon Sep 17 00:00:00 2001 +From e4685435e33a7b98b26d7c1cf59fb46b766ac9c3 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/96] X11: Add xbmc icon +Subject: [PATCH 09/93] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2621,10 +2621,10 @@ index 34b912f..352e90e 100644 1.9.0 -From 4ce7602a49355991e325f143e83bf7b0b5ccc400 Mon Sep 17 00:00:00 2001 +From 061c454eb3d8dea611c41de3d1d993731488844c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/96] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/93] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2678,10 +2678,10 @@ index ad58aad..6f57a87 100644 1.9.0 -From a2469d77321bc22006adfe65bff59c704d8b20e7 Mon Sep 17 00:00:00 2001 +From 69d4934a7b5d81372783947565484c86b322ab8f Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/96] X11: factor out code handling device reset notification +Subject: [PATCH 11/93] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2744,10 +2744,10 @@ index 352e90e..3f91b9b 100644 1.9.0 -From b372167f2dc824c26154bbab4eaa5a5e6a3bcd66 Mon Sep 17 00:00:00 2001 +From bcbe81546fe3722a45901253c2266daa90eef526 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/96] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/93] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2891,10 +2891,10 @@ index 304dac8..16b13aa 100644 1.9.0 -From 9e4fa8328448cc3e6fa53bd812f27b524434777a Mon Sep 17 00:00:00 2001 +From 666229e1c04fca7c780dfcfa28c86b13da05cec8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/96] xrandr: remove method RestoreState +Subject: [PATCH 13/93] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2973,10 +2973,10 @@ index 0aec487..00b49dc 100644 1.9.0 -From 4a3986400273ec0e5bf3963fd327570be38552eb Mon Sep 17 00:00:00 2001 +From fc6f8d406eda6a82002ebf474027087719e05a61 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/96] xrandr: observe orientation +Subject: [PATCH 14/93] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3191,10 +3191,10 @@ index 00b49dc..508604d 100644 1.9.0 -From 51af3d3ec746d0fab968f6db2ee43e9bb20be236 Mon Sep 17 00:00:00 2001 +From b13aaeb00759685f1dcd64b20818ecb8e97e3e2f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/96] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/93] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3369,10 +3369,10 @@ index 508604d..d37838a 100644 1.9.0 -From 06fe661c4965efd3d3a73dd98700098cda7bdc79 Mon Sep 17 00:00:00 2001 +From 014a369b992517921bc18a0b12d2f529ce98cb18 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/96] X11: fix multi-head setups +Subject: [PATCH 16/93] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3387,7 +3387,7 @@ Subject: [PATCH 16/96] 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 e443e7b..806d138 100755 +index a6f728d..1128097 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3402,12 +3402,12 @@ index e443e7b..806d138 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 51ebd16..a96e659 100644 +index ca2ac56..266d04d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2163,6 +2163,15 @@ +@@ -2250,6 +2250,15 @@
- + + + HAS_GLX @@ -3421,7 +3421,7 @@ index 51ebd16..a96e659 100644 0 0 -@@ -2184,6 +2193,7 @@ +@@ -2271,6 +2280,7 @@ -1 @@ -3429,7 +3429,7 @@ index 51ebd16..a96e659 100644 -@@ -2201,6 +2211,7 @@ +@@ -2288,6 +2298,7 @@ -1 @@ -4131,10 +4131,10 @@ index 4175aab..94584ab 100644 1.9.0 -From fd6f32fc932cd0c0baef515f9a068dd185e38128 Mon Sep 17 00:00:00 2001 +From 4fa6d100e96a115d7b012e09da7fbbba3df194ce Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/96] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/93] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4202,10 +4202,10 @@ index 6383754..21e7dc5 100644 1.9.0 -From 340900ab09c894d0880de7b1ae9fe50fc52e4845 Mon Sep 17 00:00:00 2001 +From 4f64f4ad422d85844663ae7c69ea54ed68a993c2 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/96] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/93] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4277,10 +4277,10 @@ index 0b3950a..ca43b5a 100644 1.9.0 -From 5b5b9601ec91aaa65540aad628981dc0b4f4b8d2 Mon Sep 17 00:00:00 2001 +From b2036fc72c741d2b989918a1b9b16f2a0469875e Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/96] X11: recreate gl context after output has changed +Subject: [PATCH 19/93] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4431,10 +4431,10 @@ index 21e7dc5..8e68d5d 100644 1.9.0 -From 89caeeb759cc62b23960d7b39c8029717e8cf7eb Mon Sep 17 00:00:00 2001 +From ef49b49e2350afff171e005235a1e747a63ad24e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/96] X11: hook video reference clock in windowing +Subject: [PATCH 20/93] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4639,10 +4639,10 @@ index dd65a1b..afd71fc 100644 1.9.0 -From 358f10e1ff2d809ff0c04c6e722017c05287aad7 Mon Sep 17 00:00:00 2001 +From 52ee3a13d512cbdcb6d2f5cfb6e55dd64bde0f73 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/96] X11: fix video calibrations +Subject: [PATCH 21/93] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4734,10 +4734,10 @@ index 9666cc3..5b52d6c 100644 1.9.0 -From 29742330c0ba30bccbea0b1f13405f851475e7c9 Mon Sep 17 00:00:00 2001 +From 47feaa464ce70fa0676484a3296a47d00f8318b2 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/96] X11: deactivate screen saver on startup +Subject: [PATCH 22/93] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4807,10 +4807,10 @@ index 5b52d6c..b2bd5a0 100644 1.9.0 -From 9ea925efcf4e60191d318d8aad4c69d67d4f065e Mon Sep 17 00:00:00 2001 +From 980487ffefff62b98e831514ad8766a182df306d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/96] X11: change method of going full-screen +Subject: [PATCH 23/93] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4854,10 +4854,10 @@ index b76b229..869baa8 100644 1.9.0 -From bcfabf400d6934b955bf58c968bd6f8b12a77759 Mon Sep 17 00:00:00 2001 +From 0a3e66dd35dff6170952e682ac72c4cd937ed17f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/96] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/93] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4889,10 +4889,10 @@ index d98f12f..743aca9 100644 1.9.0 -From b307832e330fee860e86e64ede8a26cc81f8ad7e Mon Sep 17 00:00:00 2001 +From 029d7ccfec57ce79cfd5dc8ec2fb50b77a813573 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/96] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/93] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5109,10 +5109,10 @@ index a412f32..9a8a912 100644 1.9.0 -From e4b791f60cf0f1d5ef585b2abb518c14e66836cb Mon Sep 17 00:00:00 2001 +From 9bae770b4a3a4293bed3235eee0947ecd3c614e1 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/96] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/93] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5176,10 +5176,10 @@ index 9a8a912..c69169c 100644 1.9.0 -From a6c4bc69cdf3863ec66a59f566ec9230d4ebc94f Mon Sep 17 00:00:00 2001 +From a48fce49dc5bd7108a0c704a0008a9eea5818f94 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/96] add missing keys to xbmc keytable +Subject: [PATCH 27/93] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5202,10 +5202,10 @@ index d57f4d3..b807897 100644 1.9.0 -From 2b548e32d6b59f82934f81bad68bff8e72defae4 Mon Sep 17 00:00:00 2001 +From 52c6703bbd3dc358fe113699559183fe51d65980 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/96] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/93] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5228,10 +5228,10 @@ index 0ddf102..3ae7107 100644 1.9.0 -From 59cdaeddac31bc29c0acced61f21fa44eb803e23 Mon Sep 17 00:00:00 2001 +From 45a51e95d4600b9e3ed2d15ed0de4f1aa984617c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/96] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/93] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5262,10 +5262,10 @@ index 3ae7107..27bebde 100644 1.9.0 -From 82f74ea1e007c11fb0567ed8e2900059b3d4c05e Mon Sep 17 00:00:00 2001 +From a6595467231318cdceaf0aebc08304cdb7f2bf99 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/96] X11: fix icon texture after +Subject: [PATCH 30/93] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5373,10 +5373,10 @@ index 869baa8..bfe3797 100644 1.9.0 -From f67e6f4729a2a57079d52c0bd4178544f900b4e4 Mon Sep 17 00:00:00 2001 +From 83250d9286f439244dd15b1028b1a71fcfda725c Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/96] X11: check for window manager +Subject: [PATCH 31/93] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5497,10 +5497,10 @@ index b2bd5a0..3e62cd8 100644 1.9.0 -From 0023530fb8dac8ab1e7dbc7285012febae3ebac8 Mon Sep 17 00:00:00 2001 +From 7d061e27372dcecdaf1299d49d75d2a508f18ef7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/96] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/93] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5537,10 +5537,10 @@ index af82061..4f33c68 100644 1.9.0 -From 9ff4898ad03d8c5c9afa8b7fcea0c2cde04847ca Mon Sep 17 00:00:00 2001 +From 5a5f6b8f687b0674c4df960a77a20f627712cd5d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/96] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/93] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5564,10 +5564,10 @@ index 4f33c68..bc4e963 100644 1.9.0 -From 1a757becb165f7a0c526356b333723369e830cdf Mon Sep 17 00:00:00 2001 +From a84806823b9b4d6bf953f98a0ee7e8f3bfb8235b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/96] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/93] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5590,10 +5590,10 @@ index bc4e963..57a8d20 100644 1.9.0 -From b3f4959dac57e6ab84e1c16ca2a0137e412ef0a0 Mon Sep 17 00:00:00 2001 +From 71591eb3ddbb0a257e1a84c579e40eca67c46752 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 35/96] dvdplayer: observe pts counter overflow +Subject: [PATCH 35/93] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 197 ++++++++++++++++++++- @@ -5876,10 +5876,10 @@ index aef5ab1..35abbdf 100644 1.9.0 -From 0108b59694665b5144a7e251f6154dff2d8b3d1f Mon Sep 17 00:00:00 2001 +From 34d117c6bbdf47b7fd5f84bc1be9f07fe1adf573 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 36/96] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 36/93] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5912,10 +5912,10 @@ index 9c36bdb..322a581 100644 1.9.0 -From 4d59e64f83a1f6f6e9c1eabf1570fac2d260b966 Mon Sep 17 00:00:00 2001 +From 59b4035ad0e5d2892c715478ac1920d1f757354d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 37/96] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 37/93] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -5924,10 +5924,10 @@ Subject: [PATCH 37/96] vdpau: advanced settings for auto deinterlacing 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 -index 98183a2..30ccc3f 100644 +index b4d2d38..cd72cc6 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1971,10 +1971,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) +@@ -1987,10 +1987,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) if (method == VS_INTERLACEMETHOD_AUTO) { int deint = -1; @@ -5943,7 +5943,7 @@ index 98183a2..30ccc3f 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index e21d21e..c7a5ff9 100644 +index eff43dd..7532914 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -163,6 +163,8 @@ void CAdvancedSettings::Initialize() @@ -5955,7 +5955,7 @@ index e21d21e..c7a5ff9 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -598,6 +600,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -600,6 +602,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"disablehi10pmultithreading",m_videoDisableHi10pMultithreading); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -5965,7 +5965,7 @@ index e21d21e..c7a5ff9 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 1e54c93..6497592 100644 +index 3995f35..c43351d 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -160,6 +160,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -5981,10 +5981,10 @@ index 1e54c93..6497592 100644 1.9.0 -From e0c50ef3e3a2f14ad20335b52b4ea1fd6598cceb Mon Sep 17 00:00:00 2001 +From 9e42a707cbc6aaadec575f6664c3c3b279a3828b Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 38/96] player: fix rewind +Subject: [PATCH 38/93] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6032,10 +6032,10 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 0a46909..467a0f6 100644 +index 0d2b4ae..a4c0422 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1650,11 +1650,13 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1634,11 +1634,13 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 && (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file @@ -6050,7 +6050,7 @@ index 0a46909..467a0f6 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 -@@ -1673,7 +1675,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1657,7 +1659,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); @@ -6059,7 +6059,7 @@ index 0a46909..467a0f6 100644 } } } -@@ -2159,7 +2161,7 @@ void CDVDPlayer::HandleMessages() +@@ -2143,7 +2145,7 @@ void CDVDPlayer::HandleMessages() else m_StateInput.dts = start; @@ -6068,7 +6068,7 @@ index 0a46909..467a0f6 100644 } else CLog::Log(LOGWARNING, "error while seeking"); -@@ -2295,9 +2297,10 @@ void CDVDPlayer::HandleMessages() +@@ -2279,9 +2281,10 @@ void CDVDPlayer::HandleMessages() double offset; offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -6080,7 +6080,7 @@ index 0a46909..467a0f6 100644 m_State.timestamp = CDVDClock::GetAbsoluteClock(); } -@@ -2313,7 +2316,8 @@ void CDVDPlayer::HandleMessages() +@@ -2297,7 +2300,8 @@ void CDVDPlayer::HandleMessages() // do a seek after rewind, clock is not in sync with current pts if (m_playSpeed < 0 && speed >= 0) { @@ -6090,7 +6090,7 @@ index 0a46909..467a0f6 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -3309,7 +3313,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3293,7 +3297,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -6099,7 +6099,7 @@ index 0a46909..467a0f6 100644 { double startpts; if(accurate) -@@ -3321,19 +3325,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3305,19 +3309,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -6127,7 +6127,7 @@ index 0a46909..467a0f6 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3377,7 +3385,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3361,7 +3369,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -6199,10 +6199,10 @@ index 59c7f09..65dea76 100644 1.9.0 -From 78e3f42d46ade0753afba396e450e851501853cc Mon Sep 17 00:00:00 2001 +From f8f6b614c3a886de6328dbdec8543b490c42f0f4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 39/96] xrandr: fix query for multiple screens +Subject: [PATCH 39/93] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6243,10 +6243,10 @@ index 4685413..e610150 100644 1.9.0 -From bd067117f118fe57436c8da319a79f66d9b9056f Mon Sep 17 00:00:00 2001 +From dd8a0081a0d6f7dda3ff0bc0e60fa73944233f9e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 40/96] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 40/93] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6273,10 +6273,10 @@ index 57a8d20..a237dc0 100644 1.9.0 -From 7eb638440d25b703367baee7e3bd827ad038cd35 Mon Sep 17 00:00:00 2001 +From c93f9c8b9bd991554a0b960fd80defa2041f26d8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 41/96] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 41/93] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6301,10 +6301,10 @@ index a237dc0..ab660b1 100644 1.9.0 -From c5982ff87c815bc68bc38853f83c75b6b39b8257 Mon Sep 17 00:00:00 2001 +From 42b4a5b8e94111bb05bb1ab60335fd605e8d7fbd 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 42/96] x11: support for multiple x screens +Subject: [PATCH 42/93] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6327,10 +6327,10 @@ index e610150..5c53574 100644 1.9.0 -From 285767c47d14feafc1c112017e65f931c74f6ddb Mon Sep 17 00:00:00 2001 +From dc8f15aae442cee00abc56fff0080b3d9a881943 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 43/96] pvr: increase changes counter of stream on stream +Subject: [PATCH 43/93] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6364,10 +6364,10 @@ index e5f8234..96c9e89 100644 1.9.0 -From 232f2cc9d65a5c6ed1a878784d67b10e15f1254d Mon Sep 17 00:00:00 2001 +From 965a856af891ac978087da0d0389a007628bd212 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 44/96] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 44/93] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6389,10 +6389,10 @@ index a62521f..263cb5a 100644 1.9.0 -From 54794b6719b785fc2dc55e300e2627cc0d03caac Mon Sep 17 00:00:00 2001 +From 05f583684acabf689937a641be576a907814565b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 45/96] X11: remove toggle full screen after resume +Subject: [PATCH 45/93] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6418,10 +6418,10 @@ index 590a887..35b5a21 100644 1.9.0 -From d0455b55bd656f05d09fd902e897ffd941e9e25d Mon Sep 17 00:00:00 2001 +From 42834ae0edcd11fd7039880e62b56ef2a1b4bb14 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 46/96] xrandr: set screen on mode change command +Subject: [PATCH 46/93] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6444,10 +6444,10 @@ index 5c53574..4355ef7 100644 1.9.0 -From 0e78877e11cd6a1fd0aa8460b4db59a83566daba Mon Sep 17 00:00:00 2001 +From b3f922afbc17cd683d33091b26383f3e1c189f47 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 47/96] X11: recreate glx context when output changes +Subject: [PATCH 47/93] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6498,10 +6498,10 @@ index 3e62cd8..2a1fb41 100644 1.9.0 -From d47a1358ee7a56281db2f17a81f5f4b0b56d62bd Mon Sep 17 00:00:00 2001 +From 3783c2f4cea0e6a1455b2bd636f8cace67e9b966 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 48/96] pvr: do not show selection dialog for a single menu +Subject: [PATCH 48/93] pvr: do not show selection dialog for a single menu hook --- @@ -6539,10 +6539,10 @@ index 14c9cde..57b18a5 100644 1.9.0 -From 79ad7add02d6d3bde40618fe99235e33d802924d Mon Sep 17 00:00:00 2001 +From e012a40e09185b0b5d4a8c1092a48efeba847c64 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 49/96] X11: use default screen parameters if no output +Subject: [PATCH 49/93] X11: use default screen parameters if no output connected --- @@ -6646,10 +6646,10 @@ index 4329a22..2adf8a0 100644 1.9.0 -From cde28d04deea80cfff87e8438565820cd610a56e Mon Sep 17 00:00:00 2001 +From f467318e5b733985251b1293d21322de193ef70e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 50/96] X11: create parent window +Subject: [PATCH 50/93] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6915,10 +6915,10 @@ index 2a1fb41..e8993f1 100644 1.9.0 -From a13160c00eccaa1b09beb49241fc3d73f862a92e Mon Sep 17 00:00:00 2001 +From e29d6510a9e339217d8337bca3c8bdef1393b78e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 51/96] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 51/93] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7120,10 +7120,10 @@ index c69169c..6429291 100644 1.9.0 -From 3fe6a47b76c6147862818f0a4abb7605d4fddb66 Mon Sep 17 00:00:00 2001 +From 9300916d68d9c2f18bd2d9e6d4f4e47662359349 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 52/96] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 52/93] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7161,20 +7161,20 @@ index c06b8c5..4390d2e 100644 1.9.0 -From 32417e43d5670b5c7ac07d6c9d3925cd9c05b1f3 Mon Sep 17 00:00:00 2001 +From 75ee5287846f375a218358d5f8fc65b0bc53dcc3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 53/96] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 53/93] 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 2b9f94b..d3b01d0 100644 +index a3d3928..7b81178 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2572,7 +2572,8 @@ void COMXPlayer::HandleMessages() +@@ -2556,7 +2556,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -7188,10 +7188,10 @@ index 2b9f94b..d3b01d0 100644 1.9.0 -From 234390062853ae10b396d9ba9f14c5e5d747e1fd Mon Sep 17 00:00:00 2001 +From d0c386be52469fc4f2e2a43b46c664eab48cd46b Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 54/96] fix incorrect display of fps when dr kicks in +Subject: [PATCH 54/93] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -7218,10 +7218,10 @@ index 43c4517..4131707 100644 1.9.0 -From 15cda4c4a401b540c8c8345e4111c5926aa3e104 Mon Sep 17 00:00:00 2001 +From 15a1340b58e57e90f481224244dd2fefdf456f6f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 55/96] X11: fix mouse coverage +Subject: [PATCH 55/93] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7287,10 +7287,10 @@ index e8993f1..5cccfb7 100644 1.9.0 -From 272a94560b0fd3b31e64851c791ebb0f94bcf753 Mon Sep 17 00:00:00 2001 +From 54f348dfd44e945a02b11464dd84dfa9126f6c30 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 56/96] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 56/93] X11: fix incorrectly used screen num in desktop resolution --- @@ -7325,10 +7325,10 @@ index 2acb36d..101ba98 100644 1.9.0 -From 8c6efe872230a07ff7805f21c20f3acecff5aaf4 Mon Sep 17 00:00:00 2001 +From 66bbbabb167c0dd28f09b205693ec9e5f89c7b1e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 57/96] X11: do not overwrite user selected monitor with +Subject: [PATCH 57/93] X11: do not overwrite user selected monitor with fallback --- @@ -7453,10 +7453,10 @@ index 5cccfb7..1b658e2 100644 1.9.0 -From e86b5d5d7f6059e3128dbcb39916d3e648085fe0 Mon Sep 17 00:00:00 2001 +From 23ad4fdc950d4fb25476e7dc48cb2f63c101c0ea Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 58/96] xrandr: add turn on/off to wrapper +Subject: [PATCH 58/93] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7622,10 +7622,10 @@ index d37838a..059062f 100644 1.9.0 -From e4d94513463a7cf658a6b7a43e845901f2d9539a Mon Sep 17 00:00:00 2001 +From 493d5d0b83a9d1dc26b4346d6ceb38036398e8c5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 59/96] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 59/93] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7682,28 +7682,28 @@ index 059062f..ab7cc63 100644 1.9.0 -From 4a4a2b2bcf841ed81da78f1370a3399aeeabdc5b Mon Sep 17 00:00:00 2001 +From e6fcc6e6055a015c7d05014ddac5b0d72ea5d33b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 60/96] X11: multi-head improvement - poll for desired output +Subject: [PATCH 60/93] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- language/English/strings.po | 9 +++- - system/settings/settings.xml | 6 +++ + system/settings/settings.xml | 8 +++- xbmc/settings/DisplaySettings.cpp | 4 ++ xbmc/windowing/WinEventsX11.cpp | 6 +++ xbmc/windowing/WinEventsX11.h | 1 + xbmc/windowing/X11/WinSystemX11.cpp | 83 +++++++++++++++++++++++++++++++++---- xbmc/windowing/X11/WinSystemX11.h | 2 +- xbmc/windowing/X11/XRandR.cpp | 6 ++- - 8 files changed, 105 insertions(+), 12 deletions(-) + 8 files changed, 106 insertions(+), 13 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 806d138..ca0e122 100755 +index 1128097..d59a911 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6537,7 +6537,7 @@ msgctxt "#14071" +@@ -6556,7 +6556,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -7712,41 +7712,50 @@ index 806d138..ca0e122 100755 msgctxt "#14074" msgid "Set timezone" -@@ -6669,7 +6669,12 @@ msgctxt "#14100" - msgid "Stop ripping CD" +@@ -6694,7 +6694,12 @@ msgctxt "#14101" + msgid "Acceleration" msgstr "" --#empty strings from id 14101 to 15011 +-#empty strings from id 14102 to 15011 +#: xbmc/settings/settings.xml -+msgctxt "#14101" -+msgid "Swtich off other Monitor" ++msgctxt "#14102" ++msgid "Switch off other Monitor" +msgstr "" + -+#empty strings from id 14102 to 15011 ++#empty strings from id 14103 to 15011 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index a96e659..d2eeb01 100644 +index 266d04d..9c92f06 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2172,6 +2172,11 @@ +@@ -2251,7 +2251,7 @@ + + + +- HAS_GLX ++ HAS_GLX + 0 + Default + +@@ -2259,6 +2259,11 @@ -+ -+ HAS_GLX ++ ++ HAS_GLX + 0 + false + 0 0 -@@ -2224,6 +2229,7 @@ +@@ -2311,6 +2316,7 @@ - -+ !HAS_GLX + ++ !HAS_GLX 1 false @@ -7966,10 +7975,10 @@ index 62003f5..8525ede 100644 1.9.0 -From 7848ef437555ea93ef71b185afda2c18d294ba62 Mon Sep 17 00:00:00 2001 +From 067e1b1b721ca74a291a06994f81bc7862bd9530 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 61/96] X11: ignore mouse move event form other windows +Subject: [PATCH 61/93] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8001,10 +8010,10 @@ index 908c8b6..938ad26 100644 1.9.0 -From 0a33b2ca8d64414e8dd1862ad6b38ff69f520aec Mon Sep 17 00:00:00 2001 +From c9549a9541027758de0a1dd0d2c517be08949014 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 62/96] renderer: allow some lateness within vblank interval +Subject: [PATCH 62/93] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8064,10 +8073,10 @@ index 949c652..d84ff6c 100644 1.9.0 -From 3a2a817f5c8fee5c704d3ac640cda60d78c62977 Mon Sep 17 00:00:00 2001 +From 265e2a849d38e43bc09e999efcaf131c4fc6f20c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 63/96] X11: another fix for mouse coverage +Subject: [PATCH 63/93] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8100,10 +8109,10 @@ index 938ad26..e4ca56d 100644 1.9.0 -From 4846c1020c294846511306fbc03dfccd86819c37 Mon Sep 17 00:00:00 2001 +From ddc72a682a75d4ad792c4992b2957a6fe6fe80b0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 64/96] X11: set windows class name +Subject: [PATCH 64/93] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8145,43 +8154,17 @@ index b3fe510..df5fe9b 100644 1.9.0 -From 417c34da11ddf95411cba8c3f5b5eafbccdff821 Mon Sep 17 00:00:00 2001 -From: spiff -Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 65/96] 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 ca0e122..59eb97d 100755 ---- a/language/English/strings.po -+++ b/language/English/strings.po -@@ -6671,7 +6671,7 @@ msgstr "" - - #: xbmc/settings/settings.xml - msgctxt "#14101" --msgid "Swtich off other Monitor" -+msgid "Switch off other Monitor" - msgstr "" - - #empty strings from id 14102 to 15011 --- -1.9.0 - - -From 12ee5510a221f8a1a8d0b31976a48d2cb37790af Mon Sep 17 00:00:00 2001 +From 7d1b27fca2785e524b6aa4425b793f9f969011f5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 66/96] ActiveAE: slightly reduce buffer size +Subject: [PATCH 65/93] 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 c871ee8..99bc37a 100644 +index 786a489..95ef5ed 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ using namespace ActiveAE; @@ -8199,10 +8182,10 @@ index c871ee8..99bc37a 100644 1.9.0 -From 1146424f9fba6862bd7a1ad856039da9faf8b5d2 Mon Sep 17 00:00:00 2001 +From a06ea02e30e9764e3e262530f9b0f59315d53381 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 67/96] Revert "vdpau: comment some features that will be added +Subject: [PATCH 66/93] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8211,10 +8194,10 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 30ccc3f..f414221 100644 +index cd72cc6..351586a 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1101,8 +1101,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) +@@ -1117,8 +1117,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) m_bufferStats.IncDecoded(); m_vdpauOutput.m_dataPort.SendOutMessage(COutputDataProtocol::NEWFRAME, &pic, sizeof(pic)); @@ -8224,7 +8207,7 @@ index 30ccc3f..f414221 100644 } int retval = 0; -@@ -2295,8 +2294,7 @@ void CMixer::InitCycle() +@@ -2311,8 +2310,7 @@ void CMixer::InitCycle() int flags; uint64_t latency; m_config.stats->GetParams(latency, flags); @@ -8234,7 +8217,7 @@ index 30ccc3f..f414221 100644 SetPostProcFeatures(false); else SetPostProcFeatures(true); -@@ -2308,8 +2306,7 @@ void CMixer::InitCycle() +@@ -2324,8 +2322,7 @@ void CMixer::InitCycle() bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED; m_SeenInterlaceFlag |= interlaced; @@ -8244,7 +8227,7 @@ index 30ccc3f..f414221 100644 (mode == VS_DEINTERLACEMODE_FORCE || (mode == VS_DEINTERLACEMODE_AUTO && interlaced))) { -@@ -2331,8 +2328,7 @@ void CMixer::InitCycle() +@@ -2347,8 +2344,7 @@ void CMixer::InitCycle() m_config.stats->SetCanSkipDeint(true); } @@ -8258,10 +8241,10 @@ index 30ccc3f..f414221 100644 1.9.0 -From 234aceef4f04fcdc4f6dab95d9a52c7a69adb74d Mon Sep 17 00:00:00 2001 +From c8a728ed4dcfc7f2dd2ee79517a924cf39044eab Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 68/96] X11: fix keysyms +Subject: [PATCH 67/93] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8284,10 +8267,10 @@ index e4ca56d..b20130c 100644 1.9.0 -From c9025a3bd86f00cd92a624612f0252465f4110cd Mon Sep 17 00:00:00 2001 +From 4f2c99511eb6939bf37a376c5e192a03b99095ec Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 69/96] X11: fix keysym for non-IM +Subject: [PATCH 68/93] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8310,10 +8293,10 @@ index b20130c..a38890c 100644 1.9.0 -From 7e9e644e31944cd12999c1847367c24b17b01427 Mon Sep 17 00:00:00 2001 +From 1955acf3348b31b8c03661d8010f1af89eaef40f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 70/96] add some missing multi media keys +Subject: [PATCH 69/93] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8368,10 +8351,10 @@ index ee6bb69..364b45a 100644 1.9.0 -From 1102b59f067d340177d900c0348d25d4ebf28bbc Mon Sep 17 00:00:00 2001 +From aa6083b7570ef1328dd1e15d98939c37550f90cb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 71/96] X11: squash multi +Subject: [PATCH 70/93] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8394,10 +8377,10 @@ index df5fe9b..d8e04d6 100644 1.9.0 -From add7ab11cb0c795138bb350aebbaf705960a8a84 Mon Sep 17 00:00:00 2001 +From 968e5eda232187ec4ba1ffdbbb903d49d1ae8367 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 72/96] X11: do not poll default monitor +Subject: [PATCH 71/93] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8420,10 +8403,10 @@ index d8e04d6..01f5272 100644 1.9.0 -From bdbaef8fb2cf3d8797d683892b51adb74cdd626f Mon Sep 17 00:00:00 2001 +From ab1810912f5153a08b007af95f89ab9a7ffcc2f6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 73/96] X11: fix broken monitor switching +Subject: [PATCH 72/93] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8431,10 +8414,10 @@ Subject: [PATCH 73/96] 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 d2eeb01..6865718 100644 +index 9c92f06..d9b235b 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2216,7 +2216,6 @@ +@@ -2303,7 +2303,6 @@ -1 @@ -8526,10 +8509,10 @@ index 40bc3b3..1663836 100644 1.9.0 -From 4284c9da6feab81bfd2675c8b0cbee8defcbe579 Mon Sep 17 00:00:00 2001 +From ef9f84f7559d181c417a9101484e2ae03b776697 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 74/96] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 73/93] X11: remove polling for connected outputs, use xrr events --- @@ -8830,10 +8813,10 @@ index 7ec5be4..14622cb 100644 1.9.0 -From 11a1fa69951934af3332d3f7eb038a735ef301e4 Mon Sep 17 00:00:00 2001 +From 897c0678b10e3c59b2fe72b162e8b5b91ace3d3a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 75/96] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 74/93] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -8951,10 +8934,10 @@ index 14622cb..d1c8729 100644 1.9.0 -From 0a2f56c8cfb9109715a2099a8cd90566c91166f6 Mon Sep 17 00:00:00 2001 +From e98a11078c852556b5d36b97859d93cce2a41289 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 76/96] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 75/93] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -8980,10 +8963,10 @@ index 695b352..e55583c 100644 1.9.0 -From 5aefb59b3583bec09e73b23dc8b9661032c7989e Mon Sep 17 00:00:00 2001 +From 6a122ef45e7caf3b8bbac706e4e16c052cbbf3ef Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 77/96] X11: drop shortcuts, have WM do this +Subject: [PATCH 76/93] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9045,21 +9028,21 @@ index 6429291..4334d21 100644 1.9.0 -From 45ca79fb25e13d415e06f3b33e13cf40058f36e2 Mon Sep 17 00:00:00 2001 +From 2dbf65e8aef999048997adb5a8ee8600f4407aa8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 -Subject: [PATCH 78/96] X11: adapt to new settings +Subject: [PATCH 77/93] 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 6865718..8cf4b9c 100644 +index d9b235b..20b2379 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2176,6 +2176,7 @@ - HAS_GLX +@@ -2263,6 +2263,7 @@ + HAS_GLX 0 false + @@ -9070,10 +9053,10 @@ index 6865718..8cf4b9c 100644 1.9.0 -From 69c9bbd075667dbb9db491995b6eb3d6d6471b8a Mon Sep 17 00:00:00 2001 +From 322d43ce8109a7ea380931d4cf7128eaa3fea48c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 -Subject: [PATCH 79/96] X11: adapt to changes in cstdstring +Subject: [PATCH 78/93] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9121,10 +9104,10 @@ index 8525ede..c94f2e3 100644 1.9.0 -From a62d637c75f72ad671f87076e142e3c8ba08d5f7 Mon Sep 17 00:00:00 2001 +From edcfba7d8d45c931434ae83c32b06da55bded3f6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 80/96] ActiveAE: correct time of buffered samples by resample +Subject: [PATCH 79/93] ActiveAE: correct time of buffered samples by resample ratio --- @@ -9133,7 +9116,7 @@ Subject: [PATCH 80/96] 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 99bc37a..17ac95e 100644 +index 95ef5ed..f41f6c7 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) @@ -9161,10 +9144,10 @@ index 99989b3..0287e73 100644 1.9.0 -From fb0aa7c8fea84236a94685649741c6d1900e3959 Mon Sep 17 00:00:00 2001 +From 7394cef69e883f4c878d71b4e993a2626d2be137 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 -Subject: [PATCH 81/96] ffmpeg demuxer: faster channel change for PVR addons +Subject: [PATCH 80/93] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix, Whaupt @@ -9478,10 +9461,10 @@ index ca689d0..f383563 100644 1.9.0 -From ac4ba822f7b3d79a8a38840322e3569754a75b5d Mon Sep 17 00:00:00 2001 +From 67fb08b42c3b7c3c9a3a5ba15abc848d496e8192 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 -Subject: [PATCH 82/96] ffmpeg demuxer: make sure we start mpegts video with an +Subject: [PATCH 81/93] ffmpeg demuxer: make sure we start mpegts video with an i-frame --- @@ -9565,10 +9548,10 @@ index acde9a8..9ec0877 100644 1.9.0 -From 4f4ab22f30778a09221f39b8c83c00e5ae2ea0d3 Mon Sep 17 00:00:00 2001 +From e286851d30dc4f07a5f2635f53a24d5b9cc7530e Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 -Subject: [PATCH 83/96] DVDFactoryDemuxer: skip streaminfo for udp tcp and +Subject: [PATCH 82/93] DVDFactoryDemuxer: skip streaminfo for udp tcp and pvr-channels --- @@ -9617,7 +9600,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 95b8091..515cd5c 100644 +index ea4ff97..9d4da51 100644 --- a/xbmc/utils/URIUtils.cpp +++ b/xbmc/utils/URIUtils.cpp @@ -788,6 +788,36 @@ bool URIUtils::IsFTP(const CStdString& strFile) @@ -9657,7 +9640,7 @@ index 95b8091..515cd5c 100644 bool URIUtils::IsDAV(const CStdString& strFile) { CStdString strFile2(strFile); -@@ -1242,3 +1272,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) +@@ -1283,3 +1313,8 @@ bool URIUtils::UpdateUrlEncoding(std::string &strFilename) strFilename = newFilename; return true; } @@ -9667,7 +9650,7 @@ index 95b8091..515cd5c 100644 + return IsUDP(strFile) || IsTCP(strFile) || IsPVRChannel(strFile); +} diff --git a/xbmc/utils/URIUtils.h b/xbmc/utils/URIUtils.h -index cf7ea3f..7857c3b 100644 +index b94e94c..b45630f 100644 --- a/xbmc/utils/URIUtils.h +++ b/xbmc/utils/URIUtils.h @@ -88,6 +88,8 @@ public: @@ -9679,10 +9662,10 @@ index cf7ea3f..7857c3b 100644 static bool IsHD(const CStdString& strFileName); static bool IsHDHomeRun(const CStdString& strFile); static bool IsSlingbox(const CStdString& strFile); -@@ -126,6 +128,8 @@ public: - static bool IsBluray(const CStdString& strFile); +@@ -127,6 +129,8 @@ public: static bool IsAndroidApp(const CStdString& strFile); static bool IsLibraryFolder(const CStdString& strFile); + static bool IsLibraryContent(const std::string& strFile); + static bool IsPVRChannel(const CStdString& strFile); + static bool IsUsingFastSwitch(const CStdString& strFile); @@ -9692,10 +9675,10 @@ index cf7ea3f..7857c3b 100644 1.9.0 -From dd8543008969be5f2228cd5978b4a39041b61c60 Mon Sep 17 00:00:00 2001 +From 346f3d3ee940cd2a539e4b33b1b3eec244aa0bd4 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 08:43:29 +0100 -Subject: [PATCH 84/96] squash fast switch +Subject: [PATCH 83/93] squash fast switch --- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +- @@ -9718,13 +9701,11 @@ index 782fb3d..b57b391 100644 1.9.0 -From e57ecab5b2deb7e29a6ee3d22bd6897aff17a98a Mon Sep 17 00:00:00 2001 +From 380584322fa6e8729b2757f44ecbcd8d9a66ac41 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker -Date: Mon, 24 Feb 2014 20:45:36 +0200 -Subject: [PATCH 85/96] linux: add shared lib for sse4 operations +Date: Sun, 22 Dec 2013 14:52:29 +0100 +Subject: [PATCH 84/93] linux: add shared lib for sse4 operations -Conflicts: - configure.in --- Makefile.in | 8 ++- configure.in | 18 +++++++ @@ -10018,17 +9999,14 @@ index 0000000..45aa826 1.9.0 -From 35cb2b30e230b9f060efd337db650d3e9ef60b2b Mon Sep 17 00:00:00 2001 +From a656008f7f3596cd3208bf568211db4bb34b5a5e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker -Date: Mon, 24 Feb 2014 20:48:18 +0200 -Subject: [PATCH 86/96] vaapi: option to enable sw filters +Date: Thu, 19 Dec 2013 15:36:11 +0100 +Subject: [PATCH 85/93] vaapi: option to enable sw filters -Conflicts: - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp - xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h --- - language/English/strings.po | 15 +- - system/settings/settings.xml | 9 ++ + language/English/strings.po | 17 ++- + system/settings/settings.xml | 15 ++ xbmc/cores/VideoRenderers/RenderManager.cpp | 4 +- xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp | 1 + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 76 ++++++++-- @@ -10036,53 +10014,61 @@ Conflicts: xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 154 +++++++++++++++++++++ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 36 ++++- xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 32 ++--- - 9 files changed, 288 insertions(+), 42 deletions(-) + 9 files changed, 296 insertions(+), 42 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 59eb97d..77c8b1d 100755 +index d59a911..1778942 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6074,7 +6074,13 @@ msgctxt "#13452" - msgid "Enable this option to use hardware acceleration for VC-1 based codecs. If disabled the CPU will be used instead. Especially VC-1 Interlaced fails hard on Intel hardware." +@@ -6090,7 +6090,13 @@ msgctxt "#13456" + msgid "Hardware accelerated" msgstr "" --#empty strings from id 13453 to 13499 -+#. Description of setting #13453 'Use SW Filter for VAAPI' +-#empty strings from id 13457 to 13499 ++#. Option for video related setting #13454: sw filter +#: system/settings/settings.xml -+msgctxt "#13453" ++msgctxt "#13457" +msgid "Use SW Filter for VAAPI" +msgstr "" + -+#empty strings from id 13454 to 13499 ++#empty strings from id 13458 to 13499 #: system/settings/settings.xml msgctxt "#13500" -@@ -14889,7 +14895,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" +@@ -15183,7 +15189,14 @@ msgctxt "#36431" + msgid "Defines whether video decoding should be performed in software (requires more CPU) or with hardware acceleration where possible." msgstr "" --#empty strings from id 36430 to 36499 +-#empty strings from id 36432 to 36499 ++#. Description for video related setting #13457: vaapi sw filter +#: system/settings/settings.xml -+msgctxt "#36430" ++msgctxt "#36432" +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 36431 to 36499 ++#empty strings from id 36433 to 36499 ++ #end reservation #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 8cf4b9c..119d9ce 100644 +index 20b2379..ea02362 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -516,6 +516,15 @@ +@@ -715,6 +715,21 @@ false -+ ++ + HAVE_LIBVA + -+ true ++ ++ ++ true ++ 1 ++ ++ ++ true + + 3 + false @@ -10121,10 +10107,10 @@ index 5443cb3..002c8e1 100644 , { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } , { PIX_FMT_NONE , RENDER_FMT_NONE } diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 18e8828..7b45cc2 100644 +index b59c1ee..2df9de9 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -37,6 +37,7 @@ +@@ -38,6 +38,7 @@ #include "utils/log.h" #include "boost/shared_ptr.hpp" #include "threads/Atomics.h" @@ -10132,7 +10118,7 @@ index 18e8828..7b45cc2 100644 #ifndef TARGET_POSIX #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5))) -@@ -164,6 +165,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() +@@ -165,6 +166,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() m_dts = DVD_NOPTS_VALUE; m_started = false; m_decoderPts = DVD_NOPTS_VALUE; @@ -10140,7 +10126,7 @@ index 18e8828..7b45cc2 100644 } CDVDVideoCodecFFmpeg::~CDVDVideoCodecFFmpeg() -@@ -387,7 +389,7 @@ unsigned int CDVDVideoCodecFFmpeg::SetFilters(unsigned int flags) +@@ -388,7 +390,7 @@ unsigned int CDVDVideoCodecFFmpeg::SetFilters(unsigned int flags) { m_filters_next.clear(); @@ -10149,7 +10135,7 @@ index 18e8828..7b45cc2 100644 return 0; if(flags & FILTER_ROTATE) -@@ -461,10 +463,10 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -462,10 +464,10 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p if(section) lock = shared_ptr(new CSingleLock(*section)); @@ -10162,7 +10148,7 @@ index 18e8828..7b45cc2 100644 result = m_pHardware->Decode(m_pCodecContext, NULL); if(result) -@@ -519,19 +521,60 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -520,19 +522,60 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p || m_pCodecContext->codec_id == AV_CODEC_ID_SVQ3) m_started = true; @@ -10226,7 +10212,7 @@ index 18e8828..7b45cc2 100644 || m_pFilterIn->outputs[0]->w != m_pCodecContext->width || m_pFilterIn->outputs[0]->h != m_pCodecContext->height) need_reopen = true; -@@ -548,7 +591,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -549,7 +592,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p } int result; @@ -10235,7 +10221,7 @@ index 18e8828..7b45cc2 100644 result = m_pHardware->Decode(m_pCodecContext, m_pFrame); else if(m_pFilterGraph) result = FilterProcess(m_pFrame); -@@ -644,6 +687,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -645,6 +688,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) pDvdVideoPicture->chroma_position = m_pCodecContext->chroma_sample_location; pDvdVideoPicture->color_primaries = m_pCodecContext->color_primaries; pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc; @@ -10243,7 +10229,7 @@ index 18e8828..7b45cc2 100644 if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P) pDvdVideoPicture->color_range = 1; -@@ -667,7 +711,11 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -668,7 +712,11 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) pDvdVideoPicture->qscale_type = DVP_QSCALE_UNKNOWN; } @@ -10256,7 +10242,7 @@ index 18e8828..7b45cc2 100644 m_dts = DVD_NOPTS_VALUE; if (m_pFrame->reordered_opaque) pDvdVideoPicture->pts = pts_itod(m_pFrame->reordered_opaque); -@@ -698,7 +746,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -699,7 +747,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture* pDvdVideoPicture) { @@ -10265,7 +10251,7 @@ index 18e8828..7b45cc2 100644 return m_pHardware->GetPicture(m_pCodecContext, m_pFrame, pDvdVideoPicture); if(!GetPictureCommon(pDvdVideoPicture)) -@@ -723,6 +771,7 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture* pDvdVideoPicture) +@@ -724,6 +772,7 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DVDVideoPicture* pDvdVideoPicture) pix_fmt = (PixelFormat)m_pFrame->format; pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt); @@ -10273,7 +10259,7 @@ index 18e8828..7b45cc2 100644 return true; } -@@ -737,7 +786,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const CStdString& filters, bool scale) +@@ -738,7 +787,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const CStdString& filters, bool scale) if (filters.empty() && !scale) return 0; @@ -10282,7 +10268,7 @@ index 18e8828..7b45cc2 100644 { CLog::Log(LOGWARNING, "CDVDVideoCodecFFmpeg::FilterOpen - skipped opening filters on hardware decode"); return 0; -@@ -755,7 +804,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const CStdString& filters, bool scale) +@@ -756,7 +805,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const CStdString& filters, bool scale) CStdString args = StringUtils::Format("%d:%d:%d:%d:%d:%d:%d", m_pCodecContext->width, m_pCodecContext->height, @@ -10291,7 +10277,7 @@ index 18e8828..7b45cc2 100644 m_pCodecContext->time_base.num, m_pCodecContext->time_base.den, m_pCodecContext->sample_aspect_ratio.num, -@@ -954,10 +1003,7 @@ bool CDVDVideoCodecFFmpeg::GetCodecStats(double &pts, int &skippedDeint, int &in +@@ -955,10 +1004,7 @@ bool CDVDVideoCodecFFmpeg::GetCodecStats(double &pts, int &skippedDeint, int &in { pts = m_decoderPts; skippedDeint = m_skippedDeint; @@ -10673,10 +10659,10 @@ index 9c5469b..b30e450 100644 1.9.0 -From 69d6df09b8a0c4cfc56555cead5b26e47a8cc767 Mon Sep 17 00:00:00 2001 +From 0360cabf32ede44335f6581c51de71ce114a6b5a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 3 Jan 2014 20:50:46 +0100 -Subject: [PATCH 87/96] X11: check for user output on resize window +Subject: [PATCH 86/93] X11: check for user output on resize window --- xbmc/windowing/X11/WinSystemX11.cpp | 17 ++++++++++++++--- @@ -10721,10 +10707,10 @@ index 9962f08..c95f4ec 100644 1.9.0 -From 973f3c21aed9a7e89ce4e946e019e3792a5fa22c Mon Sep 17 00:00:00 2001 +From 186898e5779e01d9b28c4c4411f6314dd709bf92 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 24 Jan 2014 18:29:33 +0100 -Subject: [PATCH 88/96] dvdplayer: flush ffmpeg after hw decoder returned an +Subject: [PATCH 87/93] dvdplayer: flush ffmpeg after hw decoder returned an error --- @@ -10732,10 +10718,10 @@ Subject: [PATCH 88/96] dvdplayer: flush ffmpeg after hw decoder returned an 1 file changed, 9 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 7b45cc2..68e353a 100644 +index 2df9de9..f4c9929 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -470,7 +470,12 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -471,7 +471,12 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p result = m_pHardware->Decode(m_pCodecContext, NULL); if(result) @@ -10748,7 +10734,7 @@ index 7b45cc2..68e353a 100644 } if(m_pFilterGraph) -@@ -592,7 +597,11 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -593,7 +598,11 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p int result; if(m_pHardware && !m_pHardware->UseFilter()) @@ -10764,20 +10750,20 @@ index 7b45cc2..68e353a 100644 1.9.0 -From 0480010a0c3f87e0cd16422a8692e48ccc139b70 Mon Sep 17 00:00:00 2001 +From 531dbaf476873cb2a3d98d048a38eaad76d1f6b9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 10:05:26 +0100 -Subject: [PATCH 89/96] xbmc pr 3080 +Subject: [PATCH 88/93] xbmc pr 3080 --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 68e353a..205ec66 100644 +index f4c9929..283af9e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -494,6 +494,14 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -495,6 +495,14 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p m_dllAvCodec.av_init_packet(&avpkt); avpkt.data = pData; avpkt.size = iSize; @@ -10792,7 +10778,7 @@ index 68e353a..205ec66 100644 /* We lie, but this flag is only used by pngdec.c. * Setting it correctly would allow CorePNG decoding. */ avpkt.flags = AV_PKT_FLAG_KEY; -@@ -726,8 +734,10 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -727,8 +735,10 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) pDvdVideoPicture->dts = m_dts; m_dts = DVD_NOPTS_VALUE; @@ -10809,20 +10795,20 @@ index 68e353a..205ec66 100644 1.9.0 -From 43fcb2425e5316918bbed1db3abadf9592d60333 Mon Sep 17 00:00:00 2001 +From b544ec8d52e5cdfd6e8eaaa1b92f0e1cb0ca8988 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 28 Jan 2014 17:24:58 +0100 -Subject: [PATCH 90/96] set preatpicture if pts is equal to last frame +Subject: [PATCH 89/93] set preatpicture if pts is equal to last frame --- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 205ec66..f593fcd 100644 +index 283af9e..ff18b73 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -737,7 +737,15 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -738,7 +738,15 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) int64_t bpts = av_frame_get_best_effort_timestamp(m_pFrame); if(bpts != AV_NOPTS_VALUE) @@ -10842,10 +10828,10 @@ index 205ec66..f593fcd 100644 1.9.0 -From 61ca95b8f685f21a41a618968b058424bdf0e1a2 Mon Sep 17 00:00:00 2001 +From a32db50377ac6876b75d6793a2c0276ee2b3b833 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 27 Jan 2014 19:49:03 +0100 -Subject: [PATCH 91/96] Introduce SWCodec - these are codecs that don't have +Subject: [PATCH 90/93] Introduce SWCodec - these are codecs that don't have any GPU acceleration (yet) - add HVEC --- @@ -10856,10 +10842,10 @@ Subject: [PATCH 91/96] Introduce SWCodec - these are codecs that don't have 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index f593fcd..7ab9d25 100644 +index ff18b73..354e206 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -159,7 +159,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() +@@ -160,7 +160,7 @@ CDVDVideoCodecFFmpeg::CDVDVideoCodecFFmpeg() : CDVDVideoCodec() m_iScreenHeight = 0; m_iOrientation = 0; m_bSoftware = false; @@ -10868,7 +10854,7 @@ index f593fcd..7ab9d25 100644 m_pHardware = NULL; m_iLastKeyframe = 0; m_dts = DVD_NOPTS_VALUE; -@@ -215,10 +215,12 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options +@@ -216,10 +216,12 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options // this is needed to not open the decoders m_bSoftware = true; // this we need to enable multithreading for hi10p via advancedsettings @@ -10882,7 +10868,7 @@ index f593fcd..7ab9d25 100644 if(pCodec == NULL) pCodec = m_dllAvCodec.avcodec_find_decoder(hints.codec); -@@ -244,12 +246,12 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options +@@ -245,12 +247,12 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options * sensitive to changes in frame sizes, and it causes crashes * during HW accell - so we unset it in this case. * @@ -10897,8 +10883,8 @@ index f593fcd..7ab9d25 100644 + CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Keep default threading for swcodec: %d", m_pCodecContext->thread_type); } - else if (CSettings::Get().GetBool("videoplayer.useframemtdec")) -@@ -301,7 +303,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options + else if ((EDECODEMETHOD) CSettings::Get().GetInt("videoplayer.decodingmethod") == VS_DECODEMETHOD_SOFTWARE && CSettings::Get().GetBool("videoplayer.useframemtdec")) +@@ -302,7 +304,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options int num_threads = std::min(8 /*MAX_THREADS*/, g_cpuInfo.getCPUCount()); if( num_threads > 1 && !hints.software && m_pHardware == NULL // thumbnail extraction fails when run threaded && ( pCodec->id == AV_CODEC_ID_H264 @@ -10922,7 +10908,7 @@ index 4f88532..e301aa8 100644 int m_iLastKeyframe; double m_dts; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index c7a5ff9..f642b97 100644 +index 7532914..0d5e546 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -182,7 +182,7 @@ void CAdvancedSettings::Initialize() @@ -10934,7 +10920,7 @@ index c7a5ff9..f642b97 100644 m_musicUseTimeSeeking = true; m_musicTimeSeekForward = 10; -@@ -597,7 +597,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -599,7 +599,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); @@ -10944,7 +10930,7 @@ index c7a5ff9..f642b97 100644 XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); XMLUtils::GetInt(pElement,"vdpauHDdeint",m_videoVDPAUdeintHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 6497592..d44f38a 100644 +index c43351d..7075f05 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -194,7 +194,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -10960,253 +10946,10 @@ index 6497592..d44f38a 100644 1.9.0 -From 112f6ea0e79408135cf9b0d546402b0f19ae00b9 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 18 Jan 2014 13:02:21 +0100 -Subject: [PATCH 92/96] vdpau: map/unmap surfaces on every cycle, requested by - AMD - ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 156 ++++++++++++++----------- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 2 +- - 2 files changed, 86 insertions(+), 72 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index f414221..11aed4b 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -3053,7 +3053,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; -@@ -3066,7 +3066,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]; -@@ -3181,6 +3181,9 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) - CLog::Log(LOGDEBUG, "COutput::ProcessReturnPicture - gl surface not found"); - return; - } -+#ifdef GL_NV_vdpau_interop -+ glVDPAUUnmapSurfacesNV(1, &(it->second.glVdpauSurface)); -+#endif - VdpVideoSurface surf = it->second.sourceVuv; - m_config.videoSurfaces->ClearRender(surf); - } -@@ -3193,6 +3196,9 @@ void COutput::ProcessReturnPicture(CVdpauRenderPicture *pic) - CLog::Log(LOGDEBUG, "COutput::ProcessReturnPicture - gl surface not found"); - return; - } -+#ifdef GL_NV_vdpau_interop -+ glVDPAUUnmapSurfacesNV(1, &(it->second.glVdpauSurface)); -+#endif - VdpOutputSurface outSurf = it->second.sourceRgb; - m_mixer.m_dataPort.SendOutMessage(CMixerDataProtocol::BUFFER, &outSurf, sizeof(outSurf)); - } -@@ -3402,95 +3408,103 @@ 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 - } -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -index 2dd3c28..9f58e76 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -443,7 +443,7 @@ protected: - void PreCleanup(); - void InitMixer(); - bool GLInit(); -- void GLMapSurfaces(); -+ void GLMapSurface(bool yuv, uint32_t source); - void GLUnmapSurfaces(); - bool CheckStatus(VdpStatus vdp_st, int line); - CEvent m_outMsgEvent; --- -1.9.0 - - -From 400a66fb8ab5e0fd08fe9be4fccad1458d914d5f Mon Sep 17 00:00:00 2001 +From d0b4ea079bbf4e5026c100621f66071c937fcc8d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Feb 2014 18:15:06 +0100 -Subject: [PATCH 93/96] ActiveAE: add some debug logging +Subject: [PATCH 91/93] ActiveAE: add some debug logging --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 6 ++++++ @@ -11234,36 +10977,10 @@ index 0287e73..6904cb9 100644 1.9.0 -From 5cc18a6bc551c73c43c5d7ce1290ccac5a36d9df Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Mon, 24 Feb 2014 17:29:11 +0100 -Subject: [PATCH 94/96] Change swfilter to be visible in Advanced setting level - ---- - system/settings/settings.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 119d9ce..1f15396 100644 ---- a/system/settings/settings.xml -+++ b/system/settings/settings.xml -@@ -521,7 +521,7 @@ - - true - -- 3 -+ 2 - false - - --- -1.9.0 - - -From f84db770e82fede21b0217bfc8467a1538e4e6f8 Mon Sep 17 00:00:00 2001 +From f6f256b6714462ed129be0634f2cc055698f61b7 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 24 Feb 2014 20:49:47 +0200 -Subject: [PATCH 95/96] vaapi: fix build +Subject: [PATCH 92/93] vaapi: fix build --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 13 ++----------- @@ -11341,20 +11058,20 @@ index 3541c9c..49d3117 100644 1.9.0 -From 248a0176e19a555c015c830c82df9c1ad102a468 Mon Sep 17 00:00:00 2001 +From e2f116b98b2d64e38b6908cdeb27ccd7efc37d9c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 24 Feb 2014 20:58:52 +0200 -Subject: [PATCH 96/96] no hevc in ffmpeg 1.2 +Subject: [PATCH 93/93] no hevc in ffmpeg 1.2 --- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 7ab9d25..f2dcd8a 100644 +index 354e206..6bc35b1 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -219,8 +219,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options +@@ -220,8 +220,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options break; } } @@ -11366,7 +11083,7 @@ index 7ab9d25..f2dcd8a 100644 if(pCodec == NULL) pCodec = m_dllAvCodec.avcodec_find_decoder(hints.codec); -@@ -303,8 +306,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options +@@ -304,8 +307,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options int num_threads = std::min(8 /*MAX_THREADS*/, g_cpuInfo.getCPUCount()); if( num_threads > 1 && !hints.software && m_pHardware == NULL // thumbnail extraction fails when run threaded && ( pCodec->id == AV_CODEC_ID_H264