jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

RPi/RPi2: Update kodi support patches

Browse Source
This commit is contained in:
MilhouseVH 2017-03-21 21:31:24 +00:00
parent 4bf466922e
commit f42e876e11
2 changed files with 592 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

428
projects/RPi/patches/kodi/kodi-001-backport.patch
View File

@ -1,7 +1,7 @@
From b551892df962870860845022b74db883f71d8094 Mon Sep 17 00:00:00 2001
From 2ba9dbed84a444bc39a9d83d963e518239a2d8ec Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 26 Apr 2014 17:27:52 +0100
Subject: [PATCH 02/68] [cec] Don't suspend pi on tv switch off - it can't wake
Subject: [PATCH 02/71] [cec] Don't suspend pi on tv switch off - it can't wake
up
---
@ -22,10 +22,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325
<setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="10" />
<setting key="pause_playback_on_deactivate" type="bool" value="1" label="36033" configurable="0" />
From 51342652317692c0547de6fd46ab406027caaeaf Mon Sep 17 00:00:00 2001
From 936c12492b75b00bc991b1fbc0bfc740a099206c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Apr 2014 18:19:32 +0100
Subject: [PATCH 03/68] [rbp/omxplayer] When opening a stream don't try to
Subject: [PATCH 03/71] [rbp/omxplayer] When opening a stream don't try to
update gui so often
---
@ -49,10 +49,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f
dialog->ProcessRenderLoop(false);
if (allowCancel && dialog->IsCanceled())
From 0b198a0ee941b51d9c384a0e86f4d6ba5b62990f Mon Sep 17 00:00:00 2001
From d557ef01432ab1b17a41ecf339259c4c2a95a58e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 8 Mar 2014 15:36:06 +0000
Subject: [PATCH 04/68] [hifiberry] Hack: force it to be recognised as IEC958
Subject: [PATCH 04/71] [hifiberry] Hack: force it to be recognised as IEC958
capable to enable passthrough options
---
@ -75,10 +75,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{
From 20cfc448b8f0c17cc3a6d945473f538bb05232ba Mon Sep 17 00:00:00 2001
From 243a6a522a997e5502dfc644415352bab635e26e Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Thu, 1 May 2014 16:28:39 +0100
Subject: [PATCH 05/68] Improved file buffering in CArchive
Subject: [PATCH 05/71] 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
@ -138,10 +138,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a
}
From 7fd1cae524a13cb22fe4b77131672d19ef5f92b4 Mon Sep 17 00:00:00 2001
From b5f43e1c7e25eb7ddfc72def17fa6ce252febf57 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 10 Aug 2014 16:45:16 +0100
Subject: [PATCH 06/68] filesystem: Make support of browsing into archives
Subject: [PATCH 06/71] filesystem: Make support of browsing into archives
optional
The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices.
@ -251,10 +251,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7
{
CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url);
From 35a10ad57387d4bef6ad79e05fd8f9f25ecf9142 Mon Sep 17 00:00:00 2001
From 199df29247e2fa52ad74270db9496bb816e955aa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 13:06:57 +0000
Subject: [PATCH 07/68] [rbp] Make cachemembuffersize default depend on memory
Subject: [PATCH 07/71] [rbp] Make cachemembuffersize default depend on memory
size
---
@ -356,10 +356,10 @@ index 91574029c28c4fabacb4bc022aa028dcaf299adb..46d72aa072d34119f4a7273dc8f71176
}
From 7feb38888a4ee8ef04f761dd2573c2a46d195955 Mon Sep 17 00:00:00 2001
From 60d038a72dc2787e87e78241da4293c40c6e8be0 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 30 May 2014 14:58:43 +0100
Subject: [PATCH 08/68] [settings] Experiment: Report DESKTOP resolution in
Subject: [PATCH 08/71] [settings] Experiment: Report DESKTOP resolution in
video settings
---
@ -381,10 +381,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9
StringUtils::Format("%dx%d%s", resolution->width, resolution->height,
ModeFlagsToString(resolution->flags, false).c_str()),
From a46d6e4c452c058760600eea4721a9d518484dcf Mon Sep 17 00:00:00 2001
From 339e21959b9c8cb48571e1cc17d14c83240043ab Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 24 Sep 2014 23:13:52 +0100
Subject: [PATCH 09/68] [audio] Add settings option to boost centre channel
Subject: [PATCH 09/71] [audio] Add settings option to boost centre channel
when downmixing
This allows a dB volume increase to be added to centre channel.
@ -510,10 +510,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5
// stereo upmix
if (upmix && m_src_channels == 2 && m_dst_channels > 2)
From 70c28bcf5c9e5ba3b1e3a1b91d1743341d591b9f Mon Sep 17 00:00:00 2001
From ab24bce0380f80ad67a895d0fb76b65915712a1a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 15:23:51 +0000
Subject: [PATCH 10/68] [rbp] Default extract thumbnails to false
Subject: [PATCH 10/71] [rbp] Default extract thumbnails to false
It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors.
It genereates a lot of support issues. Best to default to disabled and let users enable it if they must
@ -539,10 +539,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc
</category>
</section>
From bbbe30844e691b9ae17241dd1a5aecaf90a22bd2 Mon Sep 17 00:00:00 2001
From 1f2afb5a24ad283a0113d138efaafa05a8c983c3 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 27 Nov 2014 16:31:56 +0000
Subject: [PATCH 11/68] [languageinvoker] Reduce priority of python threads
Subject: [PATCH 11/71] [languageinvoker] Reduce priority of python threads
---
xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@ -565,10 +565,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1
}
From b89858ab1bdc803820d91c159fa7d2ac68d5b918 Mon Sep 17 00:00:00 2001
From 275bea7284b6f326aff83305d9614ca8963d745b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 29 Nov 2014 15:25:16 +0000
Subject: [PATCH 12/68] [rbp] hack: wait for splash to complete before changing
Subject: [PATCH 12/71] [rbp] hack: wait for splash to complete before changing
hdmi mode
---
@ -652,10 +652,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928
RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode();
From 2e91585fb7ec92f9d6bb8d46ff7bc8e68c11a2c7 Mon Sep 17 00:00:00 2001
From 4b9d00125907996bb8db50765d6019aecc06d494 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 11 Dec 2014 17:00:57 +0000
Subject: [PATCH 13/68] Fix for UI not showing both extractflags and
Subject: [PATCH 13/71] Fix for UI not showing both extractflags and
extractthumb
---
@ -718,10 +718,10 @@ index 5f1f3ca48342ef1a4eeed7432221d7b2dda354e8..2ed5fb217c6b9f63f28d760e2a2c00b2
<control type="toggle" />
</setting>
From 5fc4c807a80cce1ab24353d04092ed5c576a781f Mon Sep 17 00:00:00 2001
From 289cdf24dcdd94f577248862ca438f672302b936 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Thu, 11 Sep 2014 21:30:43 +0200
Subject: [PATCH 14/68] Disable autoscrolling while on screensaver and while
Subject: [PATCH 14/71] Disable autoscrolling while on screensaver and while
opening streams.
---
@ -852,10 +852,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144
if (m_lastRenderTime)
m_autoScrollDelayTime += currentTime - m_lastRenderTime;
From 2d74aea7d35fa5cf43b9b52346430f6f8e68b56b Mon Sep 17 00:00:00 2001
From 3e7e8ad0f181636081a5844c4cbc81c4db8e2c64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 13 Dec 2014 18:35:20 +0000
Subject: [PATCH 15/68] [demuxer] Avoid memcpy on every demuxer packet
Subject: [PATCH 15/71] [demuxer] Avoid memcpy on every demuxer packet
Avoids an unnecessary memcpy on every demuxer packet which for
high bitrate videos can be significant.
@ -955,10 +955,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96
}
catch(...) {
From 0101e6d27e57aebb4bf0b28d376dbe3f25e95c07 Mon Sep 17 00:00:00 2001
From 5d25db06c31809475a48876f9de7e0875fdaf1f4 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Wed, 25 Feb 2015 18:22:21 +0100
Subject: [PATCH 16/68] Load OSD dialogs on startup.
Subject: [PATCH 16/71] Load OSD dialogs on startup.
Fixes skipped frames the first time they're loaded in memory on less powered
devices, like a Raspberry Pi, when using DVDPlayer.
@ -1053,10 +1053,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
{ }
From ff61d0493fbad70c4814c3533f5710f45ebae78f Mon Sep 17 00:00:00 2001
From a7074f84d7adec4ec29679bb9ecf84d82f3db69c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Apr 2015 20:51:14 +0100
Subject: [PATCH 17/68] [gui] Also limit GUI updates when in non full-screen
Subject: [PATCH 17/71] [gui] Also limit GUI updates when in non full-screen
video mode
---
@ -1086,10 +1086,10 @@ index fdf7b1dc04e31ffe8e1d1b83825343b24c645b02..513deb7f27846891fb875b9263ad4d61
g_windowManager.FrameMove();
}
From fe1f769b0fcef97a4c99da0bd2ebd83520163307 Mon Sep 17 00:00:00 2001
From ce41575e8ece9bef487b338b838520407e59ee8d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 May 2015 23:58:06 +0100
Subject: [PATCH 18/68] [screensaver] Leave GUI contents available for
Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for
screensaver
---
@ -1119,10 +1119,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac
// Add window to the history list (we must do this before we activate it,
From 3319b6d93724794d1c5f0171c448fd0089b4e8b7 Mon Sep 17 00:00:00 2001
From 27a497a156eeb9fd7f589f3b121ea5fde3c4d47a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 6 Jun 2015 18:43:57 +0100
Subject: [PATCH 19/68] ffmpeg: Automatic switch to software decode for GMC
Subject: [PATCH 19/71] ffmpeg: Automatic switch to software decode for GMC
with more than one warp point
---
@ -1350,10 +1350,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4
else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1())
supported = true;
From b2121b831c2b596eb98a3beb709762ba7f9ebcf2 Mon Sep 17 00:00:00 2001
From e7c0b0639f3216a4ec732453eb3869221035c0c8 Mon Sep 17 00:00:00 2001
From: Claudio-Sjo <Claudio.Porfiri@gmail.com>
Date: Mon, 16 Feb 2015 14:51:26 +0100
Subject: [PATCH 20/68] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer
Subject: [PATCH 20/71] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer
- fixes #15794
---
@ -1545,10 +1545,10 @@ index 0427af4534bfe59a343f0518c7f4242d93299836..e99236294fa8b9b613e465a8ecaf3ad3
lsn_t m_lsnCurrent; // Position inside the track in logical sector number
lsn_t m_lsnEnd; // End of m_iTrack in logical sector number
From 88f06a06210729f8d903f2edf2f256483c35159d Mon Sep 17 00:00:00 2001
From ccee8a7820c164e8eef572e2c4940f407992daad Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 24 Jun 2016 19:38:13 +0100
Subject: [PATCH 21/68] codecoverlay: Include codec name in overlay
Subject: [PATCH 21/71] codecoverlay: Include codec name in overlay
---
xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++
@ -1642,10 +1642,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291
double m_iSubtitleDelay;
bool m_bRenderSubs;
From a2c5b68ac547e37b40b0a6080db5be3dae6b2ea8 Mon Sep 17 00:00:00 2001
From 97a606afbd7b6502cc23b64568df6e93de332bdf Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 8 Mar 2016 21:20:58 +0300
Subject: [PATCH 22/68] [DebugInfo] Add cpu usage info.
Subject: [PATCH 22/71] [DebugInfo] Add cpu usage info.
---
.../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++--------------
@ -1815,10 +1815,10 @@ index 420b5b5d8e6089e1049ef9af25e23d915df50dc1..fd8a0a2447c40357a9e13003f2ef45ef
m_debugTimer.Set(1000);
From 2adc8646ee6f95e23c0a791142958c02e93caaf8 Mon Sep 17 00:00:00 2001
From 65148f02888c16e3ae05b0639ddd6a753ae261fa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 22 May 2015 13:56:29 +0100
Subject: [PATCH 23/68] ffmpeg: Allow neon to be enabled in unified builds
Subject: [PATCH 23/71] ffmpeg: Allow neon to be enabled in unified builds
---
tools/depends/target/ffmpeg/Makefile | 4 ++++
@ -1841,10 +1841,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153
ifeq ($(OS), linux)
ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
From 0579dc27a97375bd5a42724940e84fb855d3a051 Mon Sep 17 00:00:00 2001
From 7b3ac50fec10531c959fa94e92e3a2c6be0b8789 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 27 Feb 2015 14:37:27 +0000
Subject: [PATCH 24/68] ffmpeg: Add some upstream HEVC optimisations
Subject: [PATCH 24/71] ffmpeg: Add some upstream HEVC optimisations
---
tools/depends/target/ffmpeg/Makefile | 6 +-
@ -5642,10 +5642,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81
+2.5.0
+
From f790771ded23e5084251c1ef51a0446304ad3e7f Mon Sep 17 00:00:00 2001
From 3e411c507b6f607fff9b05dc6a2f041d2a8ef986 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 7 May 2015 14:04:18 +0100
Subject: [PATCH 25/68] [ffmpeg] Add GPU acceleration to hevc
Subject: [PATCH 25/71] [ffmpeg] Add GPU acceleration to hevc
---
tools/depends/target/ffmpeg/Makefile | 4 +-
@ -43831,10 +43831,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71
+2.7.4
+
From 60380daef33b31a30317f5c4f0bb1a3662ccd21e Mon Sep 17 00:00:00 2001
From 7d7851a6a6201afea2c705d6ab30494a48006f2d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 12 Jan 2016 16:29:57 +0000
Subject: [PATCH 26/68] ffmpeg: Add cabac opimisations for hevc
Subject: [PATCH 26/71] ffmpeg: Add cabac opimisations for hevc
---
.../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++
@ -46079,10 +46079,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b
make -j ${BUILDTHREADS}
From 10ae426227617095c3a16dd78823470efbbbc822 Mon Sep 17 00:00:00 2001
From de9212a260d82d7ce6584bf11adde8aa7b9035e9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 16 Sep 2015 19:05:12 +0100
Subject: [PATCH 27/68] [3d] Make MVC a valid 3D filename tag
Subject: [PATCH 27/71] [3d] Make MVC a valid 3D filename tag
---
xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++
@ -46143,10 +46143,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef
bool m_useDisplayControlHWStereo;
From 77a3ef3f7d6db5ebd4e3f57f280bc503c4123623 Mon Sep 17 00:00:00 2001
From 438d9a918515eba692999e310cecf2816bd68b8d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 5 Oct 2015 14:58:05 +0100
Subject: [PATCH 28/68] [3d] Swap top/bottom sides of GUI
Subject: [PATCH 28/71] [3d] Swap top/bottom sides of GUI
---
xbmc/guilib/GraphicContext.cpp | 2 +-
@ -46166,10 +46166,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d
}
if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL)
From 67e1d0520450d59e44732176170c5ad163c265e6 Mon Sep 17 00:00:00 2001
From 5b43a704acfb943c6010d109418779da3a7febda Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 11 Oct 2015 20:51:37 +0100
Subject: [PATCH 29/68] Revert "Revert "Disable extra logging by default""
Subject: [PATCH 29/71] Revert "Revert "Disable extra logging by default""
This reverts commit a880554325be187b877cd8f0e2b338e7267da636.
---
@ -46196,10 +46196,10 @@ index 2ed5fb217c6b9f63f28d760e2a2c00b29942315a..850abcd174cc8773319639c7e337f2e2
<options>loggingcomponents</options>
<delimiter>,</delimiter>
From 784828e93758de14cfabdb225e69fc6ea17ca508 Mon Sep 17 00:00:00 2001
From ba0799b8adc0eba075b0b90c86f6670398b65f45 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 21 Dec 2015 22:17:25 +0000
Subject: [PATCH 30/68] [omximage] Fall back to arm jpeg encode/decode when gpu
Subject: [PATCH 30/71] [omximage] Fall back to arm jpeg encode/decode when gpu
is busy
---
@ -46442,10 +46442,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218
extern COMXImage g_OMXImage;
From da8da2bcd8f1f7863710085834afb12b3bf2fa49 Mon Sep 17 00:00:00 2001
From 8d5f8aa788c54c4cf0d1f448d322217b94d7eb29 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 9 Dec 2015 13:31:14 +0000
Subject: [PATCH 31/68] [mmalcodec] Fail to open when width is invalid. Can
Subject: [PATCH 31/71] [mmalcodec] Fail to open when width is invalid. Can
happen with mpegts files
---
@ -46467,10 +46467,10 @@ index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568
if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software)
return false;
From 83acbaf2b2181108d49592c77e561def10b93c7e Mon Sep 17 00:00:00 2001
From 6b2cc20d5a1733f1bd97b46bf938b9b57904ac2c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 19 Sep 2014 11:54:49 +0100
Subject: [PATCH 32/68] [videoplayer/rbp] Add pi specific option to maintain
Subject: [PATCH 32/71] [videoplayer/rbp] Add pi specific option to maintain
vsync with pll adjustment
New A/V sync option in settings/video/playback to do "Adjust PLL".
@ -46911,10 +46911,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50
extern CRBP g_RBP;
From 7e8e2ba84b6e905b4dbb56d697f3e4fedeace49c Mon Sep 17 00:00:00 2001
From 57021f87ad5adaa6d559a5a59e4f07469289f578 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 7 May 2015 15:35:43 +0100
Subject: [PATCH 33/68] rbp: Support zero copy interface with hevc acceleration
Subject: [PATCH 33/71] rbp: Support zero copy interface with hevc acceleration
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++
@ -46958,10 +46958,10 @@ index 77ae3273bc8e224fe6c193300ccef32fb7fbafe1..c0b3f19f2ef9cdef9adf00cf81154803
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p gpu:%p", CLASSNAME, __FUNCTION__, picture->MMALBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, picture->MMALBuffer, gmem);
From b029701efc29f558d3a4ca8b10d2a18cfa44743c Mon Sep 17 00:00:00 2001
From b193395bcc84c1954a89811d565bfac787e6315a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 16 May 2015 18:26:04 +0100
Subject: [PATCH 34/68] ffmpeg: use upstream mvc patches
Subject: [PATCH 34/71] ffmpeg: use upstream mvc patches
---
...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++
@ -47271,10 +47271,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b
+2.7.4
+
From 0728f32f0d6eec99e1925062c4069d187a459da7 Mon Sep 17 00:00:00 2001
From 2270fbeb9d9d858e15d77347f50e4813c75d4aff Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 29 Jan 2016 17:18:50 +0300
Subject: [PATCH 35/68] [win32] Settings: Added setting to enable/disable MVC
Subject: [PATCH 35/71] [win32] Settings: Added setting to enable/disable MVC
decoder.
---
@ -47304,10 +47304,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9
<category id="display">
<group id="1">
From 4f033de223f29d7d3dd4e925d5f51c67dfa98e82 Mon Sep 17 00:00:00 2001
From 2a51cc049289ca6c012ce2f09313ca13266fc37e Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Wed, 20 Jan 2016 17:02:16 +0300
Subject: [PATCH 36/68] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc
Subject: [PATCH 36/71] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc
streams.
---
@ -47370,10 +47370,10 @@ index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff81
}
case AVMEDIA_TYPE_DATA:
From 365c13cd712926583d19d8ab4afbb60cf2ee40a2 Mon Sep 17 00:00:00 2001
From 6a2a77a44d394e51330f10da92d2989171ff99b3 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 25 Feb 2016 11:21:25 +0300
Subject: [PATCH 37/68] [Stereo3D] Added block_lr and block_rl to supported
Subject: [PATCH 37/71] [Stereo3D] Added block_lr and block_rl to supported
modes.
---
@ -47423,10 +47423,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814
i++;
}
From 10eba95271f94477d62a8e479810365a18c91e7d Mon Sep 17 00:00:00 2001
From a27d42b9f6b66f08be5561f6224ffb5af56fe38c Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Sat, 23 Jan 2016 10:21:32 +0300
Subject: [PATCH 38/68] [VideoPlayer] Fix possible wrong aspect.
Subject: [PATCH 38/71] [VideoPlayer] Fix possible wrong aspect.
---
xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +-
@ -47446,10 +47446,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd
else
m_fForcedAspectRatio = 0.0;
From 421ce0b26a2446438200d4f320febb3aca94564b Mon Sep 17 00:00:00 2001
From 61f6644450fcca90960efbdfcbb619d79b46772f Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 22 Jan 2016 18:18:33 +0300
Subject: [PATCH 39/68] [VideoPlayer] DemuxFFmpeg: ssif remux
Subject: [PATCH 39/71] [VideoPlayer] DemuxFFmpeg: ssif remux
---
xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 +
@ -47883,10 +47883,10 @@ index cca5c7f932241d146291d2bb0a0042f99fa0d596..edbc96f7be3ae4dae994320f8c137555
m_discStubExtensions = ".disc";
// internal music extensions
From 5b946c59476a5132ec920cd1aeee00e61473c67c Mon Sep 17 00:00:00 2001
From 8e01d2a2a958030fae5173fbcf6a14c8ae1997c6 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 23 Feb 2016 16:02:46 +0300
Subject: [PATCH 40/68] [3DBD] Added support of 3D-BluRay playback.
Subject: [PATCH 40/71] [3DBD] Added support of 3D-BluRay playback.
---
lib/DllLibbluray.h | 8 +
@ -48876,10 +48876,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d
typedef std::shared_ptr<CDVDOverlayImage> SOverlay;
typedef std::list<SOverlay> SOverlays;
From 7f62ce78ecb3391a3f6d60365d348edb4f2aafd0 Mon Sep 17 00:00:00 2001
From 0e7e3baf46d1c699dd14b492d81cd11ec656fe69 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Fri, 11 Mar 2016 16:58:53 +0300
Subject: [PATCH 41/68] [VideoPlayer] HasVideo returns true if video stream
Subject: [PATCH 41/71] [VideoPlayer] HasVideo returns true if video stream
exists. This don't allow start visualization if audio is opened before video.
---
@ -48900,10 +48900,10 @@ index f206847aa8bd9e57c9e558362ef0728fd7737efd..b533aa5395dac512d3b153b44b86d2fa
bool CVideoPlayer::HasAudio() const
From 8f4f33f8ce611f3a621f273c99eff401adad8f95 Mon Sep 17 00:00:00 2001
From 8615e56935a181d5c85e56ca16854f197f5a39cd Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 10 Mar 2016 18:11:33 +0300
Subject: [PATCH 42/68] fixup! Revert supporting crappy tab/sbs subtitles. this
Subject: [PATCH 42/71] fixup! Revert supporting crappy tab/sbs subtitles. this
fixes regular subtitles.
---
@ -48940,10 +48940,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45
CDVDOverlayImage* overlay = new CDVDOverlayImage();
From 684733427abe150f550c4e9153c3f4ac11b5eb02 Mon Sep 17 00:00:00 2001
From 6b3a976f6e558e23d9561ea37ac5e5e59eb5b801 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 7 Apr 2016 17:28:50 +0300
Subject: [PATCH 43/68] [VideoPlayer] Disable reading extension stream from
Subject: [PATCH 43/71] [VideoPlayer] Disable reading extension stream from
input stream if decoder doesn't support it.
---
@ -49200,10 +49200,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1
// classes
CDVDOverlayContainer* m_pOverlayContainer;
From 59cb640ab14a7a9cebcf33173fb527043c408079 Mon Sep 17 00:00:00 2001
From fbe74a1f5eabeba77ead6a05a30a2c4e2b2ca283 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Fri, 16 Sep 2016 11:37:48 +0300
Subject: [PATCH 44/68] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from
Subject: [PATCH 44/71] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from
platform settings to common settings.
---
@ -49299,10 +49299,10 @@ index 473ca093f45f6a5779cade1268269bb7ba483e9d..11a422b1a5cbfde9914d3bfd23b5b540
m_simpleConditions.insert("have_lcms2");
#endif
From d83f42e75f32b1fa65118aee75d5924ba6422c49 Mon Sep 17 00:00:00 2001
From 79606a9af5952398a535b203d34eab88189b75bf Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 4 Nov 2016 22:56:56 +0300
Subject: [PATCH 45/68] [VideoPlayer] SSIF: fix for corner case when mvc stream
Subject: [PATCH 45/71] [VideoPlayer] SSIF: fix for corner case when mvc stream
is switched before the last packet is read from previous stream.
---
@ -49491,10 +49491,10 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9
typedef std::shared_ptr<CDVDOverlayImage> SOverlay;
typedef std::list<SOverlay> SOverlays;
From a302ecf71dca436add6e414416abde1dbff9f37c Mon Sep 17 00:00:00 2001
From 9134b76ed4f3e94794b24624b5251d03c57c2d16 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 23 Feb 2016 16:01:08 +0300
Subject: [PATCH 46/68] [libbluray] bump libbluray to 0.9.2-mvc.
Subject: [PATCH 46/71] [libbluray] bump libbluray to 0.9.2-mvc.
---
project/BuildDependencies/scripts/0_package.list | 2 +-
@ -49514,10 +49514,10 @@ index 33f87aec9968a24f5c9ba35ab5ea2eb1786feaf9..4fdebd9401b40ca18a474aece3e27f4b
libcec-4.0.1-win32-vc140-2.7z
libfribidi-0.19.2-win32.7z
From 73a2044f791aa2854f68a3fcabad3f322cf88b50 Mon Sep 17 00:00:00 2001
From cab608dce138c7ac52f9acb37945a6d2bbe9a523 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 29 Feb 2016 17:00:50 +0000
Subject: [PATCH 47/68] libbluray: Bump to Nevcairie's v0.9.2
Subject: [PATCH 47/71] libbluray: Bump to Nevcairie's v0.9.2
This includes 3D support
---
@ -51174,10 +51174,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220
+
+ return fp;
From 005b8b0aafa1e915d35af44951f31517af6f21e6 Mon Sep 17 00:00:00 2001
From 336c8898720e5c9f50115b1a359188b44f1fec11 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 6 Mar 2016 12:54:59 +0000
Subject: [PATCH 48/68] mvc: Automatically enable stereo mode
Subject: [PATCH 48/71] mvc: Automatically enable stereo mode
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++-
@ -51235,10 +51235,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd
break;
case AV_CODEC_ID_MPEG4:
From 8aa8a74b93220298b5a0634b2b15067c752805fd Mon Sep 17 00:00:00 2001
From e8fc139cb043e1718a8cf8e348fefcc4d00f9acf Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 24 Mar 2016 13:02:58 +0000
Subject: [PATCH 49/68] ffmpeg: mvc: fix for pixelation from packets with no
Subject: [PATCH 49/71] ffmpeg: mvc: fix for pixelation from packets with no
pts/dts
---
@ -51300,10 +51300,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba
cd $(PLATFORM);\
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
From d72e410373784b1c11de8d8a96993678eb4d90ad Mon Sep 17 00:00:00 2001
From 5f2316bdcc751de483d4a52eee31c1c1786469a9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 11 Nov 2016 15:53:53 +0000
Subject: [PATCH 50/68] stereoscopicmanager: fixups for rbp
Subject: [PATCH 50/71] stereoscopicmanager: fixups for rbp
---
xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++
@ -51541,10 +51541,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782
};
From 3c8a76f384bb29cf19d3838d115cdcbc91f0a002 Mon Sep 17 00:00:00 2001
From 32b9a9ab2a9ab92008ae9cc6250b6b898de804f8 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 10 Mar 2016 18:11:33 +0300
Subject: [PATCH 51/68] fixup! Revert supporting crappy tab/sbs subtitles. this
Subject: [PATCH 51/71] fixup! Revert supporting crappy tab/sbs subtitles. this
fixes regular subtitles.
---
@ -51564,10 +51564,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18
}
From 097f3f179d98342367c7d3585c44b24eb3fa8eed Mon Sep 17 00:00:00 2001
From 352b7f1fac766e04179adaf308ad544b31b604cb Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 26 Nov 2016 18:24:18 +0000
Subject: [PATCH 52/68] DemuxMVC: fixup after SeekTime API change
Subject: [PATCH 52/71] DemuxMVC: fixup after SeekTime API change
---
xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +-
@ -51601,10 +51601,10 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425
virtual int GetStreamLength() { return 0; };
virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; };
From 0574f5f0334a0cce8227f141469b67590e6d1f2b Mon Sep 17 00:00:00 2001
From 6a1debd2bc377a5d68fbed8c0c134898cc28e4e1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 4 Nov 2014 18:50:00 +0000
Subject: [PATCH 54/68] [cec] Temp - more logging
Subject: [PATCH 54/71] [cec] Temp - more logging
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++-
@ -51656,10 +51656,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a
}
From 38fa33062a3468b80b58951e2636adbf0e681e6f Mon Sep 17 00:00:00 2001
From 307a15f3b87951d023c06b73f0116dd8af1c9382 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 25 May 2016 18:31:17 +0100
Subject: [PATCH 55/68] rbp: Hard code the number of buffers to improve audio
Subject: [PATCH 55/71] rbp: Hard code the number of buffers to improve audio
sync
---
@ -51701,10 +51701,10 @@ index fd8a0a2447c40357a9e13003f2ef45ef20ccb205..be0de0d962fd374bc17bfa48a27ca17d
}
From ec9bbb9cc255dceaedaed291a6053a544c8f5cc0 Mon Sep 17 00:00:00 2001
From e384deac300900920e7cc9fd489e487dc63668ef Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 4 Jul 2016 18:30:03 +0100
Subject: [PATCH 56/68] rbp: Update the GL libs to new naming scheme
Subject: [PATCH 56/71] rbp: Update the GL libs to new naming scheme
As the opensource mesa GL library is getting more usable, the name collision wih the firmware GL driver is causing issues.
As such we are renaming the firmware GL driver to avoid this.
@ -51769,10 +51769,10 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71
fi
From 18d96915a596a96c9b73b480331455c06226910a Mon Sep 17 00:00:00 2001
From 03bbec2df7c5901415ba5496245ed25ba5841181 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 28 Jun 2016 14:46:01 +0100
Subject: [PATCH 57/68] ffmpeg: hacky fix for files with GMC
Subject: [PATCH 57/71] ffmpeg: hacky fix for files with GMC
---
xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++--
@ -51794,10 +51794,10 @@ index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675
{
if (pStream->codec->codec_id == AV_CODEC_ID_PROBE)
From 0fa6a704aaa9a1e94e78728815bf492b2f383670 Mon Sep 17 00:00:00 2001
From 3d5d1b8ef8d74c6c4a41cf7e654c7435f4fe52eb Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 19 Jul 2016 20:39:18 +0100
Subject: [PATCH 58/68] mmalrender: Add sharpness control
Subject: [PATCH 58/71] mmalrender: Add sharpness control
---
addons/resource.language.en_gb/resources/strings.po | 2 +-
@ -51869,10 +51869,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_vout;
From 90fcda3eef3bf74f8baec388a2d975c4a915033a Mon Sep 17 00:00:00 2001
From 5375fb0e6dc4ba69f348d0ded98ff36c2084e47e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 14 Oct 2016 15:37:53 +0100
Subject: [PATCH 59/68] MMALFFMpeg: Report as SW decode in codec overlay info
Subject: [PATCH 59/71] MMALFFMpeg: Report as SW decode in codec overlay info
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +-
@ -51892,10 +51892,10 @@ index 8bace5b3eb98b3b1ddad7f56af83a41ae067bc75..c820a04c903866862b5ff04b38124ff0
CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str());
}
From 33381091746e0719b21818bfd5f3bba8439a9f70 Mon Sep 17 00:00:00 2001
From 71184cfffaf0216c67b9dd3c600d5c8d805e984a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Nov 2016 18:28:01 +0000
Subject: [PATCH 60/68] advancedsettings: Add option to set cache size on
Subject: [PATCH 60/71] advancedsettings: Add option to set cache size on
libass
E.g to set total cache size in libass to 32M
@ -51997,10 +51997,10 @@ index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97
unsigned int m_jsonTcpPort;
From 5a7d0e7aefb3a1ea7a11056cd6b4148ce24abe0e Mon Sep 17 00:00:00 2001
From 147c688154b43f57ec048166d901920594d70c28 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 13 Nov 2016 20:30:15 +0000
Subject: [PATCH 61/68] [rbp] Experimental limit libass cache size depending on
Subject: [PATCH 61/71] [rbp] Experimental limit libass cache size depending on
arm memory size
---
@ -52046,10 +52046,10 @@ index 7f3325392993823b8d2d6a915579c48401ca2c12..410ad30aeb60316e9438ee56aaca7e73
m_libAssCache = 0;
From 41b760881da0c4440e9e19041ab856d239785d0d Mon Sep 17 00:00:00 2001
From f4d6563f06f5c674a8b845daca0c58913a0f1712 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 22 Jun 2015 21:46:57 +0100
Subject: [PATCH 62/68] [rbp] Use default resampling setting on Pi2
Subject: [PATCH 62/71] [rbp] Use default resampling setting on Pi2
---
system/settings/rbp2.xml | 5 +++++
@ -52072,10 +52072,10 @@ index 50bd55e9c90864c1ff4c36c4650e9ec247737a44..f218216e615d9723e5a163aab9c42ca5
</section>
</settings>
From f5b8dc97e759784ef8644aa47bf7049f87ca48ee Mon Sep 17 00:00:00 2001
From cb0855a5d1f3d8d64c3d780eee4d36a8cae7e460 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 1 Dec 2016 17:06:01 +0000
Subject: [PATCH 63/68] MMALRender: Allow advanced deinterlace with software
Subject: [PATCH 63/71] MMALRender: Allow advanced deinterlace with software
decode
Uses YUV420 directly which improves performance.
@ -52098,10 +52098,10 @@ index f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9..05cbd8eeaef1a21fc32ea1fa23ea686e
status = mmal_port_format_commit(m_deint_output);
if (status != MMAL_SUCCESS)
From 38c1467506f79354d682fdc0ac485d28c717365c Mon Sep 17 00:00:00 2001
From 92cf602789202ca31230bba940bb2e2e551ecbeb Mon Sep 17 00:00:00 2001
From: Nuno Senica <nsenica@gmail.com>
Date: Tue, 27 Dec 2016 20:59:56 +0000
Subject: [PATCH 64/68] Apply ffmpeg patches automatically after downloading
Subject: [PATCH 64/71] Apply ffmpeg patches automatically after downloading
and extracting the ffmpeg tar ball
---
@ -52132,10 +52132,10 @@ index 7c68b4c3d09a037d3b85c81604d47a7ea6dd1c21..eec635ef493d13ea97c9b806eb57cccb
file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper
"#!/bin/bash
From 85308cfc4c4cadea966028f36d133c436dee0f44 Mon Sep 17 00:00:00 2001
From c1f3b380540377b5b710c46066aa79fa64bc696e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 1 May 2016 19:56:43 +0100
Subject: [PATCH 65/68] omxplayer: Avoid CAEFactory::Suspend which should only
Subject: [PATCH 65/71] omxplayer: Avoid CAEFactory::Suspend which should only
be called by application
---
@ -52235,10 +52235,10 @@ index db7f98ddbc2db2f20bdc42379df3f08eba165bfc..02acfc8cfe57446be4e00b991ef6fde9
COMXCoreComponent m_omx_render_analog;
COMXCoreComponent m_omx_render_hdmi;
From 7e1af74827644365c69208d25e6aa81ce6c4bc96 Mon Sep 17 00:00:00 2001
From 1f20fe91f925c482201feb608b254c4afd235459 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 Mar 2017 21:40:22 +0000
Subject: [PATCH 66/68] MMALRender: default to bob (x2) deinterlace for HD
Subject: [PATCH 66/71] MMALRender: default to bob (x2) deinterlace for HD
There are still issues with some dvb dongles run on the same Pi as playback.
Default to bob. Users who aren't using these devices will have to manually enable advanced.
@ -52280,10 +52280,10 @@ index 39bc0530cecd54ae8c3a5481c92f1a6a18a4d9c5..cb0a06888a919879155fea2a689c1bae
if (m_deinterlace && interlace_method != VS_INTERLACEMETHOD_NONE)
{
From ebd0a42fa87037a9cf90eeb0d6b8187d787a866a Mon Sep 17 00:00:00 2001
From 8305dec169baacde92f6d2ca4f791d3f281fa67d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 17 Feb 2017 17:58:13 +0000
Subject: [PATCH 67/68] ffmpeg: Update hevc optimisation to use the gpu service
Subject: [PATCH 67/71] ffmpeg: Update hevc optimisation to use the gpu service
---
project/cmake/modules/FindFFMPEG.cmake | 14 +-
@ -105595,10 +105595,10 @@ index e172ebf157aebffe1ae50b4a2b25fd71bc708c93..852815d5f4ae80771c5304f6f3520b5e
++
++
From 7b463eb51346ae788f1f12bb89f8cf2102c14241 Mon Sep 17 00:00:00 2001
From e6a8a101454e409fd2b6c61324d26252541b6d29 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 4 Mar 2017 19:25:40 +0000
Subject: [PATCH 68/68] ffmpeg: Call get_format to fix an issue with MMAL
Subject: [PATCH 68/71] ffmpeg: Call get_format to fix an issue with MMAL
rendering
---
@ -105719,3 +105719,167 @@ index 3d970429012c1f3aede4df0545ced5006c165d50..e070d96fc340f5bff94d72ae9004c4a9
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
./configure --prefix=$FFMPEG_PREFIX \
From 63c5c8ffa14cc3869411b7ba30198362c7a070d1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Mar 2017 22:52:37 +0000
Subject: [PATCH 69/71] MMAL: Remove periodic prime calls and handle from
buffer destructor
If a number of buffers are released at once we can end up stalled in GetPicture with the buffers
not having a chance to be returned to decoder
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 ++++--
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 4 ++++
.../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 9 ++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
index dca872373080156100618d58d9782e2461fa2648..22d594cdc217f32f820e3618b4d90a1d75fc769b 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -78,7 +78,11 @@ CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr<CMMALPool> p
CMMALVideoBuffer::~CMMALVideoBuffer()
{
if (mmal_buffer)
+ {
mmal_buffer_header_release(mmal_buffer);
+ if (m_pool)
+ m_pool->Prime();
+ }
if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
}
@@ -639,8 +643,6 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
send_eos = false;
m_got_eos = true;
}
- if (m_pool)
- m_pool->Prime();
while (1)
{
if (pData || send_eos)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
index c0b3f19f2ef9cdef9adf00cf81154803b12feb4f..f9b7172c45d5a0158259ebfb53ea75696f0acb6d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
@@ -86,7 +86,11 @@ CMMALYUVBuffer::~CMMALYUVBuffer()
m_pool->ReleaseBuffer(gmem);
gmem = nullptr;
if (mmal_buffer)
+ {
mmal_buffer_header_release(mmal_buffer);
+ if (m_pool)
+ m_pool->Prime();
+ }
}
//-----------------------------------------------------------------------------
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
index 9279966fa634f6f5a3e00f12dd528337392cf038..c6ba9b024b3c3bbe53d3f0870dd8c839fe992c68 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -247,6 +247,8 @@ void CMMALPool::Prime()
if (!m_mmal_pool || !m_component)
return;
MMAL_PORT_T *port = m_input ? m_component->input[0] : m_component->output[0];
+ if (!port->is_enabled)
+ return;
while (omvb = GetBuffer(0), omvb)
{
if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
@@ -526,7 +528,6 @@ void CMMALRenderer::Run()
CLog::Log(LOGDEBUG, "%s::%s - starting", CLASSNAME, __func__);
while (1)
{
- bool prime = false;
MMAL_BUFFER_HEADER_T *buffer = mmal_queue_wait(m_queue_process);
assert(buffer);
if (buffer == &m_quitpacket)
@@ -657,10 +658,6 @@ void CMMALRenderer::Run()
}
}
}
- else
- {
- prime = true;
- }
break;
}
default: assert(0); break;
@@ -679,8 +676,6 @@ void CMMALRenderer::Run()
mmal_buffer_header_release(buffer);
}
}
- if (prime && m_deint_output_pool)
- m_deint_output_pool->Prime();
}
CLog::Log(LOGDEBUG, "%s::%s - stopping", CLASSNAME, __func__);
}
From 4ce3f65bb006dfa4b8d49b58b257728848a9e8dd Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Mar 2017 23:22:43 +0000
Subject: [PATCH 70/71] MMALCodec: Include a timeout of GetPicture in default
debug logging
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
index 22d594cdc217f32f820e3618b4d90a1d75fc769b..e8bc3b930e84e058460b6cfd7caca0d7d81b464f 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -731,7 +731,7 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
}
}
- if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+ if (!ret || g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - ret(%x) pics(%d) inputs(%d) slept(%2d) queued(%.2f) (%.2f:%.2f) full(%d) flags(%x) preroll(%d) eos(%d %d/%d)", CLASSNAME, __func__, ret, m_output_ready.size(), mmal_queue_length(m_dec_input_pool->queue), 500-delay.MillisLeft(), queued*1e-6, m_demuxerPts*1e-6, m_decoderPts*1e-6, full, m_codecControlFlags, m_preroll, m_got_eos, m_packet_num, m_packet_num_eos);
return ret;
From 472ede7c96085b80de6779bebd0bbd3482c3b02d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 21 Mar 2017 20:15:55 +0000
Subject: [PATCH 71/71] ffmpeg: Add calls to init and deinit gpu service
---
tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
index 852815d5f4ae80771c5304f6f3520b5e49b18a67..b4c15b782a4deb36c35a006e8547ce69665a10fe 100644
--- a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
+++ b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
@@ -11559,10 +11559,10 @@ index 0000000..5898102
+#endif
diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c
new file mode 100644
-index 0000000..a01c051
+index 0000000..365f4a6
--- /dev/null
+++ b/libavcodec/rpi_qpu.c
-@@ -0,0 +1,991 @@
+@@ -0,0 +1,993 @@
+#ifdef RPI
+// Use vchiq service for submitting jobs
+#define GPUSERVICE
@@ -11707,6 +11707,7 @@ index 0000000..a01c051
+ if (qpu_enable(mb, 1)) return -2;
+#endif
+ vcsm_init();
++ vc_gpuserv_init();
+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb);
+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm;
+ memset((void*)ptr, 0, sizeof *ptr);
@@ -11941,6 +11942,7 @@ index 0000000..a01c051
+ qpu_enable(mb, 0);
+ gpu_free_internal(&gpu_mem_ptr);
+
++ vc_gpuserv_deinit();
+ vcsm_exit();
+
+ mbox_close(mb);

428
projects/RPi2/patches/kodi/kodi-001-backport.patch
View File

@ -1,7 +1,7 @@
From b551892df962870860845022b74db883f71d8094 Mon Sep 17 00:00:00 2001
From 2ba9dbed84a444bc39a9d83d963e518239a2d8ec Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 26 Apr 2014 17:27:52 +0100
Subject: [PATCH 02/68] [cec] Don't suspend pi on tv switch off - it can't wake
Subject: [PATCH 02/71] [cec] Don't suspend pi on tv switch off - it can't wake
up
---
@ -22,10 +22,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325
<setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="10" />
<setting key="pause_playback_on_deactivate" type="bool" value="1" label="36033" configurable="0" />
From 51342652317692c0547de6fd46ab406027caaeaf Mon Sep 17 00:00:00 2001
From 936c12492b75b00bc991b1fbc0bfc740a099206c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Apr 2014 18:19:32 +0100
Subject: [PATCH 03/68] [rbp/omxplayer] When opening a stream don't try to
Subject: [PATCH 03/71] [rbp/omxplayer] When opening a stream don't try to
update gui so often
---
@ -49,10 +49,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f
dialog->ProcessRenderLoop(false);
if (allowCancel && dialog->IsCanceled())
From 0b198a0ee941b51d9c384a0e86f4d6ba5b62990f Mon Sep 17 00:00:00 2001
From d557ef01432ab1b17a41ecf339259c4c2a95a58e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 8 Mar 2014 15:36:06 +0000
Subject: [PATCH 04/68] [hifiberry] Hack: force it to be recognised as IEC958
Subject: [PATCH 04/71] [hifiberry] Hack: force it to be recognised as IEC958
capable to enable passthrough options
---
@ -75,10 +75,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{
From 20cfc448b8f0c17cc3a6d945473f538bb05232ba Mon Sep 17 00:00:00 2001
From 243a6a522a997e5502dfc644415352bab635e26e Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Thu, 1 May 2014 16:28:39 +0100
Subject: [PATCH 05/68] Improved file buffering in CArchive
Subject: [PATCH 05/71] 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
@ -138,10 +138,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a
}
From 7fd1cae524a13cb22fe4b77131672d19ef5f92b4 Mon Sep 17 00:00:00 2001
From b5f43e1c7e25eb7ddfc72def17fa6ce252febf57 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 10 Aug 2014 16:45:16 +0100
Subject: [PATCH 06/68] filesystem: Make support of browsing into archives
Subject: [PATCH 06/71] filesystem: Make support of browsing into archives
optional
The ability to browse, scan and play content in archives can cause problems on low powered/low memory devices.
@ -251,10 +251,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7
{
CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url);
From 35a10ad57387d4bef6ad79e05fd8f9f25ecf9142 Mon Sep 17 00:00:00 2001
From 199df29247e2fa52ad74270db9496bb816e955aa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 13:06:57 +0000
Subject: [PATCH 07/68] [rbp] Make cachemembuffersize default depend on memory
Subject: [PATCH 07/71] [rbp] Make cachemembuffersize default depend on memory
size
---
@ -356,10 +356,10 @@ index 91574029c28c4fabacb4bc022aa028dcaf299adb..46d72aa072d34119f4a7273dc8f71176
}
From 7feb38888a4ee8ef04f761dd2573c2a46d195955 Mon Sep 17 00:00:00 2001
From 60d038a72dc2787e87e78241da4293c40c6e8be0 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 30 May 2014 14:58:43 +0100
Subject: [PATCH 08/68] [settings] Experiment: Report DESKTOP resolution in
Subject: [PATCH 08/71] [settings] Experiment: Report DESKTOP resolution in
video settings
---
@ -381,10 +381,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9
StringUtils::Format("%dx%d%s", resolution->width, resolution->height,
ModeFlagsToString(resolution->flags, false).c_str()),
From a46d6e4c452c058760600eea4721a9d518484dcf Mon Sep 17 00:00:00 2001
From 339e21959b9c8cb48571e1cc17d14c83240043ab Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 24 Sep 2014 23:13:52 +0100
Subject: [PATCH 09/68] [audio] Add settings option to boost centre channel
Subject: [PATCH 09/71] [audio] Add settings option to boost centre channel
when downmixing
This allows a dB volume increase to be added to centre channel.
@ -510,10 +510,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5
// stereo upmix
if (upmix && m_src_channels == 2 && m_dst_channels > 2)
From 70c28bcf5c9e5ba3b1e3a1b91d1743341d591b9f Mon Sep 17 00:00:00 2001
From ab24bce0380f80ad67a895d0fb76b65915712a1a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 15:23:51 +0000
Subject: [PATCH 10/68] [rbp] Default extract thumbnails to false
Subject: [PATCH 10/71] [rbp] Default extract thumbnails to false
It can take 80 seconds for a single file on a Pi. It can cause crashes with out-of-memory errors.
It genereates a lot of support issues. Best to default to disabled and let users enable it if they must
@ -539,10 +539,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc
</category>
</section>
From bbbe30844e691b9ae17241dd1a5aecaf90a22bd2 Mon Sep 17 00:00:00 2001
From 1f2afb5a24ad283a0113d138efaafa05a8c983c3 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 27 Nov 2014 16:31:56 +0000
Subject: [PATCH 11/68] [languageinvoker] Reduce priority of python threads
Subject: [PATCH 11/71] [languageinvoker] Reduce priority of python threads
---
xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@ -565,10 +565,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1
}
From b89858ab1bdc803820d91c159fa7d2ac68d5b918 Mon Sep 17 00:00:00 2001
From 275bea7284b6f326aff83305d9614ca8963d745b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 29 Nov 2014 15:25:16 +0000
Subject: [PATCH 12/68] [rbp] hack: wait for splash to complete before changing
Subject: [PATCH 12/71] [rbp] hack: wait for splash to complete before changing
hdmi mode
---
@ -652,10 +652,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928
RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode();
From 2e91585fb7ec92f9d6bb8d46ff7bc8e68c11a2c7 Mon Sep 17 00:00:00 2001
From 4b9d00125907996bb8db50765d6019aecc06d494 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 11 Dec 2014 17:00:57 +0000
Subject: [PATCH 13/68] Fix for UI not showing both extractflags and
Subject: [PATCH 13/71] Fix for UI not showing both extractflags and
extractthumb
---
@ -718,10 +718,10 @@ index 5f1f3ca48342ef1a4eeed7432221d7b2dda354e8..2ed5fb217c6b9f63f28d760e2a2c00b2
<control type="toggle" />
</setting>
From 5fc4c807a80cce1ab24353d04092ed5c576a781f Mon Sep 17 00:00:00 2001
From 289cdf24dcdd94f577248862ca438f672302b936 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Thu, 11 Sep 2014 21:30:43 +0200
Subject: [PATCH 14/68] Disable autoscrolling while on screensaver and while
Subject: [PATCH 14/71] Disable autoscrolling while on screensaver and while
opening streams.
---
@ -852,10 +852,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144
if (m_lastRenderTime)
m_autoScrollDelayTime += currentTime - m_lastRenderTime;
From 2d74aea7d35fa5cf43b9b52346430f6f8e68b56b Mon Sep 17 00:00:00 2001
From 3e7e8ad0f181636081a5844c4cbc81c4db8e2c64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 13 Dec 2014 18:35:20 +0000
Subject: [PATCH 15/68] [demuxer] Avoid memcpy on every demuxer packet
Subject: [PATCH 15/71] [demuxer] Avoid memcpy on every demuxer packet
Avoids an unnecessary memcpy on every demuxer packet which for
high bitrate videos can be significant.
@ -955,10 +955,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96
}
catch(...) {
From 0101e6d27e57aebb4bf0b28d376dbe3f25e95c07 Mon Sep 17 00:00:00 2001
From 5d25db06c31809475a48876f9de7e0875fdaf1f4 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Wed, 25 Feb 2015 18:22:21 +0100
Subject: [PATCH 16/68] Load OSD dialogs on startup.
Subject: [PATCH 16/71] Load OSD dialogs on startup.
Fixes skipped frames the first time they're loaded in memory on less powered
devices, like a Raspberry Pi, when using DVDPlayer.
@ -1053,10 +1053,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
{ }
From ff61d0493fbad70c4814c3533f5710f45ebae78f Mon Sep 17 00:00:00 2001
From a7074f84d7adec4ec29679bb9ecf84d82f3db69c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Apr 2015 20:51:14 +0100
Subject: [PATCH 17/68] [gui] Also limit GUI updates when in non full-screen
Subject: [PATCH 17/71] [gui] Also limit GUI updates when in non full-screen
video mode
---
@ -1086,10 +1086,10 @@ index fdf7b1dc04e31ffe8e1d1b83825343b24c645b02..513deb7f27846891fb875b9263ad4d61
g_windowManager.FrameMove();
}
From fe1f769b0fcef97a4c99da0bd2ebd83520163307 Mon Sep 17 00:00:00 2001
From ce41575e8ece9bef487b338b838520407e59ee8d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 May 2015 23:58:06 +0100
Subject: [PATCH 18/68] [screensaver] Leave GUI contents available for
Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for
screensaver
---
@ -1119,10 +1119,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac
// Add window to the history list (we must do this before we activate it,
From 3319b6d93724794d1c5f0171c448fd0089b4e8b7 Mon Sep 17 00:00:00 2001
From 27a497a156eeb9fd7f589f3b121ea5fde3c4d47a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 6 Jun 2015 18:43:57 +0100
Subject: [PATCH 19/68] ffmpeg: Automatic switch to software decode for GMC
Subject: [PATCH 19/71] ffmpeg: Automatic switch to software decode for GMC
with more than one warp point
---
@ -1350,10 +1350,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4
else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1())
supported = true;
From b2121b831c2b596eb98a3beb709762ba7f9ebcf2 Mon Sep 17 00:00:00 2001
From e7c0b0639f3216a4ec732453eb3869221035c0c8 Mon Sep 17 00:00:00 2001
From: Claudio-Sjo <Claudio.Porfiri@gmail.com>
Date: Mon, 16 Feb 2015 14:51:26 +0100
Subject: [PATCH 20/68] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer
Subject: [PATCH 20/71] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer
- fixes #15794
---
@ -1545,10 +1545,10 @@ index 0427af4534bfe59a343f0518c7f4242d93299836..e99236294fa8b9b613e465a8ecaf3ad3
lsn_t m_lsnCurrent; // Position inside the track in logical sector number
lsn_t m_lsnEnd; // End of m_iTrack in logical sector number
From 88f06a06210729f8d903f2edf2f256483c35159d Mon Sep 17 00:00:00 2001
From ccee8a7820c164e8eef572e2c4940f407992daad Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 24 Jun 2016 19:38:13 +0100
Subject: [PATCH 21/68] codecoverlay: Include codec name in overlay
Subject: [PATCH 21/71] codecoverlay: Include codec name in overlay
---
xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++
@ -1642,10 +1642,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291
double m_iSubtitleDelay;
bool m_bRenderSubs;
From a2c5b68ac547e37b40b0a6080db5be3dae6b2ea8 Mon Sep 17 00:00:00 2001
From 97a606afbd7b6502cc23b64568df6e93de332bdf Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 8 Mar 2016 21:20:58 +0300
Subject: [PATCH 22/68] [DebugInfo] Add cpu usage info.
Subject: [PATCH 22/71] [DebugInfo] Add cpu usage info.
---
.../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++--------------
@ -1815,10 +1815,10 @@ index 420b5b5d8e6089e1049ef9af25e23d915df50dc1..fd8a0a2447c40357a9e13003f2ef45ef
m_debugTimer.Set(1000);
From 2adc8646ee6f95e23c0a791142958c02e93caaf8 Mon Sep 17 00:00:00 2001
From 65148f02888c16e3ae05b0639ddd6a753ae261fa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 22 May 2015 13:56:29 +0100
Subject: [PATCH 23/68] ffmpeg: Allow neon to be enabled in unified builds
Subject: [PATCH 23/71] ffmpeg: Allow neon to be enabled in unified builds
---
tools/depends/target/ffmpeg/Makefile | 4 ++++
@ -1841,10 +1841,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153
ifeq ($(OS), linux)
ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
From 0579dc27a97375bd5a42724940e84fb855d3a051 Mon Sep 17 00:00:00 2001
From 7b3ac50fec10531c959fa94e92e3a2c6be0b8789 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 27 Feb 2015 14:37:27 +0000
Subject: [PATCH 24/68] ffmpeg: Add some upstream HEVC optimisations
Subject: [PATCH 24/71] ffmpeg: Add some upstream HEVC optimisations
---
tools/depends/target/ffmpeg/Makefile | 6 +-
@ -5642,10 +5642,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81
+2.5.0
+
From f790771ded23e5084251c1ef51a0446304ad3e7f Mon Sep 17 00:00:00 2001
From 3e411c507b6f607fff9b05dc6a2f041d2a8ef986 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 7 May 2015 14:04:18 +0100
Subject: [PATCH 25/68] [ffmpeg] Add GPU acceleration to hevc
Subject: [PATCH 25/71] [ffmpeg] Add GPU acceleration to hevc
---
tools/depends/target/ffmpeg/Makefile | 4 +-
@ -43831,10 +43831,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71
+2.7.4
+
From 60380daef33b31a30317f5c4f0bb1a3662ccd21e Mon Sep 17 00:00:00 2001
From 7d7851a6a6201afea2c705d6ab30494a48006f2d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 12 Jan 2016 16:29:57 +0000
Subject: [PATCH 26/68] ffmpeg: Add cabac opimisations for hevc
Subject: [PATCH 26/71] ffmpeg: Add cabac opimisations for hevc
---
.../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++
@ -46079,10 +46079,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b
make -j ${BUILDTHREADS}
From 10ae426227617095c3a16dd78823470efbbbc822 Mon Sep 17 00:00:00 2001
From de9212a260d82d7ce6584bf11adde8aa7b9035e9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 16 Sep 2015 19:05:12 +0100
Subject: [PATCH 27/68] [3d] Make MVC a valid 3D filename tag
Subject: [PATCH 27/71] [3d] Make MVC a valid 3D filename tag
---
xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++
@ -46143,10 +46143,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef
bool m_useDisplayControlHWStereo;
From 77a3ef3f7d6db5ebd4e3f57f280bc503c4123623 Mon Sep 17 00:00:00 2001
From 438d9a918515eba692999e310cecf2816bd68b8d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 5 Oct 2015 14:58:05 +0100
Subject: [PATCH 28/68] [3d] Swap top/bottom sides of GUI
Subject: [PATCH 28/71] [3d] Swap top/bottom sides of GUI
---
xbmc/guilib/GraphicContext.cpp | 2 +-
@ -46166,10 +46166,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d
}
if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL)
From 67e1d0520450d59e44732176170c5ad163c265e6 Mon Sep 17 00:00:00 2001
From 5b43a704acfb943c6010d109418779da3a7febda Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 11 Oct 2015 20:51:37 +0100
Subject: [PATCH 29/68] Revert "Revert "Disable extra logging by default""
Subject: [PATCH 29/71] Revert "Revert "Disable extra logging by default""
This reverts commit a880554325be187b877cd8f0e2b338e7267da636.
---
@ -46196,10 +46196,10 @@ index 2ed5fb217c6b9f63f28d760e2a2c00b29942315a..850abcd174cc8773319639c7e337f2e2
<options>loggingcomponents</options>
<delimiter>,</delimiter>
From 784828e93758de14cfabdb225e69fc6ea17ca508 Mon Sep 17 00:00:00 2001
From ba0799b8adc0eba075b0b90c86f6670398b65f45 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 21 Dec 2015 22:17:25 +0000
Subject: [PATCH 30/68] [omximage] Fall back to arm jpeg encode/decode when gpu
Subject: [PATCH 30/71] [omximage] Fall back to arm jpeg encode/decode when gpu
is busy
---
@ -46442,10 +46442,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218
extern COMXImage g_OMXImage;
From da8da2bcd8f1f7863710085834afb12b3bf2fa49 Mon Sep 17 00:00:00 2001
From 8d5f8aa788c54c4cf0d1f448d322217b94d7eb29 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 9 Dec 2015 13:31:14 +0000
Subject: [PATCH 31/68] [mmalcodec] Fail to open when width is invalid. Can
Subject: [PATCH 31/71] [mmalcodec] Fail to open when width is invalid. Can
happen with mpegts files
---
@ -46467,10 +46467,10 @@ index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568
if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software)
return false;
From 83acbaf2b2181108d49592c77e561def10b93c7e Mon Sep 17 00:00:00 2001
From 6b2cc20d5a1733f1bd97b46bf938b9b57904ac2c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 19 Sep 2014 11:54:49 +0100
Subject: [PATCH 32/68] [videoplayer/rbp] Add pi specific option to maintain
Subject: [PATCH 32/71] [videoplayer/rbp] Add pi specific option to maintain
vsync with pll adjustment
New A/V sync option in settings/video/playback to do "Adjust PLL".
@ -46911,10 +46911,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50
extern CRBP g_RBP;
From 7e8e2ba84b6e905b4dbb56d697f3e4fedeace49c Mon Sep 17 00:00:00 2001
From 57021f87ad5adaa6d559a5a59e4f07469289f578 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 7 May 2015 15:35:43 +0100
Subject: [PATCH 33/68] rbp: Support zero copy interface with hevc acceleration
Subject: [PATCH 33/71] rbp: Support zero copy interface with hevc acceleration
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++
@ -46958,10 +46958,10 @@ index 77ae3273bc8e224fe6c193300ccef32fb7fbafe1..c0b3f19f2ef9cdef9adf00cf81154803
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p gpu:%p", CLASSNAME, __FUNCTION__, picture->MMALBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, picture->MMALBuffer, gmem);
From b029701efc29f558d3a4ca8b10d2a18cfa44743c Mon Sep 17 00:00:00 2001
From b193395bcc84c1954a89811d565bfac787e6315a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 16 May 2015 18:26:04 +0100
Subject: [PATCH 34/68] ffmpeg: use upstream mvc patches
Subject: [PATCH 34/71] ffmpeg: use upstream mvc patches
---
...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++
@ -47271,10 +47271,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b
+2.7.4
+
From 0728f32f0d6eec99e1925062c4069d187a459da7 Mon Sep 17 00:00:00 2001
From 2270fbeb9d9d858e15d77347f50e4813c75d4aff Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 29 Jan 2016 17:18:50 +0300
Subject: [PATCH 35/68] [win32] Settings: Added setting to enable/disable MVC
Subject: [PATCH 35/71] [win32] Settings: Added setting to enable/disable MVC
decoder.
---
@ -47304,10 +47304,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9
<category id="display">
<group id="1">
From 4f033de223f29d7d3dd4e925d5f51c67dfa98e82 Mon Sep 17 00:00:00 2001
From 2a51cc049289ca6c012ce2f09313ca13266fc37e Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Wed, 20 Jan 2016 17:02:16 +0300
Subject: [PATCH 36/68] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc
Subject: [PATCH 36/71] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc
streams.
---
@ -47370,10 +47370,10 @@ index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff81
}
case AVMEDIA_TYPE_DATA:
From 365c13cd712926583d19d8ab4afbb60cf2ee40a2 Mon Sep 17 00:00:00 2001
From 6a2a77a44d394e51330f10da92d2989171ff99b3 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 25 Feb 2016 11:21:25 +0300
Subject: [PATCH 37/68] [Stereo3D] Added block_lr and block_rl to supported
Subject: [PATCH 37/71] [Stereo3D] Added block_lr and block_rl to supported
modes.
---
@ -47423,10 +47423,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814
i++;
}
From 10eba95271f94477d62a8e479810365a18c91e7d Mon Sep 17 00:00:00 2001
From a27d42b9f6b66f08be5561f6224ffb5af56fe38c Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Sat, 23 Jan 2016 10:21:32 +0300
Subject: [PATCH 38/68] [VideoPlayer] Fix possible wrong aspect.
Subject: [PATCH 38/71] [VideoPlayer] Fix possible wrong aspect.
---
xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +-
@ -47446,10 +47446,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd
else
m_fForcedAspectRatio = 0.0;
From 421ce0b26a2446438200d4f320febb3aca94564b Mon Sep 17 00:00:00 2001
From 61f6644450fcca90960efbdfcbb619d79b46772f Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 22 Jan 2016 18:18:33 +0300
Subject: [PATCH 39/68] [VideoPlayer] DemuxFFmpeg: ssif remux
Subject: [PATCH 39/71] [VideoPlayer] DemuxFFmpeg: ssif remux
---
xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 +
@ -47883,10 +47883,10 @@ index cca5c7f932241d146291d2bb0a0042f99fa0d596..edbc96f7be3ae4dae994320f8c137555
m_discStubExtensions = ".disc";
// internal music extensions
From 5b946c59476a5132ec920cd1aeee00e61473c67c Mon Sep 17 00:00:00 2001
From 8e01d2a2a958030fae5173fbcf6a14c8ae1997c6 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 23 Feb 2016 16:02:46 +0300
Subject: [PATCH 40/68] [3DBD] Added support of 3D-BluRay playback.
Subject: [PATCH 40/71] [3DBD] Added support of 3D-BluRay playback.
---
lib/DllLibbluray.h | 8 +
@ -48876,10 +48876,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d
typedef std::shared_ptr<CDVDOverlayImage> SOverlay;
typedef std::list<SOverlay> SOverlays;
From 7f62ce78ecb3391a3f6d60365d348edb4f2aafd0 Mon Sep 17 00:00:00 2001
From 0e7e3baf46d1c699dd14b492d81cd11ec656fe69 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Fri, 11 Mar 2016 16:58:53 +0300
Subject: [PATCH 41/68] [VideoPlayer] HasVideo returns true if video stream
Subject: [PATCH 41/71] [VideoPlayer] HasVideo returns true if video stream
exists. This don't allow start visualization if audio is opened before video.
---
@ -48900,10 +48900,10 @@ index f206847aa8bd9e57c9e558362ef0728fd7737efd..b533aa5395dac512d3b153b44b86d2fa
bool CVideoPlayer::HasAudio() const
From 8f4f33f8ce611f3a621f273c99eff401adad8f95 Mon Sep 17 00:00:00 2001
From 8615e56935a181d5c85e56ca16854f197f5a39cd Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 10 Mar 2016 18:11:33 +0300
Subject: [PATCH 42/68] fixup! Revert supporting crappy tab/sbs subtitles. this
Subject: [PATCH 42/71] fixup! Revert supporting crappy tab/sbs subtitles. this
fixes regular subtitles.
---
@ -48940,10 +48940,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45
CDVDOverlayImage* overlay = new CDVDOverlayImage();
From 684733427abe150f550c4e9153c3f4ac11b5eb02 Mon Sep 17 00:00:00 2001
From 6b3a976f6e558e23d9561ea37ac5e5e59eb5b801 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 7 Apr 2016 17:28:50 +0300
Subject: [PATCH 43/68] [VideoPlayer] Disable reading extension stream from
Subject: [PATCH 43/71] [VideoPlayer] Disable reading extension stream from
input stream if decoder doesn't support it.
---
@ -49200,10 +49200,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1
// classes
CDVDOverlayContainer* m_pOverlayContainer;
From 59cb640ab14a7a9cebcf33173fb527043c408079 Mon Sep 17 00:00:00 2001
From fbe74a1f5eabeba77ead6a05a30a2c4e2b2ca283 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Fri, 16 Sep 2016 11:37:48 +0300
Subject: [PATCH 44/68] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from
Subject: [PATCH 44/71] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from
platform settings to common settings.
---
@ -49299,10 +49299,10 @@ index 473ca093f45f6a5779cade1268269bb7ba483e9d..11a422b1a5cbfde9914d3bfd23b5b540
m_simpleConditions.insert("have_lcms2");
#endif
From d83f42e75f32b1fa65118aee75d5924ba6422c49 Mon Sep 17 00:00:00 2001
From 79606a9af5952398a535b203d34eab88189b75bf Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Fri, 4 Nov 2016 22:56:56 +0300
Subject: [PATCH 45/68] [VideoPlayer] SSIF: fix for corner case when mvc stream
Subject: [PATCH 45/71] [VideoPlayer] SSIF: fix for corner case when mvc stream
is switched before the last packet is read from previous stream.
---
@ -49491,10 +49491,10 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9
typedef std::shared_ptr<CDVDOverlayImage> SOverlay;
typedef std::list<SOverlay> SOverlays;
From a302ecf71dca436add6e414416abde1dbff9f37c Mon Sep 17 00:00:00 2001
From 9134b76ed4f3e94794b24624b5251d03c57c2d16 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <afedchin@ruswizards.com>
Date: Tue, 23 Feb 2016 16:01:08 +0300
Subject: [PATCH 46/68] [libbluray] bump libbluray to 0.9.2-mvc.
Subject: [PATCH 46/71] [libbluray] bump libbluray to 0.9.2-mvc.
---
project/BuildDependencies/scripts/0_package.list | 2 +-
@ -49514,10 +49514,10 @@ index 33f87aec9968a24f5c9ba35ab5ea2eb1786feaf9..4fdebd9401b40ca18a474aece3e27f4b
libcec-4.0.1-win32-vc140-2.7z
libfribidi-0.19.2-win32.7z
From 73a2044f791aa2854f68a3fcabad3f322cf88b50 Mon Sep 17 00:00:00 2001
From cab608dce138c7ac52f9acb37945a6d2bbe9a523 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 29 Feb 2016 17:00:50 +0000
Subject: [PATCH 47/68] libbluray: Bump to Nevcairie's v0.9.2
Subject: [PATCH 47/71] libbluray: Bump to Nevcairie's v0.9.2
This includes 3D support
---
@ -51174,10 +51174,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220
+
+ return fp;
From 005b8b0aafa1e915d35af44951f31517af6f21e6 Mon Sep 17 00:00:00 2001
From 336c8898720e5c9f50115b1a359188b44f1fec11 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 6 Mar 2016 12:54:59 +0000
Subject: [PATCH 48/68] mvc: Automatically enable stereo mode
Subject: [PATCH 48/71] mvc: Automatically enable stereo mode
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++-
@ -51235,10 +51235,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd
break;
case AV_CODEC_ID_MPEG4:
From 8aa8a74b93220298b5a0634b2b15067c752805fd Mon Sep 17 00:00:00 2001
From e8fc139cb043e1718a8cf8e348fefcc4d00f9acf Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 24 Mar 2016 13:02:58 +0000
Subject: [PATCH 49/68] ffmpeg: mvc: fix for pixelation from packets with no
Subject: [PATCH 49/71] ffmpeg: mvc: fix for pixelation from packets with no
pts/dts
---
@ -51300,10 +51300,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba
cd $(PLATFORM);\
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
From d72e410373784b1c11de8d8a96993678eb4d90ad Mon Sep 17 00:00:00 2001
From 5f2316bdcc751de483d4a52eee31c1c1786469a9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 11 Nov 2016 15:53:53 +0000
Subject: [PATCH 50/68] stereoscopicmanager: fixups for rbp
Subject: [PATCH 50/71] stereoscopicmanager: fixups for rbp
---
xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++
@ -51541,10 +51541,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782
};
From 3c8a76f384bb29cf19d3838d115cdcbc91f0a002 Mon Sep 17 00:00:00 2001
From 32b9a9ab2a9ab92008ae9cc6250b6b898de804f8 Mon Sep 17 00:00:00 2001
From: Anton Fedchin <anightik@gmail.com>
Date: Thu, 10 Mar 2016 18:11:33 +0300
Subject: [PATCH 51/68] fixup! Revert supporting crappy tab/sbs subtitles. this
Subject: [PATCH 51/71] fixup! Revert supporting crappy tab/sbs subtitles. this
fixes regular subtitles.
---
@ -51564,10 +51564,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18
}
From 097f3f179d98342367c7d3585c44b24eb3fa8eed Mon Sep 17 00:00:00 2001
From 352b7f1fac766e04179adaf308ad544b31b604cb Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 26 Nov 2016 18:24:18 +0000
Subject: [PATCH 52/68] DemuxMVC: fixup after SeekTime API change
Subject: [PATCH 52/71] DemuxMVC: fixup after SeekTime API change
---
xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +-
@ -51601,10 +51601,10 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425
virtual int GetStreamLength() { return 0; };
virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; };
From 0574f5f0334a0cce8227f141469b67590e6d1f2b Mon Sep 17 00:00:00 2001
From 6a1debd2bc377a5d68fbed8c0c134898cc28e4e1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 4 Nov 2014 18:50:00 +0000
Subject: [PATCH 54/68] [cec] Temp - more logging
Subject: [PATCH 54/71] [cec] Temp - more logging
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++-
@ -51656,10 +51656,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a
}
From 38fa33062a3468b80b58951e2636adbf0e681e6f Mon Sep 17 00:00:00 2001
From 307a15f3b87951d023c06b73f0116dd8af1c9382 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 25 May 2016 18:31:17 +0100
Subject: [PATCH 55/68] rbp: Hard code the number of buffers to improve audio
Subject: [PATCH 55/71] rbp: Hard code the number of buffers to improve audio
sync
---
@ -51701,10 +51701,10 @@ index fd8a0a2447c40357a9e13003f2ef45ef20ccb205..be0de0d962fd374bc17bfa48a27ca17d
}
From ec9bbb9cc255dceaedaed291a6053a544c8f5cc0 Mon Sep 17 00:00:00 2001
From e384deac300900920e7cc9fd489e487dc63668ef Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 4 Jul 2016 18:30:03 +0100
Subject: [PATCH 56/68] rbp: Update the GL libs to new naming scheme
Subject: [PATCH 56/71] rbp: Update the GL libs to new naming scheme
As the opensource mesa GL library is getting more usable, the name collision wih the firmware GL driver is causing issues.
As such we are renaming the firmware GL driver to avoid this.
@ -51769,10 +51769,10 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71
fi
From 18d96915a596a96c9b73b480331455c06226910a Mon Sep 17 00:00:00 2001
From 03bbec2df7c5901415ba5496245ed25ba5841181 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 28 Jun 2016 14:46:01 +0100
Subject: [PATCH 57/68] ffmpeg: hacky fix for files with GMC
Subject: [PATCH 57/71] ffmpeg: hacky fix for files with GMC
---
xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++--
@ -51794,10 +51794,10 @@ index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675
{
if (pStream->codec->codec_id == AV_CODEC_ID_PROBE)
From 0fa6a704aaa9a1e94e78728815bf492b2f383670 Mon Sep 17 00:00:00 2001
From 3d5d1b8ef8d74c6c4a41cf7e654c7435f4fe52eb Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 19 Jul 2016 20:39:18 +0100
Subject: [PATCH 58/68] mmalrender: Add sharpness control
Subject: [PATCH 58/71] mmalrender: Add sharpness control
---
addons/resource.language.en_gb/resources/strings.po | 2 +-
@ -51869,10 +51869,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_vout;
From 90fcda3eef3bf74f8baec388a2d975c4a915033a Mon Sep 17 00:00:00 2001
From 5375fb0e6dc4ba69f348d0ded98ff36c2084e47e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 14 Oct 2016 15:37:53 +0100
Subject: [PATCH 59/68] MMALFFMpeg: Report as SW decode in codec overlay info
Subject: [PATCH 59/71] MMALFFMpeg: Report as SW decode in codec overlay info
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +-
@ -51892,10 +51892,10 @@ index 8bace5b3eb98b3b1ddad7f56af83a41ae067bc75..c820a04c903866862b5ff04b38124ff0
CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str());
}
From 33381091746e0719b21818bfd5f3bba8439a9f70 Mon Sep 17 00:00:00 2001
From 71184cfffaf0216c67b9dd3c600d5c8d805e984a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Nov 2016 18:28:01 +0000
Subject: [PATCH 60/68] advancedsettings: Add option to set cache size on
Subject: [PATCH 60/71] advancedsettings: Add option to set cache size on
libass
E.g to set total cache size in libass to 32M
@ -51997,10 +51997,10 @@ index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97
unsigned int m_jsonTcpPort;
From 5a7d0e7aefb3a1ea7a11056cd6b4148ce24abe0e Mon Sep 17 00:00:00 2001
From 147c688154b43f57ec048166d901920594d70c28 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 13 Nov 2016 20:30:15 +0000
Subject: [PATCH 61/68] [rbp] Experimental limit libass cache size depending on
Subject: [PATCH 61/71] [rbp] Experimental limit libass cache size depending on
arm memory size
---
@ -52046,10 +52046,10 @@ index 7f3325392993823b8d2d6a915579c48401ca2c12..410ad30aeb60316e9438ee56aaca7e73
m_libAssCache = 0;
From 41b760881da0c4440e9e19041ab856d239785d0d Mon Sep 17 00:00:00 2001
From f4d6563f06f5c674a8b845daca0c58913a0f1712 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 22 Jun 2015 21:46:57 +0100
Subject: [PATCH 62/68] [rbp] Use default resampling setting on Pi2
Subject: [PATCH 62/71] [rbp] Use default resampling setting on Pi2
---
system/settings/rbp2.xml | 5 +++++
@ -52072,10 +52072,10 @@ index 50bd55e9c90864c1ff4c36c4650e9ec247737a44..f218216e615d9723e5a163aab9c42ca5
</section>
</settings>
From f5b8dc97e759784ef8644aa47bf7049f87ca48ee Mon Sep 17 00:00:00 2001
From cb0855a5d1f3d8d64c3d780eee4d36a8cae7e460 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 1 Dec 2016 17:06:01 +0000
Subject: [PATCH 63/68] MMALRender: Allow advanced deinterlace with software
Subject: [PATCH 63/71] MMALRender: Allow advanced deinterlace with software
decode
Uses YUV420 directly which improves performance.
@ -52098,10 +52098,10 @@ index f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9..05cbd8eeaef1a21fc32ea1fa23ea686e
status = mmal_port_format_commit(m_deint_output);
if (status != MMAL_SUCCESS)
From 38c1467506f79354d682fdc0ac485d28c717365c Mon Sep 17 00:00:00 2001
From 92cf602789202ca31230bba940bb2e2e551ecbeb Mon Sep 17 00:00:00 2001
From: Nuno Senica <nsenica@gmail.com>
Date: Tue, 27 Dec 2016 20:59:56 +0000
Subject: [PATCH 64/68] Apply ffmpeg patches automatically after downloading
Subject: [PATCH 64/71] Apply ffmpeg patches automatically after downloading
and extracting the ffmpeg tar ball
---
@ -52132,10 +52132,10 @@ index 7c68b4c3d09a037d3b85c81604d47a7ea6dd1c21..eec635ef493d13ea97c9b806eb57cccb
file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper
"#!/bin/bash
From 85308cfc4c4cadea966028f36d133c436dee0f44 Mon Sep 17 00:00:00 2001
From c1f3b380540377b5b710c46066aa79fa64bc696e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 1 May 2016 19:56:43 +0100
Subject: [PATCH 65/68] omxplayer: Avoid CAEFactory::Suspend which should only
Subject: [PATCH 65/71] omxplayer: Avoid CAEFactory::Suspend which should only
be called by application
---
@ -52235,10 +52235,10 @@ index db7f98ddbc2db2f20bdc42379df3f08eba165bfc..02acfc8cfe57446be4e00b991ef6fde9
COMXCoreComponent m_omx_render_analog;
COMXCoreComponent m_omx_render_hdmi;
From 7e1af74827644365c69208d25e6aa81ce6c4bc96 Mon Sep 17 00:00:00 2001
From 1f20fe91f925c482201feb608b254c4afd235459 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 Mar 2017 21:40:22 +0000
Subject: [PATCH 66/68] MMALRender: default to bob (x2) deinterlace for HD
Subject: [PATCH 66/71] MMALRender: default to bob (x2) deinterlace for HD
There are still issues with some dvb dongles run on the same Pi as playback.
Default to bob. Users who aren't using these devices will have to manually enable advanced.
@ -52280,10 +52280,10 @@ index 39bc0530cecd54ae8c3a5481c92f1a6a18a4d9c5..cb0a06888a919879155fea2a689c1bae
if (m_deinterlace && interlace_method != VS_INTERLACEMETHOD_NONE)
{
From ebd0a42fa87037a9cf90eeb0d6b8187d787a866a Mon Sep 17 00:00:00 2001
From 8305dec169baacde92f6d2ca4f791d3f281fa67d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 17 Feb 2017 17:58:13 +0000
Subject: [PATCH 67/68] ffmpeg: Update hevc optimisation to use the gpu service
Subject: [PATCH 67/71] ffmpeg: Update hevc optimisation to use the gpu service
---
project/cmake/modules/FindFFMPEG.cmake | 14 +-
@ -105595,10 +105595,10 @@ index e172ebf157aebffe1ae50b4a2b25fd71bc708c93..852815d5f4ae80771c5304f6f3520b5e
++
++
From 7b463eb51346ae788f1f12bb89f8cf2102c14241 Mon Sep 17 00:00:00 2001
From e6a8a101454e409fd2b6c61324d26252541b6d29 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 4 Mar 2017 19:25:40 +0000
Subject: [PATCH 68/68] ffmpeg: Call get_format to fix an issue with MMAL
Subject: [PATCH 68/71] ffmpeg: Call get_format to fix an issue with MMAL
rendering
---
@ -105719,3 +105719,167 @@ index 3d970429012c1f3aede4df0545ced5006c165d50..e070d96fc340f5bff94d72ae9004c4a9
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
./configure --prefix=$FFMPEG_PREFIX \
From 63c5c8ffa14cc3869411b7ba30198362c7a070d1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Mar 2017 22:52:37 +0000
Subject: [PATCH 69/71] MMAL: Remove periodic prime calls and handle from
buffer destructor
If a number of buffers are released at once we can end up stalled in GetPicture with the buffers
not having a chance to be returned to decoder
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 ++++--
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 4 ++++
.../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 9 ++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
index dca872373080156100618d58d9782e2461fa2648..22d594cdc217f32f820e3618b4d90a1d75fc769b 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -78,7 +78,11 @@ CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr<CMMALPool> p
CMMALVideoBuffer::~CMMALVideoBuffer()
{
if (mmal_buffer)
+ {
mmal_buffer_header_release(mmal_buffer);
+ if (m_pool)
+ m_pool->Prime();
+ }
if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
}
@@ -639,8 +643,6 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
send_eos = false;
m_got_eos = true;
}
- if (m_pool)
- m_pool->Prime();
while (1)
{
if (pData || send_eos)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
index c0b3f19f2ef9cdef9adf00cf81154803b12feb4f..f9b7172c45d5a0158259ebfb53ea75696f0acb6d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp
@@ -86,7 +86,11 @@ CMMALYUVBuffer::~CMMALYUVBuffer()
m_pool->ReleaseBuffer(gmem);
gmem = nullptr;
if (mmal_buffer)
+ {
mmal_buffer_header_release(mmal_buffer);
+ if (m_pool)
+ m_pool->Prime();
+ }
}
//-----------------------------------------------------------------------------
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
index 9279966fa634f6f5a3e00f12dd528337392cf038..c6ba9b024b3c3bbe53d3f0870dd8c839fe992c68 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -247,6 +247,8 @@ void CMMALPool::Prime()
if (!m_mmal_pool || !m_component)
return;
MMAL_PORT_T *port = m_input ? m_component->input[0] : m_component->output[0];
+ if (!port->is_enabled)
+ return;
while (omvb = GetBuffer(0), omvb)
{
if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
@@ -526,7 +528,6 @@ void CMMALRenderer::Run()
CLog::Log(LOGDEBUG, "%s::%s - starting", CLASSNAME, __func__);
while (1)
{
- bool prime = false;
MMAL_BUFFER_HEADER_T *buffer = mmal_queue_wait(m_queue_process);
assert(buffer);
if (buffer == &m_quitpacket)
@@ -657,10 +658,6 @@ void CMMALRenderer::Run()
}
}
}
- else
- {
- prime = true;
- }
break;
}
default: assert(0); break;
@@ -679,8 +676,6 @@ void CMMALRenderer::Run()
mmal_buffer_header_release(buffer);
}
}
- if (prime && m_deint_output_pool)
- m_deint_output_pool->Prime();
}
CLog::Log(LOGDEBUG, "%s::%s - stopping", CLASSNAME, __func__);
}
From 4ce3f65bb006dfa4b8d49b58b257728848a9e8dd Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Mar 2017 23:22:43 +0000
Subject: [PATCH 70/71] MMALCodec: Include a timeout of GetPicture in default
debug logging
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
index 22d594cdc217f32f820e3618b4d90a1d75fc769b..e8bc3b930e84e058460b6cfd7caca0d7d81b464f 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp
@@ -731,7 +731,7 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
}
}
- if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+ if (!ret || g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - ret(%x) pics(%d) inputs(%d) slept(%2d) queued(%.2f) (%.2f:%.2f) full(%d) flags(%x) preroll(%d) eos(%d %d/%d)", CLASSNAME, __func__, ret, m_output_ready.size(), mmal_queue_length(m_dec_input_pool->queue), 500-delay.MillisLeft(), queued*1e-6, m_demuxerPts*1e-6, m_decoderPts*1e-6, full, m_codecControlFlags, m_preroll, m_got_eos, m_packet_num, m_packet_num_eos);
return ret;
From 472ede7c96085b80de6779bebd0bbd3482c3b02d Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 21 Mar 2017 20:15:55 +0000
Subject: [PATCH 71/71] ffmpeg: Add calls to init and deinit gpu service
---
tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
index 852815d5f4ae80771c5304f6f3520b5e49b18a67..b4c15b782a4deb36c35a006e8547ce69665a10fe 100644
--- a/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
+++ b/tools/depends/target/ffmpeg/pfcd_hevc_optimisations.patch
@@ -11559,10 +11559,10 @@ index 0000000..5898102
+#endif
diff --git a/libavcodec/rpi_qpu.c b/libavcodec/rpi_qpu.c
new file mode 100644
-index 0000000..a01c051
+index 0000000..365f4a6
--- /dev/null
+++ b/libavcodec/rpi_qpu.c
-@@ -0,0 +1,991 @@
+@@ -0,0 +1,993 @@
+#ifdef RPI
+// Use vchiq service for submitting jobs
+#define GPUSERVICE
@@ -11707,6 +11707,7 @@ index 0000000..a01c051
+ if (qpu_enable(mb, 1)) return -2;
+#endif
+ vcsm_init();
++ vc_gpuserv_init();
+ gpu_malloc_uncached_internal(sizeof(struct GPU), &gpu_mem_ptr, mb);
+ ptr = (volatile struct GPU*)gpu_mem_ptr.arm;
+ memset((void*)ptr, 0, sizeof *ptr);
@@ -11941,6 +11942,7 @@ index 0000000..a01c051
+ qpu_enable(mb, 0);
+ gpu_free_internal(&gpu_mem_ptr);
+
++ vc_gpuserv_deinit();
+ vcsm_exit();
+
+ mbox_close(mb);