diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch similarity index 93% rename from packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch rename to packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch index e67b30216d..a995ba0ede 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch @@ -1,7 +1,7 @@ -From a36ec9ed1fa6caadec673f3d1e71c3d62905be9c Mon Sep 17 00:00:00 2001 +From 739c5003350bf945cbb15872e31f79778af0e891 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/88] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/87] videoplayer: adapt lateness detection and dropping to buffering --- @@ -157,10 +157,10 @@ index b78f779..794ddb6 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 5692faf..d830a4c 100644 +index e0cfb0e..aebd06b 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -163,6 +163,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx +@@ -164,6 +164,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx m_iLastKeyframe = 0; m_dts = DVD_NOPTS_VALUE; m_started = false; @@ -168,7 +168,7 @@ index 5692faf..d830a4c 100644 } CDVDVideoCodecFFmpeg::~CDVDVideoCodecFFmpeg() -@@ -354,6 +355,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) +@@ -355,6 +356,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) { if( m_pCodecContext ) { @@ -183,7 +183,7 @@ index 5692faf..d830a4c 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; @@ -191,7 +191,7 @@ index 5692faf..d830a4c 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; @@ -214,7 +214,7 @@ index 5692faf..d830a4c 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; } @@ -254,7 +254,7 @@ index 2287031..8376f72 100644 + int m_codecControlFlags; }; diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index 4797b19..c8b2ed8 100644 +index 99b3155..4fad1a3 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -38,6 +38,7 @@ @@ -349,7 +349,7 @@ index 4797b19..c8b2ed8 100644 // reset the request, the following while loop may break before // setting the flag to a new value bRequestDrop = false; -@@ -1178,33 +1199,12 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) +@@ -1176,33 +1197,12 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) m_FlipTimeStamp += max(0.0, iSleepTime); m_FlipTimeStamp += iFrameDuration; @@ -387,7 +387,7 @@ index 4797b19..c8b2ed8 100644 // set fieldsync if picture is interlaced EFIELDSYNC mDisplayField = FS_NONE; -@@ -1237,7 +1237,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) +@@ -1235,7 +1235,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) if (index < 0) return EOS_DROPPED; @@ -396,7 +396,7 @@ index 4797b19..c8b2ed8 100644 return result; #else -@@ -1537,3 +1537,127 @@ void CDVDPlayerVideo::CalcFrameRate() +@@ -1535,3 +1535,127 @@ void CDVDPlayerVideo::CalcFrameRate() m_iFrameRateCount = 0; } } @@ -582,10 +582,10 @@ index f8ad541..186e271 100644 1.8.5.1 -From 2654cfff6b9849045ee445e6cc7d3aed61a8b2be Mon Sep 17 00:00:00 2001 +From 7f425533cea97b39697ef467064ecb9affea5a9f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/88] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/87] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -594,10 +594,10 @@ Subject: [PATCH 02/88] video player: present correct pts to user for a/v sync 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index c8b2ed8..c3b5e37 100644 +index 4fad1a3..1d29b6f 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -@@ -1457,6 +1457,22 @@ void CDVDPlayerVideo::ResetFrameRateCalc() +@@ -1455,6 +1455,22 @@ void CDVDPlayerVideo::ResetFrameRateCalc() g_advancedSettings.m_videoFpsDetect == 0; } @@ -620,7 +620,7 @@ index c8b2ed8..c3b5e37 100644 #define MAXFRAMERATEDIFF 0.01 #define MAXFRAMESERR 1000 -@@ -1575,6 +1591,15 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) +@@ -1573,6 +1589,15 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) else iInterval = 1/m_fFrameRate*(double)DVD_TIME_BASE; @@ -653,10 +653,10 @@ index 186e271..59c7f09 100644 1.8.5.1 -From c32ea4b0c363e410547db7babd88c129b7cb3483 Mon Sep 17 00:00:00 2001 +From 76620891e70bc604421d9cf0e31ef063882a0495 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/88] videoplayer: some rework and documentation +Subject: [PATCH 03/87] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -716,10 +716,10 @@ index 794ddb6..c9f9c98 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 d830a4c..43d3e70 100644 +index aebd06b..5927b42 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; } @@ -751,10 +751,10 @@ index 8376f72..c0ce198 100644 bool IsHardwareAllowed() { return !m_bSoftware; } diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index c3b5e37..392d971 100644 +index 1d29b6f..ee07f30 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -@@ -1568,7 +1568,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) +@@ -1566,7 +1566,7 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) int iBufferLevel; // get decoder stats @@ -767,10 +767,10 @@ index c3b5e37..392d971 100644 1.8.5.1 -From aeaff4f455f0b699e447534c0c2ff93f28e8e21d Mon Sep 17 00:00:00 2001 +From 4d7e407bb0f5731b50d16616672813b1194ad261 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/88] renderer: bump buffers to 5 +Subject: [PATCH 04/87] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -793,10 +793,10 @@ index dc2712a..9edfbd4 100644 1.8.5.1 -From 5964e3a3cab754424f54cd4633be1bb6a8faa4e8 Mon Sep 17 00:00:00 2001 +From 8386739c6fdbacefe2ebc0975f70b7b18b577249 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/88] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/87] videoplayer: update frametime, it might change due to fps detection --- @@ -804,7 +804,7 @@ Subject: [PATCH 05/88] videoplayer: update frametime, it might change due to 1 file changed, 2 insertions(+) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index 392d971..b650ccb 100644 +index ee07f30..b3175cd 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -708,6 +708,8 @@ void CDVDPlayerVideo::Process() @@ -820,10 +820,10 @@ index 392d971..b650ccb 100644 1.8.5.1 -From ee4eaa0afe04c5b8d3b9bbb9716182c28df6dc2f Mon Sep 17 00:00:00 2001 +From a9ee13236e85b7e49b6c281bd1fbe92f3c2fee6e Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/88] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/87] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -831,10 +831,10 @@ Subject: [PATCH 06/88] videoplayer: give streams with invalid fps a chance for 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index b650ccb..3c517f2 100644 +index b3175cd..9c36bdb 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -@@ -1499,7 +1499,7 @@ void CDVDPlayerVideo::CalcFrameRate() +@@ -1497,7 +1497,7 @@ void CDVDPlayerVideo::CalcFrameRate() double frameduration = m_pullupCorrection.GetFrameDuration(); if (frameduration == DVD_NOPTS_VALUE || @@ -847,10 +847,10 @@ index b650ccb..3c517f2 100644 1.8.5.1 -From 7b01d3785dc7257b2cba5ee43079af7bdb6464b2 Mon Sep 17 00:00:00 2001 +From a7c3d7608c4a7f2e1c1d3366bc6be0db9e04adc2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/88] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/87] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -858,7 +858,7 @@ Subject: [PATCH 07/88] 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 050a1a0..d0d5a9a 100644 +index 4170b17..eec99b6 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1666,7 +1666,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -887,10 +887,10 @@ index 050a1a0..d0d5a9a 100644 1.8.5.1 -From c6fd2439671f9bcab9beb2f2f8d9b20d90a5fb25 Mon Sep 17 00:00:00 2001 +From 8068d3bf5599ea11b9882b66fe5fa62a5fad041f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/88] X11: ditch SDL for video and window events +Subject: [PATCH 08/87] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -906,7 +906,7 @@ Subject: [PATCH 08/88] 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 1072efc..8f9536c 100644 +index e851294..1a8ccee 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 83da3df917bdf8ba861e0883e1a3eb5dd7fcf1a1 Mon Sep 17 00:00:00 2001 +From 6ffe6a64fc6b41295d88a23b885b16211855ec6a Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/88] X11: Add xbmc icon +Subject: [PATCH 09/87] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2620,10 +2620,10 @@ index 34b912f..352e90e 100644 1.8.5.1 -From f4a750c1032d5901b1efbcc15725968ddaad2d12 Mon Sep 17 00:00:00 2001 +From eb3cbd6c3cc0279a16ee8afb6271156fc42b1bca Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/88] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/87] 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 22b485db95727aed953a42b03b43b0e47e5100fe Mon Sep 17 00:00:00 2001 +From a60bb4918342ef00bd557ef0baff88e23b980e2e Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/88] X11: factor out code handling device reset notification +Subject: [PATCH 11/87] 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 dacc4a3f9b559118beaf692440ab9440e83cf60b Mon Sep 17 00:00:00 2001 +From 423e55d04eaa6bc08df50f63b1d8076d27daa7ad Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/88] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/87] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2890,10 +2890,10 @@ index 304dac8..16b13aa 100644 1.8.5.1 -From 6595d81c9c7c6ff5b4ae5a142252812f2c1413f3 Mon Sep 17 00:00:00 2001 +From d7b81bd010d585b86bf3e7393b428cf4d56c4f43 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/88] xrandr: remove method RestoreState +Subject: [PATCH 13/87] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2972,10 +2972,10 @@ index 0aec487..00b49dc 100644 1.8.5.1 -From 5c9f23ca3feabebf16c8eb10230c91dee812af8e Mon Sep 17 00:00:00 2001 +From c12acc40fa1e326124602cb0e5db05648f8a50e8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/88] xrandr: observe orientation +Subject: [PATCH 14/87] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3190,10 +3190,10 @@ index 00b49dc..508604d 100644 1.8.5.1 -From 76802e7aa6ec21278ff22e911e6839abed7607e8 Mon Sep 17 00:00:00 2001 +From 3521de8c970fcd85aa313e0ad85611979a55e250 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/88] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/87] 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 ae9ef467299cf532a82a853f554f08baf419bd19 Mon Sep 17 00:00:00 2001 +From bea5bff5b6037d76629691c7bb7b84c959f96ae2 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/88] X11: fix multi-head setups +Subject: [PATCH 16/87] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3386,7 +3386,7 @@ Subject: [PATCH 16/88] 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 b5e95fc..3685bd9 100755 +index 6fdfdb2..cb173de 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3401,10 +3401,10 @@ index b5e95fc..3685bd9 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 2a1cb46..8e74f3d 100644 +index aae8e51..4a2fa94 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2076,6 +2076,15 @@ +@@ -2099,6 +2099,15 @@
@@ -3420,7 +3420,7 @@ index 2a1cb46..8e74f3d 100644 0 0 -@@ -2097,6 +2106,7 @@ +@@ -2120,6 +2129,7 @@ -1 @@ -3428,7 +3428,7 @@ index 2a1cb46..8e74f3d 100644 -@@ -2114,6 +2124,7 @@ +@@ -2137,6 +2147,7 @@ -1 @@ -4130,10 +4130,10 @@ index 4175aab..94584ab 100644 1.8.5.1 -From c6cff3b5d8690a22ff707285cc8682cf0a5c5b80 Mon Sep 17 00:00:00 2001 +From bfd667fd7e27806191c654811dd2475123937819 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/88] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/87] 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 88af31cd2d127f2822d3cf16cdd5cffd12b4c52c Mon Sep 17 00:00:00 2001 +From 92c31fe20395db21cf6659e207417d12f75b60f1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/88] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/87] 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 a79a55997e62df98961bf7d9975afd3d7afd4eba Mon Sep 17 00:00:00 2001 +From 48730cb9e84637cfab22e08d141e539b9ded1219 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/88] X11: recreate gl context after output has changed +Subject: [PATCH 19/87] 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 b644000e0c100f4c5a50a4633067fc0d2f032cfa Mon Sep 17 00:00:00 2001 +From 7db396d0df677f2f8d922eb996be26c0d15f6a8f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/88] X11: hook video reference clock in windowing +Subject: [PATCH 20/87] 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 97074d40bff3581d50cfa9828bacdeedf247c852 Mon Sep 17 00:00:00 2001 +From b4fb3ac5d601ee4c035b811dc6e2e723739a773e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/88] X11: fix video calibrations +Subject: [PATCH 21/87] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4733,10 +4733,10 @@ index 9666cc3..5b52d6c 100644 1.8.5.1 -From c28299181812bff8803769f0249dfe42ac0fa569 Mon Sep 17 00:00:00 2001 +From f5463df9440be819ed6f58282ec274a8a3e466d3 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/88] X11: deactivate screen saver on startup +Subject: [PATCH 22/87] 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 c73f7b7c2d50d0b723220e823ded7c139f7c706c Mon Sep 17 00:00:00 2001 +From 1689b816149a5fe08587c197dbb7d93a72edc51a Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/88] X11: change method of going full-screen +Subject: [PATCH 23/87] 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 229946d4ee93e4f7655c066a95d4d20b79e94360 Mon Sep 17 00:00:00 2001 +From b2c188a3d6a743fd059e02ef46c664562f784f57 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/88] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/87] 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 90ed451f6c36e1d37beac70ae32ea948a73885d4 Mon Sep 17 00:00:00 2001 +From fa84152b1d73870b16b54d8edfd779bde1c93d0a Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/88] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/87] 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 e6316695c839ff2dd5113b1e4eb1bb866cd4c161 Mon Sep 17 00:00:00 2001 +From 0478d8df33eda35aae65e2a41f9cc5732edb10be Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/88] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/87] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5175,10 +5175,10 @@ index 9a8a912..c69169c 100644 1.8.5.1 -From 9f35e783509ba3e3ed85afbfc170b94345bcbfcf Mon Sep 17 00:00:00 2001 +From f5b34db487eee8fa5e41043aebe29d8f8e0085b0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/88] add missing keys to xbmc keytable +Subject: [PATCH 27/87] 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 01773e404f804d67c1862c17668e2ba45ea6a20f Mon Sep 17 00:00:00 2001 +From 8190ffe873fc5e8e454e72809ebbc113b81d3551 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/88] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/87] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5227,10 +5227,10 @@ index 0ddf102..3ae7107 100644 1.8.5.1 -From e10aaa3b763528002255b91f2fd724f00e27e637 Mon Sep 17 00:00:00 2001 +From fa4bf5e7ea8b53cf24916bf4261eda31f182d31e Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/88] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/87] 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 080775cad7b56c27987894887b766268d27b2d3e Mon Sep 17 00:00:00 2001 +From 879ade281ba9eff22e0cfcc552ccbf242cc5f1ad Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/88] X11: fix icon texture after +Subject: [PATCH 30/87] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5372,10 +5372,10 @@ index 869baa8..bfe3797 100644 1.8.5.1 -From 0c1568f52a1d53f3b61339471788861b15e715ed Mon Sep 17 00:00:00 2001 +From 9c04f39bc223d5db0114fb3ec9964c147792026c Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/88] X11: check for window manager +Subject: [PATCH 31/87] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5496,10 +5496,10 @@ index b2bd5a0..3e62cd8 100644 1.8.5.1 -From a252b058f4eccab0ec68888ecd0b47bfddc2309e Mon Sep 17 00:00:00 2001 +From 23d3deeaa9e565d1423aacafc48ce90d9cb920fc Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/88] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/87] 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 57c4031c9a900bf44c4c3b024576702fe9a9333f Mon Sep 17 00:00:00 2001 +From 022dfb58ff7c7eb5fb67efb010b52bea24312253 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/88] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/87] 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 b09b2bdb45b0c45e7121625cb43b1aeb6be98f5d Mon Sep 17 00:00:00 2001 +From 32c6ef5ca9c2b2041aa36c6bad47fb0eb248f16f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/88] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/87] 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 b601b6b71ea358d842859c885525c0091d6246e0 Mon Sep 17 00:00:00 2001 +From 63010909b2bb059e7e02e0447d05c7726e1db848 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 35/88] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 35/87] 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 e134d847fe3b1b358c6fa4bf5433bbe9225381d5 Mon Sep 17 00:00:00 2001 +From c6740a7e90308c63be97c0eaf273d8088ed50671 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 36/88] dvdplayer: observe pts counter overflow +Subject: [PATCH 36/87] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -5928,10 +5928,10 @@ index aef5ab1..35abbdf 100644 1.8.5.1 -From 4aa7e370a1619663b990b6045b73f80057cc8857 Mon Sep 17 00:00:00 2001 +From f17e163ae119c837fabb99f604d343e1ba20728d Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 37/88] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 37/87] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5939,7 +5939,7 @@ Subject: [PATCH 37/88] dvdplayer: avoid short screen flicker caused by 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index 3c517f2..5d4875c 100644 +index 9c36bdb..322a581 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -1054,13 +1054,16 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) @@ -5964,10 +5964,10 @@ index 3c517f2..5d4875c 100644 1.8.5.1 -From fdf9e19b588a39bb519946377fcbfa475eec3e14 Mon Sep 17 00:00:00 2001 +From a0fb731e2af91d463579bbc02e4cce79523ee22a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 38/88] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 38/87] 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 e143dab0d796d1e9c34bd04f3e2aa8b195935ecb Mon Sep 17 00:00:00 2001 +From 2640c1f82e2eba9d188af6c992c1a44d1a7f1d83 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 39/88] player: fix rewind +Subject: [PATCH 39/87] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6084,7 +6084,7 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index d0d5a9a..8228b7c 100644 +index eec99b6..a37c271 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1667,11 +1667,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -6214,10 +6214,10 @@ index dfe679f..96f7fe5 100644 int m_errorCount; diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index 5d4875c..59c5e40 100644 +index 322a581..9c5469b 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -@@ -1472,7 +1472,7 @@ double CDVDPlayerVideo::GetCurrentPts() +@@ -1470,7 +1470,7 @@ double CDVDPlayerVideo::GetCurrentPts() if( m_stalled ) iRenderPts = DVD_NOPTS_VALUE; @@ -6226,7 +6226,7 @@ index 5d4875c..59c5e40 100644 iRenderPts = iRenderPts - max(0.0, iSleepTime); return iRenderPts; -@@ -1572,6 +1572,8 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) +@@ -1570,6 +1570,8 @@ int CDVDPlayerVideo::CalcDropRequirement(double pts) int iSkippedDeint = 0; int iBufferLevel; @@ -6251,10 +6251,10 @@ index 59c7f09..65dea76 100644 1.8.5.1 -From cf018c04f3a06d47d56da7bb2efd499f472d7287 Mon Sep 17 00:00:00 2001 +From 4927bdc5160d23baa1689c9e36276d60cf14b5f5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 40/88] xrandr: fix query for multiple screens +Subject: [PATCH 40/87] 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 d94222948ff31b3550ca1b13fc9a8a77172809ae Mon Sep 17 00:00:00 2001 +From acc948d5ddcb0a3a96433f04e0608842a5124416 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 41/88] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 41/87] 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 945478d00bed09b4310bf8408bdf5a7c88a0e8c9 Mon Sep 17 00:00:00 2001 +From f9d4046cb5bbcc8caf143a5ee9612018b47ae3a0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 42/88] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 42/87] 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 74d2abbbcad0af062021342367893104b64bd46f Mon Sep 17 00:00:00 2001 +From 773264874015f2e28ee2e5ef994b153941333f95 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/88] x11: support for multiple x screens +Subject: [PATCH 43/87] 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 f855d5b5c64b7e6b6aa42c0810d11a7f27b8e6e5 Mon Sep 17 00:00:00 2001 +From e5186603adba38f34de828316ac2bc2659697ee1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 44/88] pvr: increase changes counter of stream on stream +Subject: [PATCH 44/87] 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 72a70f4174a5e07630b0cfe929cbeb3148dadd92 Mon Sep 17 00:00:00 2001 +From 57593868c5137463c58ea08787ba2fe790a352e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 45/88] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 45/87] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6441,10 +6441,10 @@ index a62521f..263cb5a 100644 1.8.5.1 -From 8efb203070ad41a35ec633694cd46b3c6a5ce499 Mon Sep 17 00:00:00 2001 +From 91bf64b38803c57184f2657724e10320100becf2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 46/88] X11: remove toggle full screen after resume +Subject: [PATCH 46/87] 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 5098bc43dd0158391ede8318cd288ad0b360a9b5 Mon Sep 17 00:00:00 2001 +From cc43741fce8ec6a1693f1379bf3adcaa7578abf5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 47/88] xrandr: set screen on mode change command +Subject: [PATCH 47/87] 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 6256983df53862579334cc230fa949558f93367d Mon Sep 17 00:00:00 2001 +From a492783d38c662873a942870b8a6f4c11bddfc4f Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 48/88] X11: recreate glx context when output changes +Subject: [PATCH 48/87] 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 dea87f4e73bd075f4acc9ff2688dd05608708024 Mon Sep 17 00:00:00 2001 +From c65f25c444df33b9cfadf3d39b15761517fa3d21 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 49/88] pvr: do not show selection dialog for a single menu +Subject: [PATCH 49/87] pvr: do not show selection dialog for a single menu hook --- @@ -6591,10 +6591,10 @@ index 14c9cde..57b18a5 100644 1.8.5.1 -From dda2126879cdb55be9bbf6f1c2a7a22ce38746b0 Mon Sep 17 00:00:00 2001 +From 95ab9efbfe81dab304cde338d3fab198d19a93af Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 50/88] X11: use default screen parameters if no output +Subject: [PATCH 50/87] X11: use default screen parameters if no output connected --- @@ -6698,10 +6698,10 @@ index 4329a22..2adf8a0 100644 1.8.5.1 -From 8d3bc76ace6cc04a07c3dc70bf14bfd01dbcff40 Mon Sep 17 00:00:00 2001 +From c7bff0f342a528bf8976c670560a15cadf2c2ee7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 51/88] X11: create parent window +Subject: [PATCH 51/87] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6967,10 +6967,10 @@ index 2a1fb41..e8993f1 100644 1.8.5.1 -From 98b63bb8b0816fcfaa33a68e57c294f98bb2e1a2 Mon Sep 17 00:00:00 2001 +From 6c56b185c0056e5dd87fc9aa14bab9c475a766e9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 52/88] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 52/87] 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 e761e0a1733c2ec383a7395e9f79509bcfc20776 Mon Sep 17 00:00:00 2001 +From e23c0fee1500132bc1deb1b3ee753233b2212e2c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 53/88] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 53/87] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7213,10 +7213,10 @@ index c06b8c5..4390d2e 100644 1.8.5.1 -From 1abb45e865141641f0948664d727343ded00ceac Mon Sep 17 00:00:00 2001 +From 86332774d78fe4bf0ef052c15f90790d3203d81a Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 54/88] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 54/87] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- @@ -7240,17 +7240,17 @@ index c039d80..73dff34 100644 1.8.5.1 -From 1479d765c8473e71b0cbaaeb0c0407de0b48015e Mon Sep 17 00:00:00 2001 +From b7acc078e52e915e520b0807521d876aa5cc3a34 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 55/88] fix incorrect display of fps when dr kicks in +Subject: [PATCH 55/87] 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 8f9536c..28c4ba8 100644 +index 1a8ccee..28b7bc4 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2254,10 +2254,11 @@ void CApplication::Render() @@ -7270,10 +7270,10 @@ index 8f9536c..28c4ba8 100644 1.8.5.1 -From 0ba7f81c400e9ad48cd2de7645904e51e9082a31 Mon Sep 17 00:00:00 2001 +From 2e9cea11365119762f389cf297f471d10da263d1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 56/88] X11: fix mouse coverage +Subject: [PATCH 56/87] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7339,10 +7339,10 @@ index e8993f1..5cccfb7 100644 1.8.5.1 -From 87491eeb6832203e76c63407e81e4b49e55176e5 Mon Sep 17 00:00:00 2001 +From 30def2cf9ef4b2a2f33715dda54737180460db66 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 57/88] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 57/87] X11: fix incorrectly used screen num in desktop resolution --- @@ -7377,10 +7377,10 @@ index 2acb36d..101ba98 100644 1.8.5.1 -From 8a624e6a020d42c66c994660a56d620bd02980ad Mon Sep 17 00:00:00 2001 +From ce8c42f87957c5e4905e9ff14307c46e6bbe184d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 58/88] X11: do not overwrite user selected monitor with +Subject: [PATCH 58/87] X11: do not overwrite user selected monitor with fallback --- @@ -7505,10 +7505,10 @@ index 5cccfb7..1b658e2 100644 1.8.5.1 -From c9506cf1a42057204566cc5c61117bed584774c5 Mon Sep 17 00:00:00 2001 +From 70b80a610fb19650df3a9830ac9c8f6a5ac54b05 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 59/88] xrandr: add turn on/off to wrapper +Subject: [PATCH 59/87] 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 c0607246d149a4f750607da47e2e8aaf47a80194 Mon Sep 17 00:00:00 2001 +From d6790a015175b2497050eac6751052430c3dc812 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 60/88] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 60/87] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7734,10 +7734,10 @@ index 059062f..ab7cc63 100644 1.8.5.1 -From 8a7486ba091f1fb79e2c47ede458d09c81b9a690 Mon Sep 17 00:00:00 2001 +From bb5520a8cb5a3c47965b9d93e12e1002a2b4de2e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 61/88] X11: multi-head improvement - poll for desired output +Subject: [PATCH 61/87] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7752,10 +7752,10 @@ Subject: [PATCH 61/88] 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 3685bd9..c61379c 100755 +index cb173de..e029edc 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6469,7 +6469,7 @@ msgctxt "#14071" +@@ -6465,7 +6465,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -7764,7 +7764,7 @@ index 3685bd9..c61379c 100755 msgctxt "#14074" msgid "Set timezone" -@@ -6601,7 +6601,12 @@ msgctxt "#14100" +@@ -6597,7 +6597,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -7779,10 +7779,10 @@ index 3685bd9..c61379c 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 8e74f3d..eae71de 100644 +index 4a2fa94..8a597e0 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2085,6 +2085,11 @@ +@@ -2108,6 +2108,11 @@ @@ -7794,7 +7794,7 @@ index 8e74f3d..eae71de 100644 0 0 -@@ -2137,6 +2142,7 @@ +@@ -2160,6 +2165,7 @@ @@ -8018,10 +8018,10 @@ index 62003f5..8525ede 100644 1.8.5.1 -From ce4085dcd88fb0bc67cfd79925c2a4cc7f5e9489 Mon Sep 17 00:00:00 2001 +From e09f12507c6e060019dc5457e1a0ecdae39d2e6e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 62/88] X11: ignore mouse move event form other windows +Subject: [PATCH 62/87] 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 edcc8c62bf3180e7ceb82218d17fc3ae750b1e9f Mon Sep 17 00:00:00 2001 +From d901d928479b658efd17afba64cad132c3276f3b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 63/88] renderer: allow some lateness within vblank interval +Subject: [PATCH 63/87] 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 e463a6c781d76ac9926222a402d9833117fcc541 Mon Sep 17 00:00:00 2001 +From 713f24eb5b90860ca73ff76b323e591a49208843 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 64/88] X11: another fix for mouse coverage +Subject: [PATCH 64/87] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8152,10 +8152,10 @@ index 938ad26..e4ca56d 100644 1.8.5.1 -From 8c661a1abe7549eced2d44aceaacb5221c72c8e2 Mon Sep 17 00:00:00 2001 +From 6e701df4cc82f79f3da7f6740c9f405e0e31e193 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 65/88] X11: set windows class name +Subject: [PATCH 65/87] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8197,20 +8197,20 @@ index b3fe5102..df5fe9b 100644 1.8.5.1 -From acbddb577b46bc6a8217e3aee2c11f520b974f96 Mon Sep 17 00:00:00 2001 +From 766a7aa1021e547d282549f8285006b6df749da5 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 66/88] fixed: typo +Subject: [PATCH 66/87] 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 c61379c..41ad4ec 100755 +index e029edc..858cce0 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6603,7 +6603,7 @@ msgstr "" +@@ -6599,7 +6599,7 @@ msgstr "" #: xbmc/settings/settings.xml msgctxt "#14101" @@ -8223,10 +8223,10 @@ index c61379c..41ad4ec 100755 1.8.5.1 -From 46a626999e638af0c7f16a515523a4c44520709f Mon Sep 17 00:00:00 2001 +From 17a05d3cf667aee6d9b419e1ff9193f9592dd3d6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 67/88] ActiveAE: slightly reduce buffer size +Subject: [PATCH 67/87] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- @@ -8251,10 +8251,10 @@ index 76e0fa8..eaf59f1 100644 1.8.5.1 -From 48e5eb12f11b7b06c45e27b0b1c0aa80bddc62b5 Mon Sep 17 00:00:00 2001 +From 00cc223229e620abb8ea3d36c69dde962d3ccdc5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 68/88] Revert "vdpau: comment some features that will be added +Subject: [PATCH 68/87] 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 ff501bb58485df6630954205ea12768ffaca8625 Mon Sep 17 00:00:00 2001 +From f365bc952ae395d158cf193e96aa891ecf8daa7c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 69/88] X11: fix keysyms +Subject: [PATCH 69/87] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8336,10 +8336,10 @@ index e4ca56d..b20130c 100644 1.8.5.1 -From 233dd85891ab23733c14cc4ff082c2ac6e2b3627 Mon Sep 17 00:00:00 2001 +From 853728034b1dbd5542c1a96c2be66fb34ca00e0f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 70/88] X11: fix keysym for non-IM +Subject: [PATCH 70/87] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8362,10 +8362,10 @@ index b20130c..a38890c 100644 1.8.5.1 -From 1bdf139e5f1d107111c7d3d1c9f3330c402549c0 Mon Sep 17 00:00:00 2001 +From a65056a36ccf3c92a7270ed991276bf26c40e4ad Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 71/88] add some missing multi media keys +Subject: [PATCH 71/87] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8420,10 +8420,10 @@ index ee6bb69..364b45a 100644 1.8.5.1 -From 8c8f071a5bc44b4aa9573e64fa7a8d4c8c5e5ba1 Mon Sep 17 00:00:00 2001 +From 228bf3b6e9ebda19483787f22bb398bc341e98a1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 72/88] X11: squash multi +Subject: [PATCH 72/87] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8446,10 +8446,10 @@ index df5fe9b..d8e04d6 100644 1.8.5.1 -From 42426f420a6ad65b89f63fb86e54a5a909cb1850 Mon Sep 17 00:00:00 2001 +From f8d25f3bbbef77e1dd40a89c9bbc95cac26eb5b7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 73/88] X11: do not poll default monitor +Subject: [PATCH 73/87] 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 6e3ae0588d3b10db7c81d889162d6ad88ab76b71 Mon Sep 17 00:00:00 2001 +From 61f8df4dc554e1bda53516566b591d908378f4e8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 74/88] X11: fix broken monitor switching +Subject: [PATCH 74/87] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8483,10 +8483,10 @@ Subject: [PATCH 74/88] 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 eae71de..9ffa8ea 100644 +index 8a597e0..4ef6f46 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2129,7 +2129,6 @@ +@@ -2152,7 +2152,6 @@ -1 @@ -8578,10 +8578,10 @@ index 40bc3b3..1663836 100644 1.8.5.1 -From 6fa031ba471551aa720db0b0581db18924185796 Mon Sep 17 00:00:00 2001 +From be84302e90d7984bd9d70f33372dcea3e7cac1fc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 75/88] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 75/87] X11: remove polling for connected outputs, use xrr events --- @@ -8882,10 +8882,10 @@ index 7ec5be4..14622cb 100644 1.8.5.1 -From fe171e68dc24a86c891789d8e7fb3dc7b5f63a07 Mon Sep 17 00:00:00 2001 +From 14d299abd36cfcef8aba058fca674b69eb5eff88 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 76/88] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 76/87] 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 b28b20e279b69e9db0bc817f7d752666b2d6b853 Mon Sep 17 00:00:00 2001 +From 79384ea3cdb4a26de7d73ff97b1104dbeea7e131 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 77/88] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 77/87] X11: set ExposureMask on gl window, fixes not updated areas --- @@ -9032,10 +9032,10 @@ index 695b352..e55583c 100644 1.8.5.1 -From cb3d515f6de87bc1549046b29953a28c774e2fb0 Mon Sep 17 00:00:00 2001 +From 0ac4740ee567fc4df8a4b1402ab5ff18a080aa15 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 78/88] X11: drop shortcuts, have WM do this +Subject: [PATCH 78/87] 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 ede82914a5f9aeb35831a23832b4ffa4a9f63537 Mon Sep 17 00:00:00 2001 +From b73e255037789f53728d5b59053509d8cd2cd1c1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 -Subject: [PATCH 79/88] X11: adapt to new settings +Subject: [PATCH 79/87] 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 9ffa8ea..fd9a039 100644 +index 4ef6f46..6455c68 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2089,6 +2089,7 @@ +@@ -2112,6 +2112,7 @@ HAS_GLX 0 false @@ -9122,10 +9122,10 @@ index 9ffa8ea..fd9a039 100644 1.8.5.1 -From cbaba8b8a1102711f77e494d90773be1bb2fafa0 Mon Sep 17 00:00:00 2001 +From 51c9f6f0053b2e11d49c96d34d1571b8b336e393 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 -Subject: [PATCH 80/88] X11: adapt to changes in cstdstring +Subject: [PATCH 80/87] X11: adapt to changes in cstdstring --- xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- @@ -9173,10 +9173,10 @@ index 8525ede..c94f2e3 100644 1.8.5.1 -From 41ec2d57870c203245e39e6f5b655baec293903a Mon Sep 17 00:00:00 2001 +From c84f3cd9daed94614a3fac004b34005fca24cdb5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 -Subject: [PATCH 81/88] ActiveAE: correct time of buffered samples by resample +Subject: [PATCH 81/87] ActiveAE: correct time of buffered samples by resample ratio --- @@ -9213,10 +9213,10 @@ index c6e1a6e..200dad3 100644 1.8.5.1 -From 381f8be4f9bfaec506931b2b8c0a1bee21c6345d Mon Sep 17 00:00:00 2001 +From 4b6aeba18cb94b00f814dc3161091dd0b857a481 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 -Subject: [PATCH 82/88] ffmpeg demuxer: faster channel change for PVR addons +Subject: [PATCH 82/87] ffmpeg demuxer: faster channel change for PVR addons without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR) Credits: FernetMenta, Davilla, Popcornmix, Whaupt @@ -9577,10 +9577,10 @@ index ca689d0..f383563 100644 1.8.5.1 -From fd5cafe8bae432090bcb8b9314d23e47a3e8973e Mon Sep 17 00:00:00 2001 +From fb22750341b7bbb1e12721921f21bcb4d232a73e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 -Subject: [PATCH 83/88] ffmpeg demuxer: make sure we start mpegts video with an +Subject: [PATCH 83/87] ffmpeg demuxer: make sure we start mpegts video with an i-frame --- @@ -9664,10 +9664,10 @@ index acde9a8..9ec0877 100644 1.8.5.1 -From 4322ece57cc63f45ff28cb12488cf145fddb2dcd Mon Sep 17 00:00:00 2001 +From 0221be1598d7a517392637a2db1d3657b5b6f0c6 Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 -Subject: [PATCH 84/88] DVDFactoryDemuxer: skip streaminfo for udp tcp and +Subject: [PATCH 84/87] DVDFactoryDemuxer: skip streaminfo for udp tcp and pvr-channels --- @@ -9791,10 +9791,10 @@ index cf7ea3f..7857c3b 100644 1.8.5.1 -From c20be22233a3e918372c133b7a08291b637703cb Mon Sep 17 00:00:00 2001 +From 4b2675236ddbfcc325f290925dd4b0424ebeb259 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 22 Dec 2013 14:52:29 +0100 -Subject: [PATCH 85/88] linux: add shared lib for sse4 operations +Subject: [PATCH 85/87] linux: add shared lib for sse4 operations --- Makefile.in | 8 ++- @@ -10089,10 +10089,10 @@ index 0000000..45aa826 1.8.5.1 -From 088bf9dd7c05c2d8816f73f4bd75f348ab7acaec Mon Sep 17 00:00:00 2001 +From 644912f48e99ff9d24d22abb7376a73b7a86d58f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 19 Dec 2013 15:36:11 +0100 -Subject: [PATCH 86/88] vaapi: option to enable sw filters +Subject: [PATCH 86/87] vaapi: option to enable sw filters --- language/English/strings.po | 14 +- @@ -10107,11 +10107,11 @@ Subject: [PATCH 86/88] 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 41ad4ec..3388f8e 100755 +index 858cce0..e8caa38 100755 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6006,7 +6006,12 @@ msgctxt "#13440" - msgid "Frame Multi Threaded Decoding (less reliable)" +@@ -6002,7 +6002,12 @@ msgctxt "#13440" + msgid "Allow frame-multi-threaded decoding" msgstr "" -#empty strings from id 13441 to 13499 @@ -10124,7 +10124,7 @@ index 41ad4ec..3388f8e 100755 #: system/settings/settings.xml msgctxt "#13500" -@@ -14760,7 +14765,12 @@ msgctxt "#36429" +@@ -14790,7 +14795,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 "" @@ -10139,10 +10139,10 @@ index 41ad4ec..3388f8e 100755 #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index fd9a039..e0f2016 100644 +index 6455c68..79796f6 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -445,6 +445,15 @@ +@@ -464,6 +464,15 @@ true @@ -10157,7 +10157,7 @@ index fd9a039..e0f2016 100644 + HasDXVA2 - 2 + diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp index 8dc8a91..c15f559 100644 --- a/xbmc/cores/VideoRenderers/RenderManager.cpp @@ -10188,7 +10188,7 @@ 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 43d3e70..526ce7f 100644 +index 5927b42..d57aff0 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -37,6 +37,7 @@ @@ -10199,7 +10199,7 @@ index 43d3e70..526ce7f 100644 #ifndef TARGET_POSIX #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5))) -@@ -164,6 +165,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx +@@ -165,6 +166,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx m_dts = DVD_NOPTS_VALUE; m_started = false; m_decoderPts = DVD_NOPTS_VALUE; @@ -10207,7 +10207,7 @@ index 43d3e70..526ce7f 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(); @@ -10216,7 +10216,7 @@ index 43d3e70..526ce7f 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)); @@ -10229,7 +10229,7 @@ index 43d3e70..526ce7f 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; @@ -10293,7 +10293,7 @@ index 43d3e70..526ce7f 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; @@ -10302,7 +10302,7 @@ index 43d3e70..526ce7f 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; @@ -10310,7 +10310,7 @@ index 43d3e70..526ce7f 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; } @@ -10323,7 +10323,7 @@ index 43d3e70..526ce7f 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) { @@ -10332,7 +10332,7 @@ index 43d3e70..526ce7f 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); @@ -10340,7 +10340,7 @@ index 43d3e70..526ce7f 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; @@ -10349,7 +10349,7 @@ index 43d3e70..526ce7f 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, @@ -10358,7 +10358,7 @@ index 43d3e70..526ce7f 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; @@ -10655,7 +10655,7 @@ index a520e42..49d3117 100644 } diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp -index 59c5e40..1227c5c 100644 +index 9c5469b..b30e450 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -554,28 +554,6 @@ void CDVDPlayerVideo::Process() @@ -10716,10 +10716,10 @@ index 59c5e40..1227c5c 100644 1.8.5.1 -From 582994122e3c8338ffc17b8cc385ba7d9fea9c67 Mon Sep 17 00:00:00 2001 +From b3b79ddd56882d2d4bf6976cf580790dbdf5c245 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 3 Jan 2014 20:50:46 +0100 -Subject: [PATCH 87/88] X11: check for user output on resize window +Subject: [PATCH 87/87] X11: check for user output on resize window --- xbmc/windowing/X11/WinSystemX11.cpp | 17 ++++++++++++++--- @@ -10763,267 +10763,3 @@ 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 -