From 8af580273012424298b899463fabcfe101d53fdb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 10 Sep 2013 02:24:09 +0200 Subject: [PATCH] xbmc: update XVBA patch Signed-off-by: Stephan Raue --- ...=> xbmc-995.01-xvba_support-d646570.patch} | 631 ++++++++++++------ 1 file changed, 434 insertions(+), 197 deletions(-) rename packages/mediacenter/xbmc/patches/13.alpha-2ef8929/{xbmc-995.01-xvba_support-3886e9c.patch => xbmc-995.01-xvba_support-d646570.patch} (96%) diff --git a/packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-3886e9c.patch b/packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-d646570.patch similarity index 96% rename from packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-3886e9c.patch rename to packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-d646570.patch index 0cffc8b134..c71f1cca3d 100644 --- a/packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-3886e9c.patch +++ b/packages/mediacenter/xbmc/patches/13.alpha-2ef8929/xbmc-995.01-xvba_support-d646570.patch @@ -1,7 +1,7 @@ -From eca555600c3640fb0847b3fba0e19773bcea3978 Mon Sep 17 00:00:00 2001 +From c543e00ea5e60aba45fdcb042bdfc47ae1896e8c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 2 Aug 2013 18:55:56 +0200 -Subject: [PATCH 01/89] linuxrenderer: do not render if upload texture fails +Subject: [PATCH 01/92] linuxrenderer: do not render if upload texture fails --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 39 ++++++++++++++++----------- @@ -248,10 +248,10 @@ index b986d93..b5c4dec 100644 1.8.4 -From 0a3ca102cd3c44d392405be978bc079284bde1d7 Mon Sep 17 00:00:00 2001 +From c2bb58454a75ab806da153a9c0b3447d2854847d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 -Subject: [PATCH 02/89] vdpau: redesign +Subject: [PATCH 02/92] vdpau: redesign --- language/English/strings.po | 21 +- @@ -276,10 +276,10 @@ Subject: [PATCH 02/89] vdpau: redesign 19 files changed, 3679 insertions(+), 1236 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 0e7ecd5..cd53a85 100644 +index acaa021..ef92431 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5787,7 +5787,17 @@ msgctxt "#13436" +@@ -5791,7 +5791,17 @@ msgctxt "#13436" msgid "Allow hardware acceleration (libstagefright)" msgstr "" @@ -298,7 +298,7 @@ index 0e7ecd5..cd53a85 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6870,7 +6880,7 @@ msgid "Software Blend" +@@ -6874,7 +6884,7 @@ msgid "Software Blend" msgstr "" msgctxt "#16325" @@ -307,7 +307,7 @@ index 0e7ecd5..cd53a85 100644 msgstr "" #empty strings from id 16326 to 16399 -@@ -14182,7 +14192,12 @@ msgctxt "#36420" +@@ -14186,7 +14196,12 @@ msgctxt "#36420" msgid "No info available yet." msgstr "" @@ -6154,10 +6154,10 @@ index a0f7bba..b6b6ec4 100644 1.8.4 -From 3deffe52767c7d9312e0ec0ade54c5276efd977c Mon Sep 17 00:00:00 2001 +From bb2b78823eddcfe6735f5d7706a52327c6c3658c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 -Subject: [PATCH 03/89] vdpau: make interop gl default and remove setting, +Subject: [PATCH 03/92] vdpau: make interop gl default and remove setting, rename and intvert interop yuv --- @@ -6166,10 +6166,10 @@ Subject: [PATCH 03/89] vdpau: make interop gl default and remove setting, 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index cd53a85..df8d841 100644 +index ef92431..b6eee02 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5789,15 +5789,10 @@ msgstr "" +@@ -5793,15 +5793,10 @@ msgstr "" #: system/settings/settings.xml msgctxt "#13437" @@ -6263,10 +6263,10 @@ index c10c7ea..41defb6 100644 1.8.4 -From aef4898cd4b5cce247161e945e3d0a73f2437152 Mon Sep 17 00:00:00 2001 +From 06848e8c20883f45cb7cdc84e9530dc685c19da4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 -Subject: [PATCH 04/89] vdpau: observe ffmpeg tags for color space +Subject: [PATCH 04/92] vdpau: observe ffmpeg tags for color space --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++++-------- @@ -6370,10 +6370,10 @@ index aae4173..8845a16 100644 1.8.4 -From 8dc0409ab3d4372a6be8e6b334bc8dcec73a58a4 Mon Sep 17 00:00:00 2001 +From 6fa723db3a2892f04c69153e71d9c379523d873c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 -Subject: [PATCH 05/89] vdpau: switch off de-interlacing on ff +Subject: [PATCH 05/92] vdpau: switch off de-interlacing on ff --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- @@ -6399,10 +6399,10 @@ index 8a31cd1..6d982a7 100644 1.8.4 -From 51711803a6213fbfb04c8ec121ea622e5591a9e5 Mon Sep 17 00:00:00 2001 +From 8ee700bbcbb04ee7f169809a5119bf9ad37cb21e Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 -Subject: [PATCH 06/89] linuxrenderer: drop method RenderMultiPass +Subject: [PATCH 06/92] linuxrenderer: drop method RenderMultiPass --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- @@ -6452,10 +6452,10 @@ index 8daf72c..b086bae 100644 1.8.4 -From 4aeb96bcd273ada0d890ece46678c7ed9c9aa6ba Mon Sep 17 00:00:00 2001 +From a07e6cc04e50d655fa84b524788bcea73dda86e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 -Subject: [PATCH 07/89] linuxrenderer: implement progressive weave for vdpau +Subject: [PATCH 07/92] linuxrenderer: implement progressive weave for vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 56 +++++++++++++++++++-------- @@ -6584,10 +6584,10 @@ index b086bae..966733e 100644 1.8.4 -From 2d46c77953dfda684f243d817c466ad44d57ee35 Mon Sep 17 00:00:00 2001 +From 46c43a9cb30c3cb91affbba2e65398b0bb144140 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 -Subject: [PATCH 08/89] vdpau: set deinterlacing method to auto, if default +Subject: [PATCH 08/92] vdpau: set deinterlacing method to auto, if default method not supported --- @@ -6619,10 +6619,10 @@ index 6d982a7..9ac8186 100644 1.8.4 -From a03d12ee0bec0475a16d5d6b1d081b0d401e4bdc Mon Sep 17 00:00:00 2001 +From 66c57b07b74e18a8d810adc5981ea653ee24689f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 14 Jun 2013 09:23:22 +0200 -Subject: [PATCH 09/89] vdpau: calculate timestamp of second field when doing +Subject: [PATCH 09/92] vdpau: calculate timestamp of second field when doing deinterlacing --- @@ -6654,10 +6654,10 @@ index 9ac8186..369a19e 100644 1.8.4 -From e09271e26ca1f841b778bab8877fff7a8890dbc7 Mon Sep 17 00:00:00 2001 +From 312628992e0479f46a2dd9af367d6c2d61bee2c9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 2 Aug 2013 13:57:47 +0200 -Subject: [PATCH 10/89] vdpau: comment some features that will be added later +Subject: [PATCH 10/92] vdpau: comment some features that will be added later --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 15 ++++++++++----- @@ -6721,10 +6721,10 @@ index 369a19e..ae7cce7 100644 1.8.4 -From 35bc34363b7f07b85cc1772c60329fd84c30f243 Mon Sep 17 00:00:00 2001 +From 01419202b77b5c8ce1ea6167bd6673a4ac8fc2ad Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 6 Aug 2013 10:37:37 +0200 -Subject: [PATCH 11/89] renderer: protect against div by zero +Subject: [PATCH 11/92] renderer: protect against div by zero --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 7 +++++++ @@ -6752,10 +6752,10 @@ index 1dbb670..fb065ea 100644 1.8.4 -From 11272491db2bb8042895e6745c316de2b1ecd852 Mon Sep 17 00:00:00 2001 +From 5c47161e2dee63228fe0dbba9229693f9366881f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 09:52:46 +0200 -Subject: [PATCH 12/89] vdpau: add fence for detecting when a buffer can be +Subject: [PATCH 12/92] vdpau: add fence for detecting when a buffer can be reused --- @@ -7089,10 +7089,10 @@ index 8845a16..c555d2d 100644 1.8.4 -From 52a114962e17931735cfc5970ff08d43935ce9b9 Mon Sep 17 00:00:00 2001 +From 380d726629dfd0bf60a5fba37e6a58b85fd76b97 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 13/89] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 13/92] videoplayer: adapt lateness detection and dropping to buffering --- @@ -7673,10 +7673,10 @@ index f8ad541..186e271 100644 1.8.4 -From d5e0132f8a147dd756426be74e910d085aacc022 Mon Sep 17 00:00:00 2001 +From 2d3787a518d16986f750c66e202ad788bf3ddc06 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 14/89] video player: present correct pts to user for a/v sync +Subject: [PATCH 14/92] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -7744,10 +7744,10 @@ index 186e271..59c7f09 100644 1.8.4 -From 88420beb8f08c85a4bc7d7725504090755771c46 Mon Sep 17 00:00:00 2001 +From 0ac0a2f67c114867829e9ede034119de84a28d2e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 15/89] videoplayer: some rework and documentation +Subject: [PATCH 15/92] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -7858,10 +7858,10 @@ index 99c8b3c..be3d511 100644 1.8.4 -From 49ac4ae6763c8567c767bc8ffc89efc77fff70b7 Mon Sep 17 00:00:00 2001 +From d15e6e051b103b54be94cb5bed22ab632cb90a3b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 16/89] renderer: bump buffers to 5 +Subject: [PATCH 16/92] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -7884,10 +7884,10 @@ index a61d3cf..df5fe0e 100644 1.8.4 -From 228f4c43329fbb128642558aa20dc9e65841f33e Mon Sep 17 00:00:00 2001 +From 67e266be8f0c5f9912dd5a9d5a6967128fc81e62 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 17/89] videoplayer: update frametime, it might change due to +Subject: [PATCH 17/92] videoplayer: update frametime, it might change due to fps detection --- @@ -7911,10 +7911,10 @@ index be3d511..dbbd11b 100644 1.8.4 -From 8f4d7c67529431e174126ff3ee430ac57c32604d Mon Sep 17 00:00:00 2001 +From e49cfe51e884f0b8f9a5277e6add5250ae14e8d7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 18/89] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 18/92] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -7938,10 +7938,10 @@ index dbbd11b..eb443af 100644 1.8.4 -From 0f11df591c48463d35ac47ff3485ef8d3c1f4919 Mon Sep 17 00:00:00 2001 +From 5fc718526a0184f77a8ef7322595decd2ca26fa4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 19/89] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 19/92] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -7978,10 +7978,10 @@ index d12121f..06c9439 100644 1.8.4 -From 678aa04eff0644c90eb6f4506d64c0f10e882505 Mon Sep 17 00:00:00 2001 +From 238cb63d3eb28211f36021b94a153e44de694b9e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 20/89] X11: ditch SDL for video and window events +Subject: [PATCH 20/92] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -9465,10 +9465,10 @@ index b6b6ec4..448a1bb 100644 1.8.4 -From bc79312701c39dc9c33c6b10eb89803f9b5e0320 Mon Sep 17 00:00:00 2001 +From 13fac052710a7fd9ad7a6ef8397e208715e68c9b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 21/89] X11: Add xbmc icon +Subject: [PATCH 21/92] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -9657,10 +9657,10 @@ index 448a1bb..e618268 100644 1.8.4 -From b2919310142a92096ceb68ac92980ae3167dce4f Mon Sep 17 00:00:00 2001 +From a9cedcc951e0d03c7e554d34a651699be781d2fe Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 22/89] X11: add SDL joystick until we have a better solution +Subject: [PATCH 22/92] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -9714,10 +9714,10 @@ index 5a8bbb8..5bc1de0 100644 1.8.4 -From ed8fdfd99df42974bec1ad04dfb7b76ed1d5de40 Mon Sep 17 00:00:00 2001 +From 11bf4ce1953a74f46d6248acef73486bccadbec9 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 23/89] X11: factor out code handling device reset notification +Subject: [PATCH 23/92] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -9780,10 +9780,10 @@ index e618268..c4d4b76 100644 1.8.4 -From 42cf7efae1adc759ad5e6d6cfe4a082bfe09eb9d Mon Sep 17 00:00:00 2001 +From 8d2ab76083ab6183f89609176533bc70d0043e24 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 24/89] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 24/92] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -9927,10 +9927,10 @@ index c5938af..9f74dd5 100644 1.8.4 -From af8adaaef31e8072b351b3e6dc6e54b4bc620ec9 Mon Sep 17 00:00:00 2001 +From 5e46a38bb3bd40e5e0dfe1d07e82dbb3a8e0a061 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 25/89] xrandr: remove method RestoreState +Subject: [PATCH 25/92] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -10009,10 +10009,10 @@ index 0aec487..00b49dc 100644 1.8.4 -From bff486ba4e3dccf2f72d10bb6a0caff92e6e2ee7 Mon Sep 17 00:00:00 2001 +From 37bc363a851bf63b7b695e6a102191664ca48672 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 26/89] xrandr: observe orientation +Subject: [PATCH 26/92] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -10227,10 +10227,10 @@ index 00b49dc..508604d 100644 1.8.4 -From 28daf46728a533cdfedc8bf00c8b7cb0f2f647de Mon Sep 17 00:00:00 2001 +From ea847955f0e918add5d2f5cc7507441da33b71ed Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 27/89] xrandr: allow getting info for multiple screen's +Subject: [PATCH 27/92] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -10405,10 +10405,10 @@ index 508604d..d37838a 100644 1.8.4 -From 0a4db156a9500f324ee2283e346c540ad7faa03c Mon Sep 17 00:00:00 2001 +From 41daa63aa0b5c3c6a6ccf6274a0f712e2d4924ab Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 28/89] X11: fix multi-head setups +Subject: [PATCH 28/92] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -10423,10 +10423,10 @@ Subject: [PATCH 28/89] X11: fix multi-head setups 9 files changed, 229 insertions(+), 116 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index df8d841..c2985ec 100644 +index b6eee02..4ea1c4e 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -999,7 +999,9 @@ msgctxt "#245" +@@ -1003,7 +1003,9 @@ msgctxt "#245" msgid "Sizing: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1) (VShift: %2.2f)" msgstr "" @@ -11177,10 +11177,10 @@ index 0727bb9..b1eb278 100644 1.8.4 -From 72271a6033634acd241fcceddb6d8a0ad6c3808f Mon Sep 17 00:00:00 2001 +From d9f545829aa5c2d9031ffb622391672002525ca1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 29/89] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 29/92] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -11248,10 +11248,10 @@ index 095012f..60a6878 100644 1.8.4 -From b52484f032cfadfcaba370bc853046e04b7f2a18 Mon Sep 17 00:00:00 2001 +From 12f9362c17fc135ead21dd56db24b6d4d3571798 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 30/89] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 30/92] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -11323,10 +11323,10 @@ index 5bf3656..0b9e7b3 100644 1.8.4 -From fda1da1a299bc890e1ddcd17416a0d0ba4131684 Mon Sep 17 00:00:00 2001 +From edbc516af04507858d4aba14ac20ce09e669e462 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 31/89] X11: recreate gl context after output has changed +Subject: [PATCH 31/92] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -11477,10 +11477,10 @@ index 60a6878..d6ba80a 100644 1.8.4 -From 227e85e73999acccfbd5f4e7afeabf3627b57676 Mon Sep 17 00:00:00 2001 +From 7df8409e1df2ef664801446955bd17da53047af6 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 32/89] X11: hook video reference clock in windowing +Subject: [PATCH 32/92] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -11685,10 +11685,10 @@ index dd65a1b..afd71fc 100644 1.8.4 -From b0e76572dad24bda2830fb9ba94deff6f33f3073 Mon Sep 17 00:00:00 2001 +From 6728f3c34dce4c1359e4572f5f2b33170f809929 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 33/89] X11: fix video calibrations +Subject: [PATCH 33/92] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -11780,10 +11780,10 @@ index 05aa60e..95672d1 100644 1.8.4 -From 9a150ea0ce2be482851ffee12694138444819832 Mon Sep 17 00:00:00 2001 +From 2bd0c10cd40582e29fdfeee4ccf2b541dc798d6f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 34/89] X11: deactivate screen saver on startup +Subject: [PATCH 34/92] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -11853,10 +11853,10 @@ index 95672d1..51ac314 100644 1.8.4 -From 20bc26189abf7b5017222ccb78aac580aa74b271 Mon Sep 17 00:00:00 2001 +From 223176fc738c23565a313aedc28a6b99b6200751 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 35/89] X11: change method of going full-screen +Subject: [PATCH 35/92] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -11900,10 +11900,10 @@ index 14a4307..66b91fd 100644 1.8.4 -From 758752ce2888e328cbf50ee3539058e3b48f613b Mon Sep 17 00:00:00 2001 +From fe6fd2dd1a49256216d2d9f71ceda5a7e9fe1d6f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 36/89] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 36/92] X11: reset key repeat and key modifier on focus lost and gain --- @@ -11935,10 +11935,10 @@ index c58067b..c9f8a20 100644 1.8.4 -From 31014a0daf13ddcb1cc1c83f000119b9cf6022a7 Mon Sep 17 00:00:00 2001 +From fea5a39655a61f34aab292bfafc44ef1e7d17452 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 37/89] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 37/92] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -12155,10 +12155,10 @@ index 6100933..72955ad 100644 1.8.4 -From cef9360ad1f57ade5837e108634d17607ab025cf Mon Sep 17 00:00:00 2001 +From fbe6b58b3083ff053c263ee4feffdb05f6e8e101 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 38/89] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 38/92] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -12222,10 +12222,10 @@ index 72955ad..102a076 100644 1.8.4 -From 82fb5ea76e1c480888888e84094c345d98a94653 Mon Sep 17 00:00:00 2001 +From c63fd140616c676ff388930bf8cfceb4ca032ad8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 39/89] add missing keys to xbmc keytable +Subject: [PATCH 39/92] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -12248,10 +12248,10 @@ index b430f55..246164b 100644 1.8.4 -From 4745bfd4bba075593cd54c9711503aef05d92294 Mon Sep 17 00:00:00 2001 +From ea60694d30c2e06a6f8824c01294f36fbcc73392 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 40/89] videorefclock: temp deactivate of nv settings +Subject: [PATCH 40/92] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -12274,10 +12274,10 @@ index 3bd8133..59f924c 100644 1.8.4 -From c305d0c9c06b4b34349958c61f6260385db89ec6 Mon Sep 17 00:00:00 2001 +From 5298be8d4ea65f0ddb7af1342032171cdb8257fc Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 41/89] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 41/92] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -12308,10 +12308,10 @@ index 59f924c..2f8bc69 100644 1.8.4 -From 17464de75451eeb6f5698ecb6636075897de5554 Mon Sep 17 00:00:00 2001 +From b79979f1f1f8edbf67f60b6766d6a9957ff78c87 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 42/89] X11: fix icon texture after +Subject: [PATCH 42/92] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -12419,10 +12419,10 @@ index 66b91fd..b00eddc 100644 1.8.4 -From 2ae04a51c447f32c17a780c6031da3a98363de37 Mon Sep 17 00:00:00 2001 +From 44c2bbd0460ae8c00b744192891245d96dc67414 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 43/89] X11: check for window manager +Subject: [PATCH 43/92] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -12543,10 +12543,10 @@ index 51ac314..ce3c289 100644 1.8.4 -From 0506ca4154aaeb734d03cd0dff3be7012b6d5f8d Mon Sep 17 00:00:00 2001 +From 27a40a3b1bd2c8492c033e293d99b8053e0e0ab1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 44/89] X11: dont set window on xrandr if no mode available +Subject: [PATCH 44/92] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -12583,10 +12583,10 @@ index 05279ad..9697cbb 100644 1.8.4 -From b8ee1b78194d1f4bd719d6641de16e31a5b6531e Mon Sep 17 00:00:00 2001 +From 312891e420e7cecd1a0ecfd10ea61f72dd5c2f22 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 45/89] X11: fix crash after a resolution change on startup +Subject: [PATCH 45/92] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -12610,10 +12610,10 @@ index 9697cbb..868071c 100644 1.8.4 -From a8d17b8138d7f7abe01f5c6621aebe95a99a5c51 Mon Sep 17 00:00:00 2001 +From e784d3b2ea5b4e7c5fd9af33462cfc71cca5c66d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 46/89] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 46/92] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -12636,10 +12636,10 @@ index 868071c..9ff947c 100644 1.8.4 -From de4664a82dca60d0f475f34f94cbb4568134a41a Mon Sep 17 00:00:00 2001 +From e4f4ab1cbc25c049107f255b6628932ec0ee67fa Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 -Subject: [PATCH 47/89] ffmpeg: add xvba hwaccel, co-author @fritsch +Subject: [PATCH 47/92] ffmpeg: add xvba hwaccel, co-author fritsch --- lib/ffmpeg/configure | 11 ++ @@ -13546,10 +13546,10 @@ index 1c00ac4..6437e29 100644 1.8.4 -From 249d0af689f94f13e3bcdfb3f54ee45d3732bdbc Mon Sep 17 00:00:00 2001 +From 43f0fe351754159238f7e6b8810605821fa64199 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 -Subject: [PATCH 48/89] xvba: add decoder, co-author @fritsch +Subject: [PATCH 48/92] xvba: add decoder, co-author fritsch --- configure.in | 47 + @@ -13667,10 +13667,10 @@ index 0337705..1b88d24 100644 --enable-pthreads \ --enable-runtime-cpudetect \ diff --git a/language/English/strings.po b/language/English/strings.po -index c2985ec..075e0c6 100644 +index 4ea1c4e..5c7defd 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -5794,7 +5794,12 @@ msgctxt "#13437" +@@ -5798,7 +5798,12 @@ msgctxt "#13437" msgid "Prefer VDPAU Video Mixer" msgstr "" @@ -13684,7 +13684,7 @@ index c2985ec..075e0c6 100644 #: system/settings/settings.xml msgctxt "#13500" -@@ -6880,7 +6885,11 @@ msgctxt "#16325" +@@ -6884,7 +6889,11 @@ msgctxt "#16325" msgid "VDPAU - Bob" msgstr "" @@ -17057,10 +17057,10 @@ index 8f30248..db58075 100644 1.8.4 -From 20b11001a85ca36750249974f98ea1b6885ac08e Mon Sep 17 00:00:00 2001 +From 3b15c3cfd8fbe0c999fa2479b62e90c155685f96 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 -Subject: [PATCH 49/89] xvba: do not use vaapi if xvba is present +Subject: [PATCH 49/92] xvba: do not use vaapi if xvba is present --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ @@ -17090,10 +17090,10 @@ index 2d59b09..aa83875 100644 1.8.4 -From c0b1b3e7cb8775a134b9fbc2d1cf1cfcc5e5dd20 Mon Sep 17 00:00:00 2001 +From c8fce53172c241c8309e55c54c591ec1ce6afc15 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 50/89] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 50/92] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -17139,10 +17139,10 @@ index 0016c0b..3514856 100644 1.8.4 -From 35ce17f3bf1e2175635427f5a789a2eb388c6e05 Mon Sep 17 00:00:00 2001 +From f0f1bf20f0442fa843063b04e19c5ed8f0514fb2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 51/89] dvdplayer: observe pts counter overflow +Subject: [PATCH 51/92] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -17429,10 +17429,10 @@ index aef5ab1..35abbdf 100644 1.8.4 -From 4ff9feb5023035324cad3d12d8135d04d72f6652 Mon Sep 17 00:00:00 2001 +From 35effd70277b899bd40c3083094a8dcd51e878de Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 52/89] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 52/92] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -17465,10 +17465,10 @@ index c2808c3..5d487f4 100644 1.8.4 -From c5f0c48e362eebb0d64ea391673a5e5e0dce616d Mon Sep 17 00:00:00 2001 +From ed58faaede557555b23ba6c16b81233e151bd340 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 53/89] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 53/92] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -17534,10 +17534,10 @@ index 0d792af..b7b7a80 100644 1.8.4 -From b03e5dec167d524df52641e3d94d0c5ff7c6d969 Mon Sep 17 00:00:00 2001 +From dba4c650cf55a92ee60ccce57d9de4bbc204a6d3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 54/89] player: fix rewind +Subject: [PATCH 54/92] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -17752,10 +17752,10 @@ index 59c7f09..65dea76 100644 1.8.4 -From af1471e4edfd1d7dbe9377c8a5ec93b8093d1857 Mon Sep 17 00:00:00 2001 +From cbd0f850b81dd1d87c1eae20ad74032b398ef913 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 55/89] xrandr: fix query for multiple screens +Subject: [PATCH 55/92] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -17796,10 +17796,10 @@ index 9e181f2..ce0a02b 100644 1.8.4 -From 60bf0adac6c2427fe68dba0cf4cd7afa03257cd4 Mon Sep 17 00:00:00 2001 +From 566f77b7443d382ab8eaaa0dc2b95d5b1bf40c30 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 56/89] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 56/92] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -17826,10 +17826,10 @@ index 9ff947c..a3394e6 100644 1.8.4 -From a69acc91a5af2e5ded984c0342618f425bfadc50 Mon Sep 17 00:00:00 2001 +From 354fb1cb9d3a8d334861d2e7c3422ea27c5c6de7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 57/89] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 57/92] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -17854,10 +17854,10 @@ index a3394e6..b941c14 100644 1.8.4 -From 617b4ff7f11e16f7ebd023c82209a1d8ae2d26b7 Mon Sep 17 00:00:00 2001 +From 66b9c4ac765253621bb307413a433186c1c09746 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 58/89] x11: support for multiple x screens +Subject: [PATCH 58/92] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -17880,10 +17880,10 @@ index ce0a02b..aa27d2b 100644 1.8.4 -From 0168245eee2e763a9b2dabc55a8745b365ff2a80 Mon Sep 17 00:00:00 2001 +From c7445a98c106f462ead06e7e7d46eb034d42d998 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 59/89] pvr: increase changes counter of stream on stream +Subject: [PATCH 59/92] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -17891,7 +17891,7 @@ Subject: [PATCH 59/89] pvr: increase changes counter of stream on stream 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp -index 62fbb41..a80c789 100644 +index b96d520..df89f6f 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -339,9 +339,7 @@ void CDVDDemuxPVRClient::RequestStreams() @@ -17917,10 +17917,10 @@ index 62fbb41..a80c789 100644 1.8.4 -From ba36c5babf99746f6ab01e46605a46da9a0bbe63 Mon Sep 17 00:00:00 2001 +From 2efbf1cc2c374a55763a1e14baaed315caf7bdfa Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 60/89] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 60/92] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -17942,10 +17942,10 @@ index 4a5aab4..da5d412 100644 1.8.4 -From e7cb292b8a5660c59a4f7b77fb90f19e21b2c271 Mon Sep 17 00:00:00 2001 +From 10e5e5457e8670bc5c4a7287657d3fccf8a2c3e6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 61/89] X11: remove toggle full screen after resume +Subject: [PATCH 61/92] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -17971,10 +17971,10 @@ index 2033574..c79bbc1 100644 1.8.4 -From b972b8da4fb8441f07ff21cb1d5e7dfc44bbed84 Mon Sep 17 00:00:00 2001 +From cb9093718cda92031c7e940b219d15dfb274a239 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 62/89] xrandr: set screen on mode change command +Subject: [PATCH 62/92] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -17997,10 +17997,10 @@ index aa27d2b..67bf6ca 100644 1.8.4 -From a1dc94956fc9886b60a35a66c9ad81adc9906f66 Mon Sep 17 00:00:00 2001 +From 073d43dc107541c24481945f5acf8cb427f5e704 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 63/89] X11: recreate glx context when output changes +Subject: [PATCH 63/92] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -18051,10 +18051,10 @@ index ce3c289..311e4cc 100644 1.8.4 -From 5f6cbd913b55015a8e4d8263e1c014b18f4b5d99 Mon Sep 17 00:00:00 2001 +From 083ce98319c0c9b849e16efc469f374651e1bd12 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 64/89] pvr: do not show selection dialog for a single menu +Subject: [PATCH 64/92] pvr: do not show selection dialog for a single menu hook --- @@ -18092,10 +18092,10 @@ index aab6345..a880778 100644 1.8.4 -From d93a12d971907a313979a77d3c619fc49baa8bdb Mon Sep 17 00:00:00 2001 +From e859d3f125a8824b65b10136436078e36cbd7b8b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 65/89] X11: use default screen parameters if no output +Subject: [PATCH 65/92] X11: use default screen parameters if no output connected --- @@ -18199,10 +18199,10 @@ index c84e793..5215f4d 100644 1.8.4 -From 70b83f1cea8eff42473dd5b96fd56d976196f1bd Mon Sep 17 00:00:00 2001 +From e7621880632371b72b295e8e9a6ccd24c72e11a9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 66/89] X11: create parent window +Subject: [PATCH 66/92] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -18468,10 +18468,10 @@ index 311e4cc..49365a8 100644 1.8.4 -From c60e19936076c9b9abe5bde88dcd0eb7bc3f86e1 Mon Sep 17 00:00:00 2001 +From 625665f08a3c7232d95b9b2c1e281dff98b2281e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 67/89] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 67/92] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -18673,10 +18673,10 @@ index 102a076..5b1f3fa 100644 1.8.4 -From bd7ce9a61bce915cfeb8554cf0b691b299689507 Mon Sep 17 00:00:00 2001 +From 68254ec1769a18a4f56dde4ad849f26fad9532fb Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 68/89] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 68/92] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -18714,20 +18714,20 @@ index c06b8c5..4390d2e 100644 1.8.4 -From 5a1a4ebda29fea6367646836da34ebd0fed483a4 Mon Sep 17 00:00:00 2001 +From e496631276113a87beb9ea30eee4f14902ba3907 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 69/89] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 69/92] 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 6c13e35..a1d2609 100644 +index 12122e5..982b0a3 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp -@@ -2465,7 +2465,8 @@ void COMXPlayer::HandleMessages() +@@ -2472,7 +2472,8 @@ void COMXPlayer::HandleMessages() m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true)); m_playSpeed = speed; @@ -18741,10 +18741,10 @@ index 6c13e35..a1d2609 100644 1.8.4 -From f13400a994978d22418aab743a477c5675b675a7 Mon Sep 17 00:00:00 2001 +From ba73fd38ab94f7f81c1c1690e411dda228f619da Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 70/89] fix incorrect display of fps when dr kicks in +Subject: [PATCH 70/92] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -18771,10 +18771,10 @@ index becf35d..dd9d1e1 100644 1.8.4 -From 17132bac1e5d9354f2c57a054bdca7a1545ab847 Mon Sep 17 00:00:00 2001 +From 9eb4af8e626e9ebbf7f2846e3267cc07be903cf7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 71/89] X11: fix mouse coverage +Subject: [PATCH 71/92] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -18840,10 +18840,10 @@ index 49365a8..924af1d 100644 1.8.4 -From 8d410de650dfb1b1782e196f241b3845a4d291aa Mon Sep 17 00:00:00 2001 +From 3fee0a2c4a652327a858f59ed25eb31f91f333f2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 72/89] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 72/92] X11: fix incorrectly used screen num in desktop resolution --- @@ -18878,10 +18878,10 @@ index 186a28e..66955b8 100644 1.8.4 -From 16bdae923c9f30193dcb9f729cc180da989563a1 Mon Sep 17 00:00:00 2001 +From 47f0800857719e51489d733178a0790bac64c3da Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 73/89] X11: do not overwrite user selected monitor with +Subject: [PATCH 73/92] X11: do not overwrite user selected monitor with fallback --- @@ -19006,10 +19006,10 @@ index 924af1d..2fb9e0f 100644 1.8.4 -From 2ed6a56e8bb9c87e23f2eff14027eeb078a88c12 Mon Sep 17 00:00:00 2001 +From 4796ca401d76704a4f45a70bb473e3176d0557a3 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 74/89] xrandr: add turn on/off to wrapper +Subject: [PATCH 74/92] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -19175,10 +19175,10 @@ index d37838a..059062f 100644 1.8.4 -From 0d4f602533f0b8e23efe91ec3e061b13c16b844e Mon Sep 17 00:00:00 2001 +From 2837feba0c6dc8ab40a4ecc387fe2d1958685a19 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 75/89] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 75/92] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -19235,10 +19235,10 @@ index 059062f..ab7cc63 100644 1.8.4 -From 0581543c0295cb9f41d32f0e73c4dbbcfc34c97a Mon Sep 17 00:00:00 2001 +From 6ec9d5af504822f1f37f8571b3f350d920182b5d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 76/89] X11: multi-head improvement - poll for desired output +Subject: [PATCH 76/92] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -19253,10 +19253,10 @@ Subject: [PATCH 76/89] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 075e0c6..71c6d4a 100644 +index 5c7defd..76f56bb 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6254,7 +6254,7 @@ msgctxt "#14071" +@@ -6258,7 +6258,7 @@ msgctxt "#14071" msgid "Allow file renaming and deletion" msgstr "" @@ -19265,7 +19265,7 @@ index 075e0c6..71c6d4a 100644 msgctxt "#14074" msgid "Set timezone" -@@ -6386,7 +6386,12 @@ msgctxt "#14100" +@@ -6390,7 +6390,12 @@ msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -19519,10 +19519,10 @@ index 4809821..1ad26b2 100644 1.8.4 -From d56893ca07e4592231fe269e5ff31483dd6dcaee Mon Sep 17 00:00:00 2001 +From dd3e11e1c6847ccee4b101c2632c7c5bccea2dbf Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 77/89] X11: ignore mouse move event form other windows +Subject: [PATCH 77/92] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -19554,10 +19554,10 @@ index 6ddaead..e4451fe 100644 1.8.4 -From e62b8a4aeba9509fd25e72a3f979367f3984ad8e Mon Sep 17 00:00:00 2001 +From 34b584412f5113e90e52bd7d9f587d94564b7ea8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 78/89] renderer: allow some lateness within vblank interval +Subject: [PATCH 78/92] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -19617,10 +19617,10 @@ index befd851..27283ec 100644 1.8.4 -From de89d040f0910bedd2498f5bb22fad98d1f96a2e Mon Sep 17 00:00:00 2001 +From 868b40722fca1e7bd6a722ba4f35368371fefd04 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 79/89] X11: another fix for mouse coverage +Subject: [PATCH 79/92] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -19653,10 +19653,10 @@ index e4451fe..582b9f5 100644 1.8.4 -From a236cf5fcf766094816f92ac8d335f7d89d93694 Mon Sep 17 00:00:00 2001 +From d171700fd3030c9e26f0491192a781fe1f2390fb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 80/89] X11: set windows class name +Subject: [PATCH 80/92] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -19698,20 +19698,20 @@ index 7e4b637..44e40a3 100644 1.8.4 -From 43c73d114e52ee770df95610f6dde308692f13b9 Mon Sep 17 00:00:00 2001 +From 4b6cb92761b437f73161a1823086c1e5e9308f35 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 81/89] fixed: typo +Subject: [PATCH 81/92] 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 71c6d4a..4814e69 100644 +index 76f56bb..72be5e1 100644 --- a/language/English/strings.po +++ b/language/English/strings.po -@@ -6388,7 +6388,7 @@ msgstr "" +@@ -6392,7 +6392,7 @@ msgstr "" #: xbmc/settings/settings.xml msgctxt "#14101" @@ -19724,10 +19724,10 @@ index 71c6d4a..4814e69 100644 1.8.4 -From 9b618eb033c13bbfbd801f6fb402fc18fbf3c868 Mon Sep 17 00:00:00 2001 +From 9a82876013f47330a78228bd66e258c09fb7925b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 82/89] ActiveAE: slightly reduce buffer size +Subject: [PATCH 82/92] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- @@ -19752,10 +19752,10 @@ index 3f0254d..59847ae 100644 1.8.4 -From fc54b6edfeb762e701d83eb25b73b4fcc75735b7 Mon Sep 17 00:00:00 2001 +From a6505bde2ff740013906bbdfa43c9fdd27c5e7b0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 83/89] Revert "vdpau: comment some features that will be added +Subject: [PATCH 83/92] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -19821,10 +19821,10 @@ index 87c0319..2f9e631 100644 1.8.4 -From 6df94a2652ae6daeee32d6e5fab70efa0880c61f Mon Sep 17 00:00:00 2001 +From be2a89452d7d7576eb3a01a95271e59653cb0c26 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 84/89] X11: fix keysyms +Subject: [PATCH 84/92] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -19847,10 +19847,10 @@ index 582b9f5..ca31278 100644 1.8.4 -From ae393c69253640c346772c4ce5baf13b803e018d Mon Sep 17 00:00:00 2001 +From 37103f278cdb0926eda8917fec3023fd54750ef5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 85/89] X11: fix keysym for non-IM +Subject: [PATCH 85/92] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -19873,10 +19873,10 @@ index ca31278..db50d3c 100644 1.8.4 -From 365538c881144bf5cc4c70993356e4502740c37a Mon Sep 17 00:00:00 2001 +From 451d4174afc90f874c6323d84b03720b43aad2b7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 86/89] add some missing multi media keys +Subject: [PATCH 86/92] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -19931,10 +19931,10 @@ index ee6bb69..364b45a 100644 1.8.4 -From f6c11c7b6e4bdd6312b46f240a03f1b9c91fed5e Mon Sep 17 00:00:00 2001 +From 1dd1ed9be27574166cea7d3a7eeb838ec64a672a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:32:06 +0200 -Subject: [PATCH 87/89] CWinSystemBase: keep RES_DESKTOP untouched at pos 0, +Subject: [PATCH 87/92] CWinSystemBase: keep RES_DESKTOP untouched at pos 0, fixes toggle fullscreen --- @@ -19969,10 +19969,10 @@ index bad5c95..b789134 100644 1.8.4 -From 86d8693723f05552e6a328bbc38537489905d45f Mon Sep 17 00:00:00 2001 +From 4c2a00eb2464698ec2a279b3455ca610be0509d7 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 88/89] X11: squash multi +Subject: [PATCH 88/92] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -19995,10 +19995,10 @@ index 44e40a3..a00481e 100644 1.8.4 -From 3886e9c703bc50198b8c310ceab36e5fbe6d1a2e Mon Sep 17 00:00:00 2001 +From 93607d509812396eb0b989593c4a3cc65afa6f2d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 89/89] X11: do not poll default monitor +Subject: [PATCH 89/92] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -20020,3 +20020,240 @@ index a00481e..58ee352 100644 -- 1.8.4 + +From 615c1fe2ff904cdb9ebcd8edc0b2c42c3cd6218c Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Mon, 9 Sep 2013 12:13:15 +0200 +Subject: [PATCH 90/92] ffmpeg backport: h264: do not discard NAL_SEI when + skipping frames + +--- + lib/ffmpeg/libavcodec/h264.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/ffmpeg/libavcodec/h264.c b/lib/ffmpeg/libavcodec/h264.c +index 4f09c67..62ac8fb 100644 +--- a/lib/ffmpeg/libavcodec/h264.c ++++ b/lib/ffmpeg/libavcodec/h264.c +@@ -4529,8 +4529,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, + first_slice = hx->nal_unit_type; + } + +- // FIXME do not discard SEI id +- if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0) ++ if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0 && h->nal_unit_type != NAL_SEI) + continue; + + again: +-- +1.8.4 + + +From 452bb4cfee19f8d619007c6091a8786188ed4fc9 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 8 Sep 2013 20:02:17 +0200 +Subject: [PATCH 91/92] ActiveAE: fix toggling stereo upmix for spdif + +--- + .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 44 +++++++++++++--------- + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 4 +- + 2 files changed, 29 insertions(+), 19 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +index 59847ae..4fa3a2d 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +@@ -796,13 +796,9 @@ void CActiveAE::Process() + } + } + +-void CActiveAE::Configure(AEAudioFormat *desiredFmt) ++AEAudioFormat CActiveAE::GetInputFormat(AEAudioFormat *desiredFmt) + { +- bool initSink = false; +- +- AEAudioFormat sinkInputFormat, inputFormat; +- AEAudioFormat oldInternalFormat = m_internalFormat; +- bool updateMode = true; ++ AEAudioFormat inputFormat; + + if (m_streams.empty()) + { +@@ -822,16 +818,28 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt) + // keep format when having multiple streams + else if (m_streams.size() > 1 && m_silenceBuffers == NULL) + { +- inputFormat = m_sinkRequestFormat; +- updateMode = false; ++ inputFormat = m_inputFormat; + } + else + { + inputFormat = m_streams.front()->m_format; ++ m_inputFormat = inputFormat; + } + ++ return inputFormat; ++} ++ ++void CActiveAE::Configure(AEAudioFormat *desiredFmt) ++{ ++ bool initSink = false; ++ ++ AEAudioFormat sinkInputFormat, inputFormat; ++ AEAudioFormat oldInternalFormat = m_internalFormat; ++ ++ inputFormat = GetInputFormat(desiredFmt); ++ + m_sinkRequestFormat = inputFormat; +- ApplySettingsToFormat(m_sinkRequestFormat, m_settings, updateMode); ++ ApplySettingsToFormat(m_sinkRequestFormat, m_settings, (int*)&m_mode); + std::string device = AE_IS_RAW(m_sinkRequestFormat.m_dataFormat) ? m_settings.passthoughdevice : m_settings.device; + std::string driver; + CAESinkFactory::ParseDevice(device, driver); +@@ -1202,10 +1210,10 @@ void CActiveAE::ChangeResamplers() + } + } + +-void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &settings, bool setmode) ++void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &settings, int *mode) + { +- if (setmode) +- m_mode = MODE_PCM; ++ if (mode) ++ *mode = MODE_PCM; + + // raw pass through + if (m_settings.mode != AUDIO_ANALOG && AE_IS_RAW(format.m_dataFormat)) +@@ -1218,8 +1226,8 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + { + CLog::Log(LOGERROR, "CActiveAE::ApplySettingsToFormat - input audio format is wrong"); + } +- if (setmode) +- m_mode = MODE_RAW; ++ if (mode) ++ *mode = MODE_RAW; + } + // transcode + else if (m_settings.mode != AUDIO_ANALOG && +@@ -1231,8 +1239,8 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + format.m_dataFormat = AE_FMT_AC3; + format.m_sampleRate = 48000; + format.m_channelLayout = AE_CH_LAYOUT_2_0; +- if (setmode) +- m_mode = MODE_TRANSCODE; ++ if (mode) ++ *mode = MODE_TRANSCODE; + } + else + { +@@ -1283,7 +1291,7 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + + bool CActiveAE::NeedReconfigureBuffers() + { +- AEAudioFormat newFormat = m_sinkRequestFormat; ++ AEAudioFormat newFormat = GetInputFormat(); + ApplySettingsToFormat(newFormat, m_settings); + + if (newFormat.m_dataFormat != m_sinkRequestFormat.m_dataFormat || +@@ -1296,7 +1304,7 @@ bool CActiveAE::NeedReconfigureBuffers() + + bool CActiveAE::NeedReconfigureSink() + { +- AEAudioFormat newFormat = m_sinkRequestFormat; ++ AEAudioFormat newFormat = GetInputFormat(); + ApplySettingsToFormat(newFormat, m_settings); + + std::string device = AE_IS_RAW(newFormat.m_dataFormat) ? m_settings.passthoughdevice : m_settings.device; +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h +index 462c993..d684a44 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h +@@ -252,8 +252,9 @@ class CActiveAE : public IAE, private CThread + void LoadSettings(); + bool NeedReconfigureBuffers(); + bool NeedReconfigureSink(); +- void ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &settings, bool setmode = false); ++ void ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &settings, int *mode = NULL); + void Configure(AEAudioFormat *desiredFmt = NULL); ++ AEAudioFormat GetInputFormat(AEAudioFormat *desiredFmt = NULL); + CActiveAEStream* CreateStream(MsgStreamNew *streamMsg); + void DiscardStream(CActiveAEStream *stream); + void SFlushStream(CActiveAEStream *stream); +@@ -297,6 +298,7 @@ class CActiveAE : public IAE, private CThread + AEAudioFormat m_sinkRequestFormat; + AEAudioFormat m_encoderFormat; + AEAudioFormat m_internalFormat; ++ AEAudioFormat m_inputFormat; + AudioSettings m_settings; + CEngineStats m_stats; + IAEEncoder *m_encoder; +-- +1.8.4 + + +From d64657004969b56678534798ef0aef16838fab21 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 8 Sep 2013 20:50:40 +0200 +Subject: [PATCH 92/92] ActiveAE: fix channel layout for audiophile mode + +--- + .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 31 ++++++++++++---------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +index 4fa3a2d..f8a44b5 100644 +--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +@@ -1249,21 +1249,27 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + settings.stereoupmix || + !g_advancedSettings.m_audioAudiophile) + { ++ CAEChannelInfo stdLayout; + switch (settings.channels) + { + default: +- case 0: format.m_channelLayout = AE_CH_LAYOUT_2_0; break; +- case 1: format.m_channelLayout = AE_CH_LAYOUT_2_0; break; +- case 2: format.m_channelLayout = AE_CH_LAYOUT_2_1; break; +- case 3: format.m_channelLayout = AE_CH_LAYOUT_3_0; break; +- case 4: format.m_channelLayout = AE_CH_LAYOUT_3_1; break; +- case 5: format.m_channelLayout = AE_CH_LAYOUT_4_0; break; +- case 6: format.m_channelLayout = AE_CH_LAYOUT_4_1; break; +- case 7: format.m_channelLayout = AE_CH_LAYOUT_5_0; break; +- case 8: format.m_channelLayout = AE_CH_LAYOUT_5_1; break; +- case 9: format.m_channelLayout = AE_CH_LAYOUT_7_0; break; +- case 10: format.m_channelLayout = AE_CH_LAYOUT_7_1; break; ++ case 0: stdLayout = AE_CH_LAYOUT_2_0; break; ++ case 1: stdLayout = AE_CH_LAYOUT_2_0; break; ++ case 2: stdLayout = AE_CH_LAYOUT_2_1; break; ++ case 3: stdLayout = AE_CH_LAYOUT_3_0; break; ++ case 4: stdLayout = AE_CH_LAYOUT_3_1; break; ++ case 5: stdLayout = AE_CH_LAYOUT_4_0; break; ++ case 6: stdLayout = AE_CH_LAYOUT_4_1; break; ++ case 7: stdLayout = AE_CH_LAYOUT_5_0; break; ++ case 8: stdLayout = AE_CH_LAYOUT_5_1; break; ++ case 9: stdLayout = AE_CH_LAYOUT_7_0; break; ++ case 10: stdLayout = AE_CH_LAYOUT_7_1; break; + } ++ ++ if (g_advancedSettings.m_audioAudiophile) ++ format.m_channelLayout.ResolveChannels(stdLayout); ++ else ++ format.m_channelLayout = stdLayout; + } + + if (m_settings.mode == AUDIO_IEC958 && format.m_sampleRate > 48000) +@@ -1283,9 +1289,6 @@ void CActiveAE::ApplySettingsToFormat(AEAudioFormat &format, AudioSettings &sett + { + format.m_channelLayout = AE_CH_LAYOUT_2_0; + } +- +- CAEChannelInfo stdLayout = format.m_channelLayout; +- format.m_channelLayout.ResolveChannels(stdLayout); + } + } + +-- +1.8.4 +