diff --git a/projects/RPi/patches/xbmc-master/xbmc-master-newclock3.patch b/projects/RPi/patches/xbmc-master/xbmc-master-newclock3.patch index fda7b128ad..4d28fc7311 100644 --- a/projects/RPi/patches/xbmc-master/xbmc-master-newclock3.patch +++ b/projects/RPi/patches/xbmc-master/xbmc-master-newclock3.patch @@ -1,7 +1,7 @@ -From 1e848e4c33ff52db81a2abb033d37f62c4e519ce Mon Sep 17 00:00:00 2001 +From 35419e975b9616f614faf987889361755b9a49d9 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 14 Nov 2013 19:48:41 +0000 -Subject: [PATCH 01/89] More efficient infobool expression evaluator +Subject: [PATCH 01/82] More efficient infobool expression evaluator Expession infobools are evaluated at runtime from one or more single infobools and a combination of boolean NOT, AND and OR operators. Previously, parsing @@ -500,10 +500,10 @@ index 4e0faee..0a91399 100644 1.9.3 -From 54756a644dbe76e206898f1e032ef62dcdcf707d Mon Sep 17 00:00:00 2001 +From 3ea2259e88b2b1b5036b6db81ec7b16bf505497f Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Mon, 24 Mar 2014 22:26:21 +0000 -Subject: [PATCH 02/89] Where an infobool expression failed to parse, evaluate +Subject: [PATCH 02/82] Where an infobool expression failed to parse, evaluate the infobool as false. Previously, this would result in a segfault due to the dereferencing of an uninitialised pointer to the head of the expression tree. @@ -530,10 +530,10 @@ index db461dd..7c54064 100644 1.9.3 -From ae418d7b77094510181ef155ecd256e1cabb013b Mon Sep 17 00:00:00 2001 +From 89f7abbd454aa88156ba54da164bde33992f7d5b Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 26 Nov 2013 20:09:48 +0000 -Subject: [PATCH 03/89] Add caching of infolabels +Subject: [PATCH 03/82] Add caching of infolabels The functions CGUIInfoLabel::GetLabel and CGUIInfoLabel::GetItemLabel take a number of strings returned from CGUIInfoManager::GetImage or @@ -746,10 +746,10 @@ index 8c1c1dc..418b2c4 100644 1.9.3 -From 46c5a5ed81ff6fb37b767b99be0435478e27c4d1 Mon Sep 17 00:00:00 2001 +From 431ad06ca8c0299645f6fc79a6960199589748c7 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 10 Dec 2013 01:12:31 +0000 -Subject: [PATCH 04/89] De-duplication of string cache for non-item and item +Subject: [PATCH 04/82] De-duplication of string cache for non-item and item labels --- @@ -889,10 +889,10 @@ index 418b2c4..6d9ebf7 100644 1.9.3 -From 44dddb64bcaeb1df88eb77042e6892136324b965 Mon Sep 17 00:00:00 2001 +From aac04a3876e7a79c126cc55f52d64ecfa6820c3b Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 11 Dec 2013 17:21:54 +0000 -Subject: [PATCH 05/89] Move the reference-counting of Begin and End calls from +Subject: [PATCH 05/82] Move the reference-counting of Begin and End calls from DX and GL source files into GUIFontTTF.cpp. --- @@ -1247,10 +1247,10 @@ index a0dacba..6736cf7 100644 1.9.3 -From 0b5b995143d15dde129189ffc6c3a87694937423 Mon Sep 17 00:00:00 2001 +From 0bc34394428f3d54a73e4e2e5c6b0daf2f157a60 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 11 Dec 2013 18:47:54 +0000 -Subject: [PATCH 06/89] Convert CGUIFontTTFBase::m_vertex to be managed as a +Subject: [PATCH 06/82] Convert CGUIFontTTFBase::m_vertex to be managed as a std::vector. Also retired CGUIFontTTFBase::m_vertex_count and CGUIFontTTFBase::m_vertex_size because these can be derived from vector member functions. @@ -1432,10 +1432,10 @@ index 93b7ea6..a4e8571 100644 1.9.3 -From be0a214744ed17c7bd7ad9470585b4ba4e6dc83e Mon Sep 17 00:00:00 2001 +From 72b54640a2f27eeeee4df247365974f4fd1a66fd Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Mon, 16 Dec 2013 18:58:12 +0000 -Subject: [PATCH 07/89] CGUIFontTTFBase::RenderCharacter can now append to +Subject: [PATCH 07/82] CGUIFontTTFBase::RenderCharacter can now append to arbitrary vectors of vertices rather than only CGUIFontTTFBase::m_vertex --- @@ -1511,10 +1511,10 @@ index 35e3cf9..4a6a696 100644 1.9.3 -From 5eb0e1ba472411d194f338703fd29957702920d9 Mon Sep 17 00:00:00 2001 +From 96abf97cc233118b46670fc78a28d09f4c1c5335 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 15 Jan 2014 17:18:38 +0000 -Subject: [PATCH 08/89] Add a cache of font glyph bounding box vertices. This +Subject: [PATCH 08/82] Add a cache of font glyph bounding box vertices. This is implemented as a template because ultimately we will key on different parameters and store values of different types, depending upon whether we have a GLES or non-GLES backend, and for GLES, whether or not the currently @@ -2174,10 +2174,10 @@ index f351c99..9036ba9 100644 1.9.3 -From 85e826a5720ea95f9c2a72ecba648c7840caec67 Mon Sep 17 00:00:00 2001 +From 87a615ec2b918f622cdeb4d97ac383473d533c19 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 23 Jan 2014 22:24:17 +0000 -Subject: [PATCH 09/89] Lay the groundwork for hardware clipping. +Subject: [PATCH 09/82] Lay the groundwork for hardware clipping. For glScissor() to replace CGraphicContext::ClipRect, a necessary condition is that no shear or rotation is introduced between the coordinate systems @@ -2442,10 +2442,10 @@ index 98e398a..81ee49e 100644 1.9.3 -From 914504c45b98fad938d0e4c39300914930a1f2ea Mon Sep 17 00:00:00 2001 +From 2c2cd66f778cfe80f5addf0e31524f5adf401725 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 23 Jan 2014 16:42:22 +0000 -Subject: [PATCH 10/89] Increase font cache hit rate by keying on the +Subject: [PATCH 10/82] Increase font cache hit rate by keying on the fractional part of m_originX and m_originY *after* they have been through the graphics context's transformation matrix, plus the scale/rotation elements of the matrix, rather than the origin in the original frame of reference plus @@ -2649,10 +2649,10 @@ index 7cb4669..78445ab 100644 1.9.3 -From e14a42ba0c137bda31d4ac51b4e29dc60fcc9a30 Mon Sep 17 00:00:00 2001 +From aa09af31e58262051e8571223cc6fcefaf8d1697 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 8 Jan 2014 12:16:33 +0000 -Subject: [PATCH 11/89] Rewrite of scrolling text code. +Subject: [PATCH 11/82] Rewrite of scrolling text code. No longer shuffles the string round to minimise the number of characters before the clipping rectangle; this doesn't save much on rendering time but @@ -2942,7 +2942,7 @@ index 712e118..203c138 100644 } CGUIControl::Render(); diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp -index b1e53b7..f68597a 100644 +index 12bbeb5..505a02d 100644 --- a/xbmc/utils/RssReader.cpp +++ b/xbmc/utils/RssReader.cpp @@ -54,7 +54,7 @@ CRssReader::CRssReader() : CThread("RSSReader") @@ -2971,10 +2971,10 @@ index 2c6f366..b74faf2 100644 1.9.3 -From 6275fb573c9bfed479dabdfc3ccabddf063f6ea7 Mon Sep 17 00:00:00 2001 +From 08ae1b29d2987df3738787df1267ddfe898df472 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Mon, 27 Jan 2014 23:21:10 +0000 -Subject: [PATCH 12/89] Move the application of the translation offsets into +Subject: [PATCH 12/82] Move the application of the translation offsets into the GLES code. Still all pure software at this stage. Main change is in the data types at the interface between CGUIFontTTFBase and CGUIFontTTFGL. The old way (array of vertices in m_vertex) are retained in addition, for the @@ -3170,10 +3170,10 @@ index cb56987..f6aa081 100644 1.9.3 -From f16154e4a9130f1b0c4d79e4df090f8c24f8f5b4 Mon Sep 17 00:00:00 2001 +From 96e5d3e05b9ac2cef47d2e2a6fc13c407f1f672e Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 15 Jan 2014 15:28:06 +0000 -Subject: [PATCH 13/89] Rather than applying the translation offsets to the +Subject: [PATCH 13/82] Rather than applying the translation offsets to the vertices, now applies them to the model view matrix from the top of the matrix stack and pushes it over to OpenGL. The vertices themselves are still all held client-side. @@ -3320,10 +3320,10 @@ index 81ee49e..d2f9cd1 100644 1.9.3 -From 7b4b56c7bce76682ee4eee01336247b7df6527f1 Mon Sep 17 00:00:00 2001 +From a831b39d8b967665371ccc99a9e8ee1679d8ae54 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 29 Jan 2014 13:21:19 +0000 -Subject: [PATCH 14/89] Enable hardware clipping. +Subject: [PATCH 14/82] Enable hardware clipping. --- xbmc/guilib/GUIFontTTF.cpp | 4 ++-- @@ -3399,10 +3399,10 @@ index fbffaa0..b7618e1 100644 1.9.3 -From ae887f8ccf7998b3dfe89dd913382c5306fa6372 Mon Sep 17 00:00:00 2001 +From c65c7b0f23d31b1677b0cd60355eb28d05865977 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 15 Jan 2014 15:32:51 +0000 -Subject: [PATCH 15/89] Move the vertex data across to a vertex buffer object +Subject: [PATCH 15/82] Move the vertex data across to a vertex buffer object just prior to drawing. --- @@ -3456,10 +3456,10 @@ index b7618e1..0df3749 100644 1.9.3 -From d5e155d952f161802b2aab970e42fc2cf3ebadd4 Mon Sep 17 00:00:00 2001 +From aff1d0b71b7a455daba6bbd29496fcdc9169e37e Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Wed, 15 Jan 2014 16:04:04 +0000 -Subject: [PATCH 16/89] Move vertex data into an OpenGL VBO when the font cache +Subject: [PATCH 16/82] Move vertex data into an OpenGL VBO when the font cache entry is populated. The font cache now stores the "name" (handle) of the VBO, rather than a vector of vertices. @@ -3734,10 +3734,10 @@ index 6736cf7..168fb21 100644 1.9.3 -From dfbd136df43019c4fbb3b8a10bdc248be9bc6bc9 Mon Sep 17 00:00:00 2001 +From a91376b246a7faabbeed9fec5b2510f1ec9917fc Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 16 Jan 2014 16:29:42 +0000 -Subject: [PATCH 17/89] Switch from glDrawArrays() to glDrawElements(). This +Subject: [PATCH 17/82] Switch from glDrawArrays() to glDrawElements(). This involves setting up a static VBO containing the indexes necessary to convert from quads to triangles on the fly in the GPU. @@ -3960,10 +3960,10 @@ index 6de3532..258a293 100644 1.9.3 -From c9a92c083400a821fb55c671df27e9131df782d9 Mon Sep 17 00:00:00 2001 +From de5a34228b32d0c909dbbb083e1be84ecffef6e4 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 4 Feb 2014 16:17:57 +0000 -Subject: [PATCH 18/89] Update Windows project files +Subject: [PATCH 18/82] Update Windows project files --- project/VS2010Express/XBMC.vcxproj | 2 ++ @@ -3971,7 +3971,7 @@ Subject: [PATCH 18/89] Update Windows project files 2 files changed, 8 insertions(+) diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj -index b749bd8..e752bb8 100644 +index 79e0219..936d5a1 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -425,6 +425,7 @@ @@ -3982,7 +3982,7 @@ index b749bd8..e752bb8 100644 -@@ -1741,6 +1742,7 @@ +@@ -1740,6 +1741,7 @@ @@ -4018,10 +4018,10 @@ index 29f0879..e5a18dd 100644 1.9.3 -From 8f7b12fcd5178dd1aa35f07ff79c82140b3f1815 Mon Sep 17 00:00:00 2001 +From d152a2347c58841fb80b74a829496793048e0b6b Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 4 Feb 2014 16:49:45 +0000 -Subject: [PATCH 19/89] Update XCode project file +Subject: [PATCH 19/82] Update XCode project file --- XBMC.xcodeproj/project.pbxproj | 10 ++++++++++ @@ -4087,10 +4087,10 @@ index 6adc55d..ebe3151 100644 1.9.3 -From 3d9b25b781d99d3baaed901c46000377a2b66493 Mon Sep 17 00:00:00 2001 +From 53f2f931d8afcb8a0abe5e5b34da5d511ab866e2 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 4 Feb 2014 17:44:34 +0000 -Subject: [PATCH 20/89] Clang seems to be more picky than gcc about some C++ +Subject: [PATCH 20/82] Clang seems to be more picky than gcc about some C++ template syntax --- @@ -4158,10 +4158,10 @@ index 895fa72..bd84b9a 100644 1.9.3 -From f8c6566791e144dbad09778a8923dd27b7fe4790 Mon Sep 17 00:00:00 2001 +From 54348adfcc7842d56e3e981c8935d2ae56dd3540 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 4 Feb 2014 18:52:14 +0000 -Subject: [PATCH 21/89] Fix header to hopefully permit iOS builds to work +Subject: [PATCH 21/82] Fix header to hopefully permit iOS builds to work again. GUIShader.cpp added #include windowing/egl/WinSystemEGL.h inside a but also need the header windowing/osx/WinSystemIOS.h instead. The only thing GUIShader.cpp needed was g_windowing.GetViewPort, which is provided by the @@ -4190,10 +4190,10 @@ index 53bce09..86330cc 100644 1.9.3 -From 242f5e7c687e477f459447a2ced5a92d11d014ce Mon Sep 17 00:00:00 2001 +From b8a96321efe1da06cac9129e545bc4aafff4457f Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Tue, 8 Apr 2014 18:14:55 +0100 -Subject: [PATCH 22/89] Fix font display in stereoscopic modes +Subject: [PATCH 22/82] Fix font display in stereoscopic modes CGUIFontTTFGL::LastEnd was previously using the relatively high-level CGraphicContext::SetScissors function to enforce hardware clipping. However, the coordinates it passed in already contained the stereoscopic offset, so @@ -4234,10 +4234,10 @@ index d476409..8466a81 100644 1.9.3 -From 9d115ff708d8b89c5120d0fc3497f407bf586baf Mon Sep 17 00:00:00 2001 +From 65fb9cd6861394a8eac22722213e434dc1b55007 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 10 Jan 2014 12:10:43 +0000 -Subject: [PATCH 23/89] [rbp] Don't override dvdplayer with omxplayer. +Subject: [PATCH 23/82] [rbp] Don't override dvdplayer with omxplayer. Using dvdplayer can be useful on the Pi. We can actually play sd (up to 640x480 MPEG-4 video) video in real time. This is useful for codec variants like DivX3 which we don't currently play. @@ -4270,10 +4270,10 @@ index 27f0bec..fc12bb7 100644 1.9.3 -From ee0966bd1c125c8cedd651432b2c0765d854ee5f Mon Sep 17 00:00:00 2001 +From b4cc530053b9329b3641faf31e39873fb6962a4a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 10 Jan 2014 15:37:41 +0000 -Subject: [PATCH 24/89] [players] Use default players rather than hard coded +Subject: [PATCH 24/82] [players] Use default players rather than hard coded DVDPlayer/PAPlayer --- @@ -4332,10 +4332,10 @@ index 57dfcdd..7be9799 100644 1.9.3 -From 774e8be6922f14e9b1c71b099d860b5bf6b7ac67 Mon Sep 17 00:00:00 2001 +From bb81bc7ab31a99c134f4710c681dd8c652caae1f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 11 Jan 2014 18:23:42 +0000 -Subject: [PATCH 25/89] [rbp] Don't force dvdplayer for airplay +Subject: [PATCH 25/82] [rbp] Don't force dvdplayer for airplay --- xbmc/network/AirPlayServer.cpp | 2 ++ @@ -4361,10 +4361,10 @@ index 472463d..9f86eb7 100644 1.9.3 -From 273f624c4273386c60d97cb331ab3941b59cecc7 Mon Sep 17 00:00:00 2001 +From a8da5af90041ba129025e0047a73030e8c4bb30d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 13 Jan 2014 13:11:06 +0000 -Subject: [PATCH 26/89] [rbp] Give plugins omxplayer when they request +Subject: [PATCH 26/82] [rbp] Give plugins omxplayer when they request dvdplayer on pi --- @@ -4391,10 +4391,10 @@ index cf6693c..1170189 100644 1.9.3 -From 01eb0f52e23f5786f018e91690e495a56e784e0e Mon Sep 17 00:00:00 2001 +From 2decce910e8af54e880810ec18e8aa473ef39d36 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Jan 2014 18:04:07 +0000 -Subject: [PATCH 27/89] [rbp] Allow ALSA to be chosen in addition to Pi sink +Subject: [PATCH 27/82] [rbp] Allow ALSA to be chosen in addition to Pi sink Needs --enable-alsa in ./configure step and alsa support on platform --- @@ -4485,10 +4485,10 @@ index e42d973..715b4f1 100644 1.9.3 -From 385d77e9e30bec3ec6ac9d9f0faa0e5e2c38f491 Mon Sep 17 00:00:00 2001 +From 04d854f558aacb7c65bdc094da6c7451d4bd1502 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 16 Jan 2014 01:39:29 +0000 -Subject: [PATCH 28/89] [omxcodec] Add hardware decode to dvdplayer for Pi +Subject: [PATCH 28/82] [omxcodec] Add hardware decode to dvdplayer for Pi Hijack the abandoned OpenMaxVideo codec --- @@ -7528,10 +7528,10 @@ index 6e7d9a9..99e407a 100644 if(!m_handle) { diff --git a/xbmc/linux/OMXCore.h b/xbmc/linux/OMXCore.h -index 1b24fc1..2f1e8a9 100644 +index 1efb313..b4c8626 100644 --- a/xbmc/linux/OMXCore.h +++ b/xbmc/linux/OMXCore.h -@@ -109,7 +109,7 @@ class COMXCoreComponent +@@ -107,7 +107,7 @@ class COMXCoreComponent OMX_ERRORTYPE DisablePort(unsigned int port, bool wait = true); OMX_ERRORTYPE UseEGLImage(OMX_BUFFERHEADERTYPE** ppBufferHdr, OMX_U32 nPortIndex, OMX_PTR pAppPrivate, void* eglImage); @@ -7544,10 +7544,10 @@ index 1b24fc1..2f1e8a9 100644 1.9.3 -From 2ace9db574edaae579b71580e3d6a0dcb0f5d058 Mon Sep 17 00:00:00 2001 +From ff14d4f702b268f92b6267a4691f32e799f4bfcf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 20 Jan 2014 16:03:40 +0000 -Subject: [PATCH 29/89] [omxcodec] Enable for dvd menus +Subject: [PATCH 29/82] [omxcodec] Enable for dvd menus --- xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 4 ++++ @@ -7572,10 +7572,10 @@ index 5d37395..6d1810f 100644 1.9.3 -From d05daad4ed96c082c133d10db053afd33b2f9ae5 Mon Sep 17 00:00:00 2001 +From 98c9b16254ae852ffe20af8767654ae31eaa65af Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Feb 2014 22:27:44 +0000 -Subject: [PATCH 30/89] [omxcodec] Add omx specific texture +Subject: [PATCH 30/82] [omxcodec] Add omx specific texture create/upload/delete functions --- @@ -7653,10 +7653,10 @@ index 5a6a2be..52df291 100644 1.9.3 -From 2f66c8f61d8333410f24e5dfc23979449421b08a Mon Sep 17 00:00:00 2001 +From ba4aaea1e8a0e03adffc0e057b9a43ee8519a6d6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Feb 2014 22:50:43 +0000 -Subject: [PATCH 31/89] [omxcodec] Add shared pointer to delay shutdown of +Subject: [PATCH 31/82] [omxcodec] Add shared pointer to delay shutdown of codec until buffers are returned --- @@ -7837,10 +7837,10 @@ index 9079c13..0975e8a 100644 1.9.3 -From f23a886b16e05bda02bcf84ee2781f94ee8a1863 Mon Sep 17 00:00:00 2001 +From 4b5259e36cdf7d007c866f862e7275d1e9334b5f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Feb 2014 23:11:31 +0000 -Subject: [PATCH 32/89] [omxcodec] Fix for aspect ratio in non-square pixel +Subject: [PATCH 32/82] [omxcodec] Fix for aspect ratio in non-square pixel modes --- @@ -7929,10 +7929,10 @@ index 0975e8a..9138a20 100644 1.9.3 -From 4543da5f385f8499db762274dc874800db260feb Mon Sep 17 00:00:00 2001 +From 88238401f7bd76f30e629975c72a0e1e27941c28 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Feb 2014 23:19:22 +0000 -Subject: [PATCH 33/89] [omxcodec] Report error when codec not enabled +Subject: [PATCH 33/82] [omxcodec] Report error when codec not enabled --- xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp | 10 +++++++++- @@ -7977,10 +7977,10 @@ index 7e23c87..2ae722b 100644 1.9.3 -From 6e1cf9bcbef26c84fed29d3af9689c0fac451135 Mon Sep 17 00:00:00 2001 +From a58f2444e59b8a7cf642ae0b459a93ad55c32e23 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Feb 2014 17:29:37 +0000 -Subject: [PATCH 34/89] [omxcodec] Add deinterlace support +Subject: [PATCH 34/82] [omxcodec] Add deinterlace support --- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 2 +- @@ -8217,10 +8217,10 @@ index 9138a20..c8ad4d8 100644 1.9.3 -From 936dec05449679608c6a806e20d5d3cf416ba6fe Mon Sep 17 00:00:00 2001 +From de38627cc8686c8044545342b1816cfc182676a9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 5 Feb 2014 11:46:33 +0000 -Subject: [PATCH 35/89] [rbp/settings] Allow av sync type to be enabled +Subject: [PATCH 35/82] [rbp/settings] Allow av sync type to be enabled It works for dvdplayer --- @@ -8249,10 +8249,10 @@ index 2b7d0a6..1429256 100644 1.9.3 -From 9b8cf8c70d383412ca234e995726aae28b212574 Mon Sep 17 00:00:00 2001 +From 33222c103c68a49c3e6a9326a0413cbfdca12b80 Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 36/89] Improved file buffering in CArchive +Subject: [PATCH 36/82] Improved file buffering in CArchive Even though memcpy is typically inlined by the compiler into byte/word loads and stores (at least for release builds), the frequency with which 1, 2 and 4 @@ -8272,7 +8272,7 @@ that are probably not powerful enough to be good targets for XBMC). 1 file changed, 16 insertions(+) diff --git a/xbmc/utils/Archive.h b/xbmc/utils/Archive.h -index 1618237..d525761 100644 +index 6ed0f8f..8506d95 100644 --- a/xbmc/utils/Archive.h +++ b/xbmc/utils/Archive.h @@ -154,9 +154,17 @@ class CArchive @@ -8315,10 +8315,10 @@ index 1618237..d525761 100644 1.9.3 -From efea9ae500766010b4222b74b0b21909a3f8127c Mon Sep 17 00:00:00 2001 +From 8751a0a0f51afa2ddf14e04f3742512aef1069f3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 16 Feb 2014 17:38:05 +0000 -Subject: [PATCH 37/89] [omxcodec] Only do essential calls in texture thread +Subject: [PATCH 37/82] [omxcodec] Only do essential calls in texture thread [omxcodec] Fix for files with no valid pts values. [omxcodec] Fix stall on seek/trickplay - need to reset start flag [omxcodec] Make sure we have a valid context when video decode starts before first fanart is decoded @@ -8668,10 +8668,10 @@ index c8ad4d8..f234f6d 100644 1.9.3 -From b6b5f87e54f881882b14f668ff537fcb62623984 Mon Sep 17 00:00:00 2001 +From 5031e939e8df53f54e2534c6b08cf01d799d59cd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 -Subject: [PATCH 38/89] [hifiberry] Hack: force it to be recognised as IEC958 +Subject: [PATCH 38/82] [hifiberry] Hack: force it to be recognised as IEC958 capable to enable passthrough options --- @@ -8697,10 +8697,10 @@ index 8cbf6e5..a8ad933 100644 1.9.3 -From 6535d554289aa713ead572420de2798c35fffeab Mon Sep 17 00:00:00 2001 +From 3ec3d6ea28dadd7cefec19e5c4e9d30af2478382 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 11 Mar 2014 18:50:23 +0000 -Subject: [PATCH 39/89] [dvdplayer] Use inexact seeking like omxplayer +Subject: [PATCH 39/82] [dvdplayer] Use inexact seeking like omxplayer --- xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++++ @@ -8751,10 +8751,60 @@ index 0634880..768f51f 100644 1.9.3 -From cf31aeb4932a63a7ef29b4357edb9c0105b5014c Mon Sep 17 00:00:00 2001 +From f451883f443aad6156fe67621bb029e444480eac Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Thu, 13 Mar 2014 16:08:46 +0000 +Subject: [PATCH 40/82] [omxplayer] Make use of TrueHD fastpath when downmixing + +The TrueHD codec actually works in 3 stages. +It decodes the downmixed stereo. +It then decodes the differences required to produce 5.1. +It then decodes the differences required to produce 7.1. + +Many users end up downmixing this 7.1 stream back to 2.0. +Much better to tell the codec we only need the 2.0 stream. +It saves about 50% of the CPU required +--- + xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp +index bb3bea4..dab9f27 100644 +--- a/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp ++++ b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp +@@ -25,6 +25,7 @@ + #include "utils/log.h" + + #include "cores/AudioEngine/Utils/AEUtil.h" ++#include "settings/Settings.h" + + // the size of the audio_render output port buffers + #define AUDIO_DECODE_OUTPUT_BUFFER (32*1024) +@@ -86,6 +87,16 @@ bool COMXAudioCodecOMX::Open(CDVDStreamInfo &hints) + m_pCodecContext->block_align = hints.blockalign; + m_pCodecContext->bit_rate = hints.bitrate; + m_pCodecContext->bits_per_coded_sample = hints.bitspersample; ++ enum AEStdChLayout layout = (enum AEStdChLayout)CSettings::Get().GetInt("audiooutput.channels"); ++ if (hints.codec == AV_CODEC_ID_TRUEHD) ++ { ++ if (layout == AE_CH_LAYOUT_2_0) ++ m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_STEREO; ++ else if (layout <= AE_CH_LAYOUT_5_1) ++ m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_5POINT1; ++ } ++ if (m_pCodecContext->request_channel_layout) ++ CLog::Log(LOGNOTICE,"COMXAudioCodecOMX::Open() Requesting channel layout of %d", (unsigned)m_pCodecContext->request_channel_layout); + + // vorbis has variable sized planar output, so skip concatenation + if (hints.codec == AV_CODEC_ID_VORBIS) +-- +1.9.3 + + +From 881f62fcbc398b75eaae7516a04d47cd5bb27b57 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 41/89] [rbp/omxplayer] When opening a stream don't try to +Subject: [PATCH 41/82] [rbp/omxplayer] When opening a stream don't try to update gui so often --- @@ -8781,10 +8831,10 @@ index e9ba7d3..0fdc3c2 100644 1.9.3 -From c5548cde659d965aee4fe274c78f76508db1fb0f Mon Sep 17 00:00:00 2001 +From 6ff163cde8381e808ef65ffe6fc88f2d94fd2108 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 15:28:57 +0100 -Subject: [PATCH 42/89] [omxcodec] Clamp video texture at edges to avoid image +Subject: [PATCH 42/82] [omxcodec] Clamp video texture at edges to avoid image wrapping --- @@ -8808,10 +8858,10 @@ index 51f56aa..2929a37 100644 1.9.3 -From 7f768c96219c9639a68e36c473ff62271ad55fca Mon Sep 17 00:00:00 2001 +From f67916b281a03d25e57a325983446317e412dff3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 30 Mar 2014 15:54:34 +0100 -Subject: [PATCH 44/89] [omxplayer] Make the sharpness control act as a +Subject: [PATCH 43/82] [omxplayer] Make the sharpness control act as a sharpness control. This fixes scaling kernel as Mitchell Netravali, and varies sharpness over range B=[5/3,0] C=[-1/3,1/2] @@ -9193,10 +9243,10 @@ index 49e0fed..12e887e 100644 1.9.3 -From a3f2a1afe63778523e250eb5d21a78d6b16bdce4 Mon Sep 17 00:00:00 2001 +From 35048ec10fafe1316ca5937401b0f9eee4d92ccf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Apr 2014 21:18:06 +0100 -Subject: [PATCH 45/89] [omxplayer] Don't propagate 3d flags based on supported +Subject: [PATCH 44/82] [omxplayer] Don't propagate 3d flags based on supported 3d modes --- @@ -9252,10 +9302,10 @@ index 2fdbe18..e6bf2d0 100644 1.9.3 -From 8c871c98822e3aa6a25cb8f7103e53473b8aa262 Mon Sep 17 00:00:00 2001 +From 0f0e8c2566ecd3140c381a52cc0196fffccec9a8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 17 Apr 2014 13:00:52 +0100 -Subject: [PATCH 46/89] [graphics] Don't set stereo mode based on resolution +Subject: [PATCH 45/82] [graphics] Don't set stereo mode based on resolution The resolution change should follow stereo mode --- @@ -9299,10 +9349,10 @@ index 5bffdf5..7e4fdd4 100644 1.9.3 -From cc4d72c935c8a9066bc0b5fbc6f41bd273531381 Mon Sep 17 00:00:00 2001 +From b9f95119543d59f7d3b0f80696215d0c66d4fe91 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 17 Apr 2014 13:01:51 +0100 -Subject: [PATCH 47/89] [graphics] Allow switching to a more suitable 3D +Subject: [PATCH 46/82] [graphics] Allow switching to a more suitable 3D resolution --- @@ -9392,10 +9442,10 @@ index 0a27643..df55e92 100644 1.9.3 -From ca8b44667409ab2c39aa284e7cf2c81b53559e6a Mon Sep 17 00:00:00 2001 +From 17042a6427baa1152d593b23edf0340127390529 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 17 Apr 2014 13:38:55 +0100 -Subject: [PATCH 48/89] [3D] Support switching to 3D resolutions +Subject: [PATCH 47/82] [3D] Support switching to 3D resolutions Include matching 3D flags (SBS/TAB) in the score of a resolution to switch to, to enable switching to 3d modes. Also remove the old code that treated 3D modes differently when assigning a score. @@ -9480,10 +9530,10 @@ index 83c3adb..8076e76 100644 1.9.3 -From 3e81f718f47703c5349612224e1c87eee545da5f Mon Sep 17 00:00:00 2001 +From 52e2bf4a422d1210622f69b411ff69f585d7d1de Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 23 Apr 2014 00:05:07 +0100 -Subject: [PATCH 49/89] [graphics] Make pixel ratio for 3d modes consistent +Subject: [PATCH 48/82] [graphics] Make pixel ratio for 3d modes consistent Note: Use the stored stereo flags from lists of resolutions. Use current stereo mode for current resolution. @@ -9671,10 +9721,10 @@ index 90b57e1..5b26b20 100644 1.9.3 -From f015edb06b8e3e38cfa1f4ed9594a55fef76baf3 Mon Sep 17 00:00:00 2001 +From cacb2609b8e021320d4c5bb949da71ec6a8ad726 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 23 Apr 2014 21:07:51 +0100 -Subject: [PATCH 50/89] [PiSink] More attempts to reduce underrun audio +Subject: [PATCH 49/82] [PiSink] More attempts to reduce underrun audio glitches with multichannl and high samplerate --- @@ -9792,10 +9842,10 @@ index 811ea0d..7c04919 100644 1.9.3 -From 442f5394004b4ffe2ef43b5b39de4f027a30247a Mon Sep 17 00:00:00 2001 +From 6b5217b28809feb2c8edce446c6a8ba129938bb1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 22 Apr 2014 12:23:23 +0100 -Subject: [PATCH 51/89] [omxplayer] Make dvdplayer the default for dvd images +Subject: [PATCH 50/82] [omxplayer] Make dvdplayer the default for dvd images --- xbmc/cores/omxplayer/omxplayer_advancedsettings.xml | 2 +- @@ -9817,10 +9867,10 @@ index 77c6a15..51c0daf 100644 1.9.3 -From aae984c26dff1d07a0746d27503f67697687be8a Mon Sep 17 00:00:00 2001 +From eeafafa8332a89f51aea392c9721d6b889074bd3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 52/89] [cec] Don't suspend pi on tv switch off - it can't wake +Subject: [PATCH 51/82] [cec] Don't suspend pi on tv switch off - it can't wake up --- @@ -9844,11 +9894,10 @@ index a906628..9b5271a 100644 1.9.3 - -From 3349056f500bb499263f9e32eb16dea5f4cf2968 Mon Sep 17 00:00:00 2001 +From f9e7b3b8bbc34c23b8379c248ea14842c1b11570 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Jun 2013 01:25:57 +0100 -Subject: [PATCH 54/89] [rbp/omxplayer] Do we need discontinuity handling? +Subject: [PATCH 53/82] [rbp/omxplayer] Do we need discontinuity handling? So far I've not seen what this is needed for and it does cause problems for some files. --- @@ -9871,10 +9920,10 @@ index 12e887e..a811169 100644 1.9.3 -From ed3334648bb82a6c0a5b7afd301201a4fca91b88 Mon Sep 17 00:00:00 2001 +From 2d38d635a6c27c8c2bdffc7ce24e7d511e2c7c18 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Oct 2013 00:53:26 +0100 -Subject: [PATCH 55/89] [rbp/omxplayer] Avoid marking non-monotonic timestamps +Subject: [PATCH 54/82] [rbp/omxplayer] Avoid marking non-monotonic timestamps as unknown Following a single spurious timestamp that is in the future, @@ -9884,10 +9933,10 @@ all subsequent timestamps will be marked unknown causing out of sync. 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp -index 353e00e..90a02e1 100644 +index 77731a9..5f9d028 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp -@@ -1205,22 +1205,10 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt +@@ -1210,22 +1210,10 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt } else { @@ -9916,10 +9965,10 @@ index 353e00e..90a02e1 100644 1.9.3 -From 51c7cf0d9367497492a041ca04c8df7c1baca488 Mon Sep 17 00:00:00 2001 +From 8080b6e1199e3fb90e4ff2115831b706a50403a5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 13 Dec 2013 16:25:23 +0000 -Subject: [PATCH 57/89] Add time taken to resample to log +Subject: [PATCH 56/82] Add time taken to resample to log --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 7 +++++++ @@ -9963,10 +10012,10 @@ index 9324e1e..4405f66 100644 1.9.3 -From b9065f508525a5a768d0fee6ffcd28cc0d44dfd2 Mon Sep 17 00:00:00 2001 +From 0d756bfa2225ef9e050cfd4c048ff73506893a1b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 14 Dec 2013 16:55:05 +0000 -Subject: [PATCH 58/89] logging: Add microsecond timer to log messages +Subject: [PATCH 57/82] logging: Add microsecond timer to log messages --- xbmc/utils/log.cpp | 12 +++++++++--- @@ -10027,10 +10076,10 @@ index 6d7c6c8..45f68bc 100644 1.9.3 -From 0b3a3f4f2e347da05b5f8f39d14c47f86a569ae6 Mon Sep 17 00:00:00 2001 +From ffeee013ca4f3e7476247e06765cb69bd2150ebf Mon Sep 17 00:00:00 2001 From: Jonathan Marshall Date: Sat, 2 Nov 2013 23:49:17 +1300 -Subject: [PATCH 59/89] adds GetTvShowSeasons +Subject: [PATCH 58/82] adds GetTvShowSeasons --- xbmc/video/VideoDatabase.cpp | 30 ++++++++++++++++++++++++------ @@ -10038,10 +10087,10 @@ Subject: [PATCH 59/89] adds GetTvShowSeasons 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp -index cc764b8..ae9c27b 100644 +index 927e8ff..b759970 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp -@@ -4029,7 +4029,7 @@ bool CVideoDatabase::RemoveArtForItem(int mediaId, const MediaType &mediaType, c +@@ -4031,7 +4031,7 @@ bool CVideoDatabase::RemoveArtForItem(int mediaId, const MediaType &mediaType, c return result; } @@ -10050,7 +10099,7 @@ index cc764b8..ae9c27b 100644 { try { -@@ -4040,19 +4040,37 @@ bool CVideoDatabase::GetTvShowSeasonArt(int showId, map +@@ -4042,19 +4042,37 @@ bool CVideoDatabase::GetTvShowSeasonArt(int showId, map CStdString sql = PrepareSQL("select idSeason,season from seasons where idShow=%i", showId); m_pDS2->query(sql.c_str()); @@ -10109,10 +10158,10 @@ index 7bf6d85..80334c6 100644 1.9.3 -From 01f98a6f80e1c01433d447ee4cd54c8dc2db4d9f Mon Sep 17 00:00:00 2001 +From 9460558427955f172fd4476db0f8ab49ef8bd8c8 Mon Sep 17 00:00:00 2001 From: Jonathan Marshall Date: Sat, 2 Nov 2013 23:50:10 +1300 -Subject: [PATCH 60/89] move AddSeason() public. +Subject: [PATCH 59/82] move AddSeason() public. --- xbmc/video/VideoDatabase.h | 2 +- @@ -10142,10 +10191,10 @@ index 80334c6..a519620 100644 1.9.3 -From d93ba73a9cc70353383b00e52c9226f9602a9179 Mon Sep 17 00:00:00 2001 +From f2b89ac91ae42e69619d19596248e12e987c1842 Mon Sep 17 00:00:00 2001 From: Jonathan Marshall Date: Sat, 2 Nov 2013 23:48:24 +1300 -Subject: [PATCH 61/89] adds GetArt function to (video) scraper, allowing art +Subject: [PATCH 60/82] adds GetArt function to (video) scraper, allowing art to be fetched given the video identifier. --- @@ -10263,10 +10312,120 @@ index 22ac229..75bc341 100644 1.9.3 -From d86fdb17e95ae8e2be8578146462a29511316e09 Mon Sep 17 00:00:00 2001 +From 911317ea7f8d20a8960fe7d651eaea451525c690 Mon Sep 17 00:00:00 2001 +From: Jonathan Marshall +Date: Sat, 2 Nov 2013 23:53:14 +1300 +Subject: [PATCH 61/82] refresh season art if a new season is found that isn't + recorded in the database yet. Fixes #14339 + +--- + xbmc/video/VideoInfoScanner.cpp | 33 ++++++++++++++++++++++++++++++++- + xbmc/video/VideoInfoScanner.h | 2 ++ + 2 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp +index 3f1d2e8..bc4d47c 100644 +--- a/xbmc/video/VideoInfoScanner.cpp ++++ b/xbmc/video/VideoInfoScanner.cpp +@@ -1342,6 +1342,10 @@ namespace VIDEO + pDlgProgress->Progress(); + } + ++ bool updateSeasons = false; ++ map seasons; ++ m_database.GetTvShowSeasons(showInfo.m_iDbId, seasons); ++ + EPISODELIST episodes; + bool hasEpisodeGuide = false; + +@@ -1390,6 +1394,8 @@ namespace VIDEO + } + if (AddVideo(&item, CONTENT_TVSHOWS, file->isFolder, true, &showInfo) < 0) + return INFO_ERROR; ++ if (seasons.find(item.GetVideoInfoTag()->m_iSeason) == seasons.end()) ++ updateSeasons = true; + continue; + } + +@@ -1519,6 +1525,8 @@ namespace VIDEO + + if (AddVideo(&item, CONTENT_TVSHOWS, file->isFolder, useLocal, &showInfo) < 0) + return INFO_ERROR; ++ if (seasons.find(item.GetVideoInfoTag()->m_iSeason) == seasons.end()) ++ updateSeasons = true; + } + else + { +@@ -1527,9 +1535,27 @@ namespace VIDEO + file->cDate.GetAsLocalizedDate().c_str(), file->strTitle.c_str()); + } + } ++ if (updateSeasons) ++ UpdateSeasons(showInfo, scraper, useLocal); + return INFO_ADDED; + } + ++ void CVideoInfoScanner::UpdateSeasons(const CVideoInfoTag &showInfo, const ADDON::ScraperPtr &scraper, bool useLocal) ++ { ++ map > seasonArt; ++ m_database.GetTvShowSeasonArt(showInfo.m_iDbId, seasonArt); ++ CVideoInfoTag details; ++ CVideoInfoDownloader loader(scraper); ++ loader.GetArt(showInfo.m_strIMDBNumber, details); ++ details.m_strPath = showInfo.m_strPath; ++ GetSeasonThumbs(details, seasonArt, CVideoThumbLoader::GetArtTypes("season"), useLocal); ++ for (map >::iterator i = seasonArt.begin(); i != seasonArt.end(); ++i) ++ { ++ int seasonID = m_database.AddSeason(showInfo.m_iDbId, i->first); ++ m_database.SetArtForItem(seasonID, "season", i->second); ++ } ++ } ++ + CStdString CVideoInfoScanner::GetnfoFile(CFileItem *item, bool bGrabAny) const + { + CStdString nfoFile; +@@ -1798,6 +1824,11 @@ namespace VIDEO + } + for (int season = -1; season <= maxSeasons; season++) + { ++ // skip if we already have some art ++ map >::const_iterator i = seasonArt.find(season); ++ if (i != seasonArt.end() && !i->second.empty()) ++ continue; ++ + map art; + if (useLocal) + { +@@ -1851,7 +1882,7 @@ namespace VIDEO + art.insert(make_pair(artTypes.front(), image)); + } + +- seasonArt.insert(make_pair(season, art)); ++ seasonArt[season] = art; + } + } + +diff --git a/xbmc/video/VideoInfoScanner.h b/xbmc/video/VideoInfoScanner.h +index b7f657a..841309d 100644 +--- a/xbmc/video/VideoInfoScanner.h ++++ b/xbmc/video/VideoInfoScanner.h +@@ -228,6 +228,8 @@ namespace VIDEO + */ + INFO_RET OnProcessSeriesFolder(EPISODELIST& files, const ADDON::ScraperPtr &scraper, bool useLocal, const CVideoInfoTag& showInfo, CGUIDialogProgress* pDlgProgress = NULL); + ++ void UpdateSeasons(const CVideoInfoTag &showInfo, const ADDON::ScraperPtr &scraper, bool useLocal); ++ + bool EnumerateSeriesFolder(CFileItem* item, EPISODELIST& episodeList); + bool EnumerateEpisodeItem(const CFileItem *item, EPISODELIST& episodeList); + bool ProcessItemByVideoInfoTag(const CFileItem *item, EPISODELIST &episodeList); +-- +1.9.3 + + +From cfa00408a9c8d09cbdbb27e9ee12a17ac327d3a7 Mon Sep 17 00:00:00 2001 From: Jonathan Marshall Date: Sat, 2 Nov 2013 23:53:34 +1300 -Subject: [PATCH 63/89] REMOVEME: updated thetvdb.com scraper to support art +Subject: [PATCH 62/82] REMOVEME: updated thetvdb.com scraper to support art updates --- @@ -10377,10 +10536,10 @@ index 39e604d..60a0e96 100644 1.9.3 -From fe7a5c33226d1f6b933cdb9ea3e883d9cf11b87b Mon Sep 17 00:00:00 2001 +From 5d66491fd31e2ae838a8b59da165c8982273a2d3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 22 Mar 2014 16:40:01 +0000 -Subject: [PATCH 64/89] Enable PYTHONOPTIMIZE for Pi +Subject: [PATCH 63/82] Enable PYTHONOPTIMIZE for Pi --- xbmc/interfaces/python/XBPython.cpp | 4 ++++ @@ -10405,10 +10564,10 @@ index 0d6dabc..c3fd0f1 100644 1.9.3 -From 16797ed092fcc1905c1d4fc53bb32f0b3818d440 Mon Sep 17 00:00:00 2001 +From c23f5a8f3a9a6e7d28936b018d88434a8890d172 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 28 Apr 2014 18:07:45 +0100 -Subject: [PATCH 65/89] [rpi] Make ActiveAE thread higher priority to make +Subject: [PATCH 64/82] [rpi] Make ActiveAE thread higher priority to make audio underrun less likely --- @@ -10436,10 +10595,10 @@ index ce74b9d..ddd9b62 100644 1.9.3 -From 6728224020ef100d3f174bdd0160980a11a58f85 Mon Sep 17 00:00:00 2001 +From 6e2092ce8cf8356a6584b1cb5442317dbd24f7d0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 29 Apr 2014 15:23:22 +0100 -Subject: [PATCH 66/89] [ffmpeg] Speed up wtv index creation +Subject: [PATCH 65/82] [ffmpeg] Speed up wtv index creation The index creation is O(N^2) with number of entries (typically thousands). On a Pi this can take more than 60 seconds to execute for a recording of a few hours. @@ -10528,10 +10687,10 @@ index 0000000..8f5f989 1.9.3 -From 6205db2bdb12c2d5152e7d6d7788b28e616985b2 Mon Sep 17 00:00:00 2001 +From 7955c0cb26e663ed12e6798fcfb696f391aadf77 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 29 Apr 2014 15:55:28 +0100 -Subject: [PATCH 67/89] [ffmpeg] vc-1: Optimise parser (with special attention +Subject: [PATCH 66/82] [ffmpeg] vc-1: Optimise parser (with special attention to ARM) Backport from upstream ffmpeg @@ -11888,10 +12047,10 @@ index f514ae6..863ee41 100644 1.9.3 -From 1bc0721c1708086c3d8de6aabfd299e4c90b702b Mon Sep 17 00:00:00 2001 +From e3ac86b34ef35e0463c6475c03e653da70cdc3da Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 29 Apr 2014 16:53:32 +0100 -Subject: [PATCH 68/89] [ffmpeg] truehd: Optimise with special attention to ARM +Subject: [PATCH 67/82] [ffmpeg] truehd: Optimise with special attention to ARM Backport from upstream ffmpeg --- @@ -13932,10 +14091,10 @@ index 863ee41..b56fbdd 100644 1.9.3 -From 744d4d773772c2af9edc6cfba3b9d59e55e3c4f3 Mon Sep 17 00:00:00 2001 +From 53d16d23e1b49769b5385646b81dcd0f089b0f4d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 May 2014 16:13:45 +0100 -Subject: [PATCH 69/89] [rbp] Add config.txt settings to log file +Subject: [PATCH 68/82] [rbp] Add config.txt settings to log file --- xbmc/linux/RBP.cpp | 8 +++++++- @@ -13968,10 +14127,10 @@ index 49dcbb8..9a5e9cb 100644 1.9.3 -From d381b3d99a6ed4a7ace3f0e772706e19723df0f7 Mon Sep 17 00:00:00 2001 +From 72025619f8b7a33a20028ca959ece3bea2716ec8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 12 May 2014 23:06:43 +0100 -Subject: [PATCH 70/89] [omxcodec] Updates to work better with dropping and +Subject: [PATCH 69/82] [omxcodec] Updates to work better with dropping and lateness detection --- @@ -14263,10 +14422,10 @@ index f234f6d..adf53b5 100644 1.9.3 -From 46bfdff20492a28bfead92407f5127c0f371c5ff Mon Sep 17 00:00:00 2001 +From 9a0f4cb20b373b074497192fe3141786c61db81a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 11 Apr 2014 16:12:27 +0100 -Subject: [PATCH 71/89] [omxplayer] Add ability to log more timestamp info in +Subject: [PATCH 70/82] [omxplayer] Add ability to log more timestamp info in extra debug settings --- @@ -14279,7 +14438,7 @@ Subject: [PATCH 71/89] [omxplayer] Add ability to log more timestamp info in 6 files changed, 44 insertions(+), 34 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index fb26ead..98b9e7e 100755 +index d386f68..a2c7215 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -2871,6 +2871,11 @@ msgctxt "#679" @@ -14425,10 +14584,10 @@ index e6bf2d0..aa5ea43 100644 || m_speed < 0) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 6835504..fde4499 100644 +index edbbcad..b9fc3ae 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp -@@ -1394,6 +1394,9 @@ void CAdvancedSettings::SettingOptionsLoggingComponentsFiller(const CSetting *se +@@ -1395,6 +1395,9 @@ void CAdvancedSettings::SettingOptionsLoggingComponentsFiller(const CSetting *se #ifdef HAVE_LIBCEC list.push_back(std::make_pair(g_localizeStrings.Get(679), LOGCEC)); #endif @@ -14442,10 +14601,10 @@ index 6835504..fde4499 100644 1.9.3 -From 9d85c35229065258e6bb1af0fc268d4ea951b41f Mon Sep 17 00:00:00 2001 +From d9a51561c7cc6eb38c40b494b7f50fe5a7e85b78 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 23:13:55 +0100 -Subject: [PATCH 72/89] [omxplayer] Add ability to dump out audio/video data +Subject: [PATCH 71/82] [omxplayer] Add ability to dump out audio/video data for later debugging --- @@ -14457,7 +14616,7 @@ Subject: [PATCH 72/89] [omxplayer] Add ability to dump out audio/video data 5 files changed, 112 insertions(+) diff --git a/language/English/strings.po b/language/English/strings.po -index 98b9e7e..9f0475e 100755 +index a2c7215..9ba9565 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -2876,6 +2876,16 @@ msgctxt "#697" @@ -14491,7 +14650,7 @@ index 3fb7cc3..4d722a0 100644 #ifdef __GNUC__ #define ATTRIB_LOG_FORMAT __attribute__((format(printf,3,4))) diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp -index 90a02e1..bf26287 100644 +index 5f9d028..1bcc53e0 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp @@ -59,6 +59,49 @@ static const uint16_t AC3FSCod [] = {48000, 44100, 32000, 0}; @@ -14544,7 +14703,7 @@ index 90a02e1..bf26287 100644 ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// -@@ -861,6 +904,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo +@@ -866,6 +909,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo memcpy((unsigned char *)omx_buffer->pBuffer, &m_wave_header, omx_buffer->nFilledLen); omx_buffer->nFlags = OMX_BUFFERFLAG_CODECCONFIG | OMX_BUFFERFLAG_ENDOFFRAME; @@ -14552,7 +14711,7 @@ index 90a02e1..bf26287 100644 omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer); if (omx_err != OMX_ErrorNone) { -@@ -893,6 +937,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo +@@ -898,6 +942,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, OMXClock *clock, CDVDStreamInfo memcpy((unsigned char *)omx_buffer->pBuffer, m_extradata, omx_buffer->nFilledLen); omx_buffer->nFlags = OMX_BUFFERFLAG_CODECCONFIG | OMX_BUFFERFLAG_ENDOFFRAME; @@ -14560,7 +14719,7 @@ index 90a02e1..bf26287 100644 omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer); if (omx_err != OMX_ErrorNone) { -@@ -929,6 +974,8 @@ bool COMXAudio::Deinitialize() +@@ -934,6 +979,8 @@ bool COMXAudio::Deinitialize() { CSingleLock lock (m_critSection); @@ -14569,7 +14728,7 @@ index 90a02e1..bf26287 100644 if ( m_omx_tunnel_clock_analog.IsInitialized() ) m_omx_tunnel_clock_analog.Deestablish(); if ( m_omx_tunnel_clock_hdmi.IsInitialized() ) -@@ -1221,6 +1268,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt +@@ -1226,6 +1273,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt int nRetry = 0; while(true) { @@ -14577,7 +14736,7 @@ index 90a02e1..bf26287 100644 omx_err = m_omx_decoder.EmptyThisBuffer(omx_buffer); if (omx_err == OMX_ErrorNone) { -@@ -1487,6 +1535,7 @@ void COMXAudio::SubmitEOS() +@@ -1492,6 +1540,7 @@ void COMXAudio::SubmitEOS() omx_buffer->nFlags = OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_EOS | OMX_BUFFERFLAG_TIME_UNKNOWN; @@ -14672,10 +14831,10 @@ index 820ea44..6639804 100644 if (omx_err != OMX_ErrorNone) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index fde4499..06ef2ed 100644 +index b9fc3ae..4c9aea4 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp -@@ -1397,6 +1397,10 @@ void CAdvancedSettings::SettingOptionsLoggingComponentsFiller(const CSetting *se +@@ -1398,6 +1398,10 @@ void CAdvancedSettings::SettingOptionsLoggingComponentsFiller(const CSetting *se #ifdef TARGET_RASPBERRY_PI list.push_back(std::make_pair(g_localizeStrings.Get(697), LOGOMXPLAYER)); #endif @@ -14690,10 +14849,10 @@ index fde4499..06ef2ed 100644 1.9.3 -From 7d7d653b54dad70e0b3d66cd59c6dfe02568ef12 Mon Sep 17 00:00:00 2001 +From f98b36b22f3c7152e218ae22dacb3e7ac8024a52 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 28 May 2014 18:30:51 +0100 -Subject: [PATCH 73/89] [omxcodec] Reduce GPU memory use by 2 video frames +Subject: [PATCH 72/82] [omxcodec] Reduce GPU memory use by 2 video frames --- xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp | 14 ++++++++++++++ @@ -14728,11 +14887,10 @@ index 612ae21..494fdf5 100644 1.9.3 - -From 359f3fddb698e7d7ab00f090093b8ec2569367d0 Mon Sep 17 00:00:00 2001 +From 100cd97b3ef5c514f012e6ee0d688775a471e66f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:15:10 +0100 -Subject: [PATCH 75/89] [pi] Fix for logged resolutions +Subject: [PATCH 73/82] [pi] Fix for logged resolutions --- xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 15 +++++---------- @@ -14800,10 +14958,10 @@ index 5b26b20..a3edf0e 100644 1.9.3 -From 4f9391a89a8d731122f4037b75910232bd87c12f Mon Sep 17 00:00:00 2001 +From d3c05867d1ae056fbc53249a858b6787525b993d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 76/89] [settings] Experiment: Report DESKTOP resolution in +Subject: [PATCH 74/82] [settings] Experiment: Report DESKTOP resolution in video settings --- @@ -14828,10 +14986,10 @@ index 246a047..0204839 100644 1.9.3 -From 4bd99d7fab956351e43bdbe70605a00f5c1298cd Mon Sep 17 00:00:00 2001 +From c02792997861e0dff7d1f7cc81180f8eb46384c8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 7 Jun 2014 16:55:41 +0100 -Subject: [PATCH 77/89] [omx] Remove logging for texture jobs +Subject: [PATCH 75/82] [omx] Remove logging for texture jobs This causes a lot of log spam which hasn't proved useful so far. --- @@ -14876,10 +15034,10 @@ index 262a004..d529b20 100644 1.9.3 -From a9cb967f2c0a6659ba6a13052ca82cb7b5ae421f Mon Sep 17 00:00:00 2001 +From 8ecc8fbdc4aedff11b0c930078ba6519f26b5d20 Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 1 Jun 2014 18:47:20 +0200 -Subject: [PATCH 78/89] changed: avoid useless filesytem io while searching for +Subject: [PATCH 76/82] changed: avoid useless filesytem io while searching for subtitles --- @@ -14887,10 +15045,10 @@ Subject: [PATCH 78/89] changed: avoid useless filesytem io while searching for 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp -index f614f17..d3bac54 100644 +index 82cbf4b..4340700 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp -@@ -1980,7 +1980,7 @@ void CUtil::ScanForExternalSubtitles(const CStdString& strMovie, std::vector -Date: Wed, 4 Jun 2014 19:06:44 +0100 -Subject: [PATCH 84/89] AE: Skip visualisation resample when disabled - ---- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index ddd9b62..cc37b7f 100644 ---- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -1906,6 +1906,7 @@ bool CActiveAE::RunStages() - if (out) - { - // viz -+ if (!CSettings::Get().GetString("musicplayer.visualisation").empty()) - { - CSingleLock lock(m_vizLock); - if (m_audioCallback && m_vizBuffers && !m_streams.empty()) --- -1.9.3 - - -From b2b5cff9eaf9145bfa12cfe33f770bae59093024 Mon Sep 17 00:00:00 2001 +From d9aa866a4e9f8e437aafcfe1986a25fd75557aac Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 4 Jun 2014 19:10:27 +0100 -Subject: [PATCH 85/89] [pisink] Support planar formats +Subject: [PATCH 77/82] [pisink] Support planar formats --- xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp | 35 ++++++++++++++++++++++++++----- @@ -15040,10 +15173,10 @@ index 7c04919..bf9cb7a 100644 1.9.3 -From acf59553264b67052f73813c958183d39d5b7373 Mon Sep 17 00:00:00 2001 +From 8fa071475c978cbcee78c9e72b7366926f45a1a8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 30 Dec 2013 12:02:14 +0000 -Subject: [PATCH 86/89] [rbp] Hardware accelerated resampling +Subject: [PATCH 78/82] [rbp] Hardware accelerated resampling This replaces the format conversion, up/down mixing and resampling code from ActiveAE with a GPU accelerated version. Should significantly reduce CPU when using paplayer or dvdplayer. @@ -15876,10 +16009,10 @@ index 99e407a..8d3c86a 100644 1.9.3 -From 8b7127df209b97085c4f8e69f356643bd25e5ce8 Mon Sep 17 00:00:00 2001 +From baf8fa8c24bfab7ff414b923e4d93740c7d4748a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 1 Jun 2014 12:15:17 +0100 -Subject: [PATCH 87/89] [resamplepi] Support planar formats +Subject: [PATCH 79/82] [resamplepi] Support planar formats --- .../Engines/ActiveAE/ActiveAEResamplePi.cpp | 101 ++++++++++++--------- @@ -16077,3 +16210,4 @@ index 9a1e549..1604030 100644 #ifdef DEBUG_VERBOSE -- 1.9.3 +