projects/RPi*/patches/kodi: update RPi support patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-05-14 14:04:50 +02:00
parent 934ca1cf66
commit 92e2de8c3b
2 changed files with 198 additions and 504 deletions

View File

@ -1,7 +1,7 @@
From f68b3816564aa0c29d0da419bdfd854a7b15d68b Mon Sep 17 00:00:00 2001
From f17026a0716e664cec67410c7cca1c085577f795 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Apr 2014 18:19:32 +0100
Subject: [PATCH 02/61] [rbp/omxplayer] When opening a stream don't try to
Subject: [PATCH 01/46] [rbp/omxplayer] When opening a stream don't try to
update gui so often
---
@ -25,10 +25,10 @@ index 2faceea..889d7a2 100644
g_windowManager.ProcessRenderLoop(false);
if (allowCancel && dialog->IsCanceled())
From 7a7fc569a12d489520142ddb39dedbb6982466d5 Mon Sep 17 00:00:00 2001
From 85821ef29eb1f965e1da208de3d7a6d000b60599 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 29 Apr 2014 15:23:22 +0100
Subject: [PATCH 03/61] [ffmpeg] Speed up wtv index creation
Subject: [PATCH 02/46] [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.
@ -114,10 +114,10 @@ index 0000000..4ac5636
+ }
+ }
From 7b6da2b187ac78022c09d9428a1041d33aa9777e Mon Sep 17 00:00:00 2001
From 59408a700e1818ad9d2379fd5e3796d3c9351b6f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 8 Mar 2014 15:36:06 +0000
Subject: [PATCH 04/61] [hifiberry] Hack: force it to be recognised as IEC958
Subject: [PATCH 03/46] [hifiberry] Hack: force it to be recognised as IEC958
capable to enable passthrough options
---
@ -140,10 +140,10 @@ index e22db7a..0120bd5 100644
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{
From 877979729163728264ccf1d9d4044cf7871bf85d Mon Sep 17 00:00:00 2001
From b6bcbc583d86c79fba02769c27c0dc8d712ce28f 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/61] Improved file buffering in CArchive
Subject: [PATCH 04/46] 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
@ -203,10 +203,10 @@ index 6ed0f8f..8506d95 100644
}
else
From ed0c376577971a2b7dab4770d6914bb631b86d34 Mon Sep 17 00:00:00 2001
From 72bf22e22624a3c358ae0327f2aa5d038fa84c18 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 12 Aug 2014 00:31:36 +0100
Subject: [PATCH 06/61] [omxcodec] Don't force software codec with dvds
Subject: [PATCH 05/46] [omxcodec] Don't force software codec with dvds
---
xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 ++
@ -227,10 +227,10 @@ index 34e487f..eb5d4de 100644
else if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
{
From 15a146068f22ac23146c6bd832c9e89f041a8f3c Mon Sep 17 00:00:00 2001
From 64bcab29b809b922bd6b5691a37dbf543bee234f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 10 Aug 2014 16:45:16 +0100
Subject: [PATCH 07/61] filesystem: Make support of browsing into archives
Subject: [PATCH 06/46] 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.
@ -248,7 +248,7 @@ We'll let people who don't use archives disable it manually
3 files changed, 18 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 85df475..13b736e 100644
index 6a6f0a3..7f5b860 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16504,6 +16504,15 @@ msgstr ""
@ -313,10 +313,10 @@ index 3a5ba4e..f1f6f79 100644
{ // XBMC Smart playlist - just XML renamed to XSP
// read the name of the playlist in
From ded5fd595dc852491d8f595e8358680f7bb97a6f Mon Sep 17 00:00:00 2001
From 0b2dac86eb9d2e577964d3029fe5ef0895546c7b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 13:06:57 +0000
Subject: [PATCH 09/61] [rbp] Make cachemembuffersize default depend on memory
Subject: [PATCH 08/46] [rbp] Make cachemembuffersize default depend on memory
size
---
@ -419,10 +419,10 @@ index 1ba951d..2d906a6 100644
From ec6bf6a43c0c0680d393dc5039fbb57927a7c10f Mon Sep 17 00:00:00 2001
From c9f83749f598d076ecaacc9b06e5e9c382b882de Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 30 May 2014 14:58:43 +0100
Subject: [PATCH 11/61] [settings] Experiment: Report DESKTOP resolution in
Subject: [PATCH 10/46] [settings] Experiment: Report DESKTOP resolution in
video settings
---
@ -444,10 +444,10 @@ index 1fafd9a..e0288aa 100644
StringUtils::Format("%dx%d%s", resolution->width, resolution->height,
ModeFlagsToString(resolution->flags, false).c_str()),
From 390b641d3904777dba820aa4633a94314386e081 Mon Sep 17 00:00:00 2001
From 8b8db47ad621845fd0a7b216e06566ae6a679d78 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 9 Sep 2014 12:04:26 +0100
Subject: [PATCH 12/61] egl: Treat unknown display aspect ratio as square pixel
Subject: [PATCH 11/46] egl: Treat unknown display aspect ratio as square pixel
---
xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 4 ++--
@ -476,10 +476,10 @@ index bda7430..68fc647 100644
SetResolutionString(m_desktopRes);
From ca1037188ea1d60c22b13ab937d21401d4397218 Mon Sep 17 00:00:00 2001
From 6e788e583103df7e1f91a870a448e850d96270fa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 19 Sep 2014 11:54:49 +0100
Subject: [PATCH 13/61] [dvdplayer/rbp] Add pi specific option to maintain
Subject: [PATCH 12/46] [dvdplayer/rbp] Add pi specific option to maintain
vsync with pll adjustment
New A/V sync option in settings/video/playback to do "Adjust PLL".
@ -504,7 +504,7 @@ Needed updated firmware
9 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 13b736e..07a25d3 100644
index 7f5b860..4f9900b 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -6318,7 +6318,22 @@ msgctxt "#13459"
@ -771,10 +771,10 @@ index 7df1bf7..732b69d 100644
float m_audioPlayCountMinimumPercent;
bool m_dvdplayerIgnoreDTSinWAV;
From 8c5c342953abc427f0c0fe8548ce9c6c4c67d08d Mon Sep 17 00:00:00 2001
From 62301da2bdb6484355e35bac591042996c03706b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 27 Sep 2014 15:32:37 +0100
Subject: [PATCH 14/61] [dvdplayer] exerimental: don't raise priority of audio
Subject: [PATCH 13/46] [dvdplayer] exerimental: don't raise priority of audio
thread
---
@ -798,10 +798,10 @@ index eb5d4de..5ea3c51 100644
}
From 66c3e2d5829fac98b54059a4d82e33ec33537b0d Mon Sep 17 00:00:00 2001
From 8798611e2115fad6a08608f2e8e1b66c4fdb70df Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 24 Sep 2014 23:13:52 +0100
Subject: [PATCH 15/61] [audio] Add settings option to boost centre channel
Subject: [PATCH 14/46] [audio] Add settings option to boost centre channel
when downmixing
This allows a dB volume increase to be added to centre channel.
@ -819,7 +819,7 @@ Should work with Pi Sink (dvdplayer/paplayer) and omxplayer
5 files changed, 45 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 07a25d3..7d445f9 100644
index 4f9900b..01aec24 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16572,3 +16572,17 @@ msgctxt "#38006"
@ -923,72 +923,10 @@ index f99c0e6..1911189 100644
// stereo upmix
if (upmix && m_src_channels == 2 && m_dst_channels > 2)
From 9832febb10d609a6e75465b3d82e681252686566 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 3 Oct 2014 18:40:06 +0100
Subject: [PATCH 16/61] [SinkPi] Handle multichannel layout more like OMXAudio
---
xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
index a7691e8..d72a97a 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
@@ -94,9 +94,9 @@ static void SetAudioProps(bool stream_channels, uint32_t channel_map)
CLog::Log(LOGDEBUG, "%s:%s hdmi_stream_channels %d hdmi_channel_map %08x", CLASSNAME, __func__, stream_channels, channel_map);
}
-static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
+static uint32_t GetChannelMap(const CAEChannelInfo &channelLayout, bool passthrough)
{
- unsigned int channels = format.m_channelLayout.Count();
+ unsigned int channels = channelLayout.Count();
uint32_t channel_map = 0;
if (passthrough)
return 0;
@@ -135,12 +135,12 @@ static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
// According to CEA-861-D only RL and RR are known. In case of a format having SL and SR channels
// but no BR BL channels, we use the wide map in order to open only the num of channels really
// needed.
- if (format.m_channelLayout.HasChannel(AE_CH_BL) && !format.m_channelLayout.HasChannel(AE_CH_SL))
+ if (channelLayout.HasChannel(AE_CH_BL) && !channelLayout.HasChannel(AE_CH_SL))
map = map_back;
for (unsigned int i = 0; i < channels; ++i)
{
- AEChannel c = format.m_channelLayout[i];
+ AEChannel c = channelLayout[i];
unsigned int chan = 0;
if ((unsigned int)c < sizeof map_normal / sizeof *map_normal)
chan = map[(unsigned int)c];
@@ -171,9 +171,9 @@ static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
0xff, // 7
0x13, // 7.1
};
- uint8_t cea = format.m_channelLayout.HasChannel(AE_CH_LFE) ? cea_map_lfe[channels] : cea_map[channels];
+ uint8_t cea = channelLayout.HasChannel(AE_CH_LFE) ? cea_map_lfe[channels] : cea_map[channels];
if (cea == 0xff)
- CLog::Log(LOGERROR, "%s::%s - Unexpected CEA mapping %d,%d", CLASSNAME, __func__, format.m_channelLayout.HasChannel(AE_CH_LFE), channels);
+ CLog::Log(LOGERROR, "%s::%s - Unexpected CEA mapping %d,%d", CLASSNAME, __func__, channelLayout.HasChannel(AE_CH_LFE), channels);
channel_map |= cea << 24;
@@ -215,7 +215,7 @@ bool CAESinkPi::Initialize(AEAudioFormat &format, std::string &device)
format.m_frames = format.m_sampleRate * AUDIO_PLAYBUFFER / NUM_OMX_BUFFERS;
format.m_frameSamples = format.m_frames * channels;
- SetAudioProps(m_passthrough, GetChannelMap(format, m_passthrough));
+ SetAudioProps(m_passthrough, GetChannelMap(format.m_channelLayout, m_passthrough));
m_format = format;
m_sinkbuffer_sec_per_byte = 1.0 / (double)(m_format.m_frameSize * m_format.m_sampleRate);
From d8fae79683f81ead870a5abac67da826e935183c Mon Sep 17 00:00:00 2001
From 2e75b4ea90615800cdbe7a97bbbdf2ae4324235f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 15:23:51 +0000
Subject: [PATCH 17/61] [rbp] Default extract thumbnails to false
Subject: [PATCH 15/46] [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
@ -1018,10 +956,10 @@ index 50fe36a..a54a4c4 100644
<section id="system">
From 1326d4272c2e881b3a154256e6825c181b6ee3ad Mon Sep 17 00:00:00 2001
From cc9c7a136be1dede7c4f00b93f8502f570f9b4b5 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 15 Nov 2014 12:03:34 +0000
Subject: [PATCH 22/61] [dvdplayer] Add lock for player creation
Subject: [PATCH 20/46] [dvdplayer] Add lock for player creation
---
xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 +++
@ -1067,10 +1005,10 @@ index 71a62f1..9993ac0 100644
+ CCriticalSection m_players_lock;
};
From f9b5ced2edadf501b4655a82788eaea620f6e4ed Mon Sep 17 00:00:00 2001
From 32563b7971f5706e8ae130f241aad81ec150a424 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 24 Nov 2014 22:07:25 +0000
Subject: [PATCH 23/61] [dvdplayervideo] Prod decoder when in stills mode
Subject: [PATCH 21/46] [dvdplayervideo] Prod decoder when in stills mode
An asynchronous hardware decoder doesn't only produce output pictures when new packets arrive.
In dvd stills mode give it a chance to return pictures that weren't ready when frame was decoded.
@ -1079,7 +1017,7 @@ In dvd stills mode give it a chance to return pictures that weren't ready when f
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index d725d32..55fa8b1 100644
index 0ee9794..745434f 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -314,7 +314,8 @@ void CDVDPlayerVideo::Process()
@ -1147,10 +1085,10 @@ index d725d32..55fa8b1 100644
if (pMsg->IsType(CDVDMsg::GENERAL_SYNCHRONIZE))
From 36666ba4c6dd8a03f0b0c0055bb5238f4e8920e2 Mon Sep 17 00:00:00 2001
From 3a208d26081720a6972222c776cad359da37fddf Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 27 Nov 2014 16:31:56 +0000
Subject: [PATCH 24/61] [languageinvoker] Reduce priority of python threads
Subject: [PATCH 22/46] [languageinvoker] Reduce priority of python threads
---
xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@ -1173,10 +1111,10 @@ index fcdd063..16f0c89 100644
}
From fc7285cbd4934c80ed8ec948ba0762d20ada7138 Mon Sep 17 00:00:00 2001
From b9a3c75dc9dd756c74d860cc3c51d9618a4e5905 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 14 Dec 2013 16:55:05 +0000
Subject: [PATCH 25/61] logging: Add microsecond timer to log messages
Subject: [PATCH 23/46] logging: Add microsecond timer to log messages
---
xbmc/utils/log.cpp | 17 +++++++++++++++--
@ -1229,10 +1167,10 @@ index 3443f12..31c4a99 100644
levelNames[logLevel]) + strData;
From adb7882f273437d58e9aff7c26c11ab1a8d32a73 Mon Sep 17 00:00:00 2001
From c4a64e29a101272659850d16c6e94239b40fdfaa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 29 Nov 2014 15:25:16 +0000
Subject: [PATCH 26/61] [rbp] hack: wait for splash to complete before changing
Subject: [PATCH 24/46] [rbp] hack: wait for splash to complete before changing
hdmi mode
---
@ -1306,20 +1244,19 @@ index 68fc647..c80114e 100644
if(!m_fixedMode && GETFLAGS_GROUP(res.dwFlags) && GETFLAGS_MODE(res.dwFlags))
From c727022054334a0f10585d36adbe9bb7814b0b82 Mon Sep 17 00:00:00 2001
From 0a3dde2f516974c4837af1990a1865412ee64dca Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 11 Dec 2014 17:00:57 +0000
Subject: [PATCH 27/61] Fix for UI not showing both extractflags and
Subject: [PATCH 25/46] Fix for UI not showing both extractflags and
extractthumb
---
addons/resource.language.en_gb/resources/strings.po | 11 ++++++++---
system/settings/rbp.xml | 4 ----
system/settings/settings.xml | 10 +++++-----
3 files changed, 13 insertions(+), 12 deletions(-)
system/settings/settings.xml | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index c52f230..aee20d0 100644
index f13a578a..45c53a1 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -10945,7 +10945,7 @@ msgstr ""
@ -1344,8 +1281,8 @@ index c52f230..aee20d0 100644
#. Description of setting "Videos -> File lists -> Extract thumbnails and video information" with label #20433
#: system/settings/settings.xml
msgctxt "#36180"
-msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in Library Mode."
+msgid "Extract thumbnails, to display in Library Mode."
-msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in library Mode."
+msgid "Extract thumbnails, to display in library Mode."
msgstr ""
#: system/settings/settings.xml
@ -1358,59 +1295,26 @@ index c52f230..aee20d0 100644
+msgctxt "#38103"
+msgid "Extract thumbnails from video files"
+msgstr ""
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index a54a4c4..208cd49 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -33,10 +33,6 @@
<setting id="myvideos.extractchapterthumbs">
<default>false</default>
</setting>
- </group>
- </category>
- <category id="myvideos">
- <group id="1">
<setting id="myvideos.extractflags">
<default>false</default>
</setting>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 2aaf772..08d8f41 100644
index 2aaf772..d19b63b 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -846,23 +846,23 @@
</constraints>
<control type="list" format="string" />
</setting>
- <setting id="myvideos.extractflags" type="boolean" label="20433" help="36178">
+ <setting id="myvideos.extractchapterthumbs" type="boolean" label="37044" help="37045">
<level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.extractchapterthumbs" type="boolean" label="37044" help="37045">
+ <setting id="myvideos.extractflags" type="boolean" label="20433" help="36178">
<level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.replacelabels" type="boolean" label="20419" help="36179">
+ <setting id="myvideos.extractthumb" type="boolean" label="38103" help="36180">
<level>1</level>
@@ -861,8 +861,8 @@
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.extractthumb" type="boolean" label="20433" help="36180">
- <level>4</level>
+ <setting id="myvideos.replacelabels" type="boolean" label="20419" help="36179">
+ <setting id="myvideos.extractthumb" type="boolean" label="38103" help="36180">
+ <level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
From 5c10acd7538646333db2b57f87e4bf8faa1c2c19 Mon Sep 17 00:00:00 2001
From ba3452b115b308c1cb04ab4e0658f7553fac7f28 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Thu, 11 Sep 2014 21:30:43 +0200
Subject: [PATCH 28/61] Disable autoscrolling while on screensaver and while
Subject: [PATCH 26/46] Disable autoscrolling while on screensaver and while
opening streams.
---
@ -1541,10 +1445,10 @@ index 0d5b3f7..6d23024 100644
if (m_lastRenderTime)
m_autoScrollDelayTime += currentTime - m_lastRenderTime;
From 796877858489b061853455e99cebd3131e76acf3 Mon Sep 17 00:00:00 2001
From 51d804bf14ea3a64a8c2359bec5d70f48203146b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 13 Dec 2014 18:35:20 +0000
Subject: [PATCH 29/61] [demuxer] Avoid memcpy on every demuxer packet
Subject: [PATCH 27/46] [demuxer] Avoid memcpy on every demuxer packet
Avoids an unnecessary memcpy on every demuxer packet which for
high bitrate videos can be significant.
@ -1639,17 +1543,17 @@ index ab298b2..10c5ee0 100644
}
catch(...) {
From 5c9736a99bc81334fd7aedf28578392c7780fb1a Mon Sep 17 00:00:00 2001
From 8e67b7a09c1b8a2861a22c4135a9bdd4b0cb64d9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 15 Feb 2015 14:06:12 +0000
Subject: [PATCH 30/61] [mmal] Allow mmal codec for dvd stills
Subject: [PATCH 28/46] [mmal] Allow mmal codec for dvd stills
---
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index eafabb3..8a3beb7 100644
index 4c363cf..b90237b 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -50,6 +50,9 @@
@ -1674,10 +1578,10 @@ index eafabb3..8a3beb7 100644
{
// If dvd is an mpeg2 and hint.stills
From 0b367aae0fae2d797055a20dd70949207659220f Mon Sep 17 00:00:00 2001
From 7dd0b05e89a348a4388b88e121d960b351f3f0f7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 31 Mar 2015 17:31:47 +0100
Subject: [PATCH 42/61] [mmalrenderer] Add SetCodecControl function and prefer
Subject: [PATCH 29/46] [mmalrenderer] Add SetCodecControl function and prefer
to return pictures when renderer is low (disabled)
---
@ -1686,7 +1590,7 @@ Subject: [PATCH 42/61] [mmalrenderer] Add SetCodecControl function and prefer
2 files changed, 15 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
index 27fa9c4..a2510be 100644
index 95584aa..c37f321 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
@@ -124,6 +124,7 @@ CMMALVideo::CMMALVideo()
@ -1697,7 +1601,7 @@ index 27fa9c4..a2510be 100644
}
CMMALVideo::~CMMALVideo()
@@ -864,6 +865,9 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
@@ -865,6 +866,9 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - got output picture:%d", CLASSNAME, __func__, m_output_ready.size());
ret |= VC_PICTURE;
@ -1707,7 +1611,7 @@ index 27fa9c4..a2510be 100644
}
if (!ret)
{
@@ -942,6 +946,7 @@ void CMMALVideo::Reset(void)
@@ -943,6 +947,7 @@ void CMMALVideo::Reset(void)
m_startframe = false;
m_decoderPts = DVD_NOPTS_VALUE;
m_preroll = !m_hints.stills && (m_speed == DVD_PLAYSPEED_NORMAL || m_speed == DVD_PLAYSPEED_PAUSE);
@ -1715,7 +1619,7 @@ index 27fa9c4..a2510be 100644
}
void CMMALVideo::SetSpeed(int iSpeed)
@@ -1057,3 +1062,11 @@ bool CMMALVideo::GetCodecStats(double &pts, int &droppedPics)
@@ -1058,3 +1063,11 @@ bool CMMALVideo::GetCodecStats(double &pts, int &droppedPics)
droppedPics= -1;
return false;
}
@ -1748,67 +1652,10 @@ index 51a64d1..bde8c06 100644
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_dec;
From 7ec37cce302f39ca91ba8bc86be80e7e1d7368c5 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 Apr 2015 16:31:37 +0100
Subject: [PATCH 43/61] [mmalcodec] Limit submitted video frames. Seems to
avoid stutter issues with low bitrate videos
---
xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
index a2510be..c37f321 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
@@ -848,10 +848,11 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
break;
}
int ret = 0;
- if (mmal_queue_length(m_dec_input_pool->queue) > 0 && !m_demux_queue_length)
+ double queued = m_decoderPts != DVD_NOPTS_VALUE && pts != DVD_NOPTS_VALUE ? pts - m_decoderPts : 0.0;
+ if (mmal_queue_length(m_dec_input_pool->queue) > 0 && !m_demux_queue_length && queued <= DVD_MSEC_TO_TIME(500))
{
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s - got space for output: demux_queue(%d) space(%d)", CLASSNAME, __func__, m_demux_queue_length, mmal_queue_length(m_dec_input_pool->queue) * m_dec_input->buffer_size);
+ CLog::Log(LOGDEBUG, "%s::%s - got space for output: demux_queue(%d) space(%d) queued(%.2f)", CLASSNAME, __func__, m_demux_queue_length, mmal_queue_length(m_dec_input_pool->queue) * m_dec_input->buffer_size, queued*1e-6);
ret |= VC_BUFFER;
}
else
From 959ec414be56d1d4ca4774508069d350c61a83e9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 24 Feb 2015 15:57:29 +0000
Subject: [PATCH 44/61] [mmalrenderer] Fix for stereo view modes
PR6090 (dirty regions for video) meant that RenderUpate is no longer called with the expected stereo view mode.
So, just explicitly set this before calling ManageDisplay to get the desired rectangles
---
xbmc/cores/VideoRenderers/MMALRenderer.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index fc9dfca..f1e3252 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -366,7 +366,11 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
if (!m_bConfigured) return;
+ if (g_graphicsContext.GetStereoMode())
+ g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_LEFT);
ManageDisplay();
+ if (g_graphicsContext.GetStereoMode())
+ g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_OFF);
// if running bypass, then the player might need the src/dst rects
// for sizing video playback on a layer other than the gles layer.
From c755cacee4346e3a55cd337d85630471fe6ef309 Mon Sep 17 00:00:00 2001
From e9a8202fb531b900516de5097f914c45263f3240 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Wed, 25 Feb 2015 18:22:21 +0100
Subject: [PATCH 45/61] Load OSD dialogs on startup.
Subject: [PATCH 30/46] 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.
@ -1903,10 +1750,10 @@ index 4940561..f52698c 100644
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
{ }
From b54cf11f709c406dfaafdab2703d1c111d0b61b8 Mon Sep 17 00:00:00 2001
From d5c88ba1e2c64edce20da757de03b4f0384e8ee0 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 7 Mar 2015 22:46:21 +0000
Subject: [PATCH 46/61] configure: Add raspberry-pi2 platform
Subject: [PATCH 31/46] configure: Add raspberry-pi2 platform
---
configure.ac | 14 +++++++--
@ -2080,10 +1927,10 @@ index cdc2fe4..379bd1d 100644
set(CMAKE_SYSTEM_NAME Linux)
endif()
From eded2ce0900d7837f4e451d5b58bc02153ce1e79 Mon Sep 17 00:00:00 2001
From a7596d440853b686fa1642f2d7145d703c5fbf13 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 16 Apr 2014 21:18:06 +0100
Subject: [PATCH 47/61] [omxplayer] Don't propagate 3d flags based on supported
Subject: [PATCH 32/46] [omxplayer] Don't propagate 3d flags based on supported
3d modes
---
@ -2139,10 +1986,10 @@ index 212a89b..dd509ea 100644
unsigned int iDisplayHeight = height;
From 98545b6d99c3ab0d9c2b55931cbae5e45b68411c Mon Sep 17 00:00:00 2001
From ec9055a468af481957e7235d9069aa5351ce8f60 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 17 Apr 2014 13:01:51 +0100
Subject: [PATCH 48/61] [graphics] Allow switching to a more suitable 3D
Subject: [PATCH 33/46] [graphics] Allow switching to a more suitable 3D
resolution
---
@ -2228,10 +2075,10 @@ index 5c1501a..aba11cd 100644
void ResetOverscan(RESOLUTION_INFO &resinfo);
void ResetScreenParameters(RESOLUTION res);
From 6376797042cac6d4c821c850e4569ccf66c03ebb Mon Sep 17 00:00:00 2001
From c8c63fe779125e1d0e7e3f9bfe10b7c87dd441ee Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 17 Apr 2014 13:38:55 +0100
Subject: [PATCH 49/61] [3D] Support switching to 3D resolutions
Subject: [PATCH 34/46] [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.
@ -2313,10 +2160,10 @@ index 4345c0f..cc5dc60 100644
return current;
}
From 1ca60872dbd7c116d44a2f9a49d5cc704e5193e2 Mon Sep 17 00:00:00 2001
From ed709cfbc3e199d02da6df87a968e1beb300696e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 23 Apr 2014 00:05:07 +0100
Subject: [PATCH 50/61] [graphics] Make pixel ratio for 3d modes consistent
Subject: [PATCH 35/46] [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.
@ -2519,10 +2366,10 @@ index c80114e..80c05d2 100644
AddUniqueResolution(res2, resolutions);
From 322614f99f49aea527c75d9573e245da12cfbade Mon Sep 17 00:00:00 2001
From a3399a5f109a7eeccb2cc9ed40d5e7eb5e825a64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 10 Mar 2015 17:05:18 +0000
Subject: [PATCH 51/61] [players] Add settings option to enable MVC support
Subject: [PATCH 36/46] [players] Add settings option to enable MVC support
---
addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++
@ -2532,7 +2379,7 @@ Subject: [PATCH 51/61] [players] Add settings option to enable MVC support
4 files changed, 27 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index aee20d0..3d6b660 100644
index 45c53a1..7778bc7 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16602,6 +16602,16 @@ msgctxt "#38052"
@ -2553,7 +2400,7 @@ index aee20d0..3d6b660 100644
msgctxt "#38103"
msgid "Extract thumbnails from video files"
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 208cd49..6357b1d 100644
index a54a4c4..31a6bcc 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -27,6 +27,13 @@
@ -2603,10 +2450,10 @@ index e4f6d86..5d324f4 100644
case AV_CODEC_ID_MPEG4:
// (role name) video_decoder.mpeg4
From 9fed5fcd6c6c2150ba465abc04fb7776cb878b03 Mon Sep 17 00:00:00 2001
From 79726f4d255bb265accc9a7e6f47e24475bc0db7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 14 Mar 2015 12:38:08 +0000
Subject: [PATCH 52/61] [mmalrenderer] Switch to using transform flags for 3d
Subject: [PATCH 37/46] [mmalrenderer] Switch to using transform flags for 3d
modes
---
@ -2620,7 +2467,7 @@ Subject: [PATCH 52/61] [mmalrenderer] Switch to using transform flags for 3d
7 files changed, 75 insertions(+), 130 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 3d6b660..eeb6d0a 100644
index 7778bc7..c7a1f43 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16612,6 +16612,16 @@ msgctxt "#38111"
@ -2641,7 +2488,7 @@ index 3d6b660..eeb6d0a 100644
msgctxt "#38103"
msgid "Extract thumbnails from video files"
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 6357b1d..77e983b 100644
index 31a6bcc..b5af261 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -33,6 +33,14 @@
@ -2660,7 +2507,7 @@ index 6357b1d..77e983b 100644
</category>
<category id="myvideos">
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index f1e3252..8ffcf23 100644
index 9f1f803..6cde0c5 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -366,11 +366,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
@ -2986,10 +2833,10 @@ index 80c05d2..ae85484 100644
m_width, m_height, dst_rect.width, dst_rect.height, res.fRefreshRate, GETFLAGS_GROUP(res.dwFlags), GETFLAGS_MODE(res.dwFlags), (int)res.dwFlags, res.fPixelRatio);
From 1935fc178acf61dacda8f982802e4f326390dba5 Mon Sep 17 00:00:00 2001
From 76cd4ab8e288b007647e3a0a98ce9161c0398c76 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 17 Mar 2015 20:33:54 +0000
Subject: [PATCH 53/61] alsa: enable-shared is required
Subject: [PATCH 38/46] alsa: enable-shared is required
---
tools/depends/target/alsa-lib/Makefile | 2 +-
@ -3009,11 +2856,10 @@ index b03fc19..a04d933 100644
LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
From 1d7052cf03293af8a4247348ae72b8ca07731a9f Mon Sep 17 00:00:00 2001
From a0a42be2f87e29adbc34da07b737bd935b496749 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Apr 2015 20:51:14 +0100
Subject: [PATCH 56/61] [gui] Also limit GUI updates when in non full-screen
Subject: [PATCH 41/46] [gui] Also limit GUI updates when in non full-screen
video mode
---
@ -3043,10 +2889,10 @@ index 9c6496b..01a711e 100644
g_windowManager.FrameMove();
}
From 0768d7332735c93b675a7553c2f50988e10218cd Mon Sep 17 00:00:00 2001
From fa49e68e233dd0e205c6b8f3fa1ef6c4c9dc7f64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 21 Apr 2015 14:32:07 +0100
Subject: [PATCH 57/61] [mmalrenderer] Add sharpness control
Subject: [PATCH 42/46] [mmalrenderer] Add sharpness control
---
addons/resource.language.en_gb/resources/strings.po | 2 +-
@ -3055,20 +2901,20 @@ Subject: [PATCH 57/61] [mmalrenderer] Add sharpness control
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index d8ffaf4..474ffef 100644
index bc6b417..8fb37a3 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -7474,7 +7474,7 @@ msgstr ""
#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
msgctxt "#16313"
-msgid "(VDPAU)Sharpness"
-msgid "VDPAU - Sharpness"
+msgid "Sharpness"
msgstr ""
#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index 8ffcf23..67daa9e 100644
index 6cde0c5..9bf1aed 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -207,6 +207,7 @@ CMMALRenderer::CMMALRenderer()
@ -3118,17 +2964,17 @@ index 1404fb3..9bced7e 100644
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_vout;
From bbc34ab2aff74da8ce3ba13dd6937ea5f00f1844 Mon Sep 17 00:00:00 2001
From 49730d43c565241b2b1703e007f2b0c2e173a188 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 24 Apr 2015 13:49:51 +0100
Subject: [PATCH 58/61] [dvdplayer] Add back required include
Subject: [PATCH 43/46] [dvdplayer] Add back required include
---
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index 55fa8b1..23edcd6 100644
index 745434f..0fac9b1 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -33,6 +33,7 @@
@ -3140,10 +2986,10 @@ index 55fa8b1..23edcd6 100644
#include "guilib/GraphicContext.h"
#include <sstream>
From 93943251b2afa14881cd57ba1cc7a1b917e007b9 Mon Sep 17 00:00:00 2001
From 225c4fae8a948ef4f8c58ea475adff277017e313 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 May 2015 23:58:06 +0100
Subject: [PATCH 60/61] [screensaver] Leave GUI contents available for
Subject: [PATCH 45/46] [screensaver] Leave GUI contents available for
screensaver
---
@ -3172,3 +3018,4 @@ index a22fb74..eb35710 100644
g_infoManager.SetNextWindow(WINDOW_INVALID);
// Add window to the history list (we must do this before we activate it,

View File

@ -1,7 +1,7 @@
From f68b3816564aa0c29d0da419bdfd854a7b15d68b Mon Sep 17 00:00:00 2001
From f17026a0716e664cec67410c7cca1c085577f795 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 7 Apr 2014 18:19:32 +0100
Subject: [PATCH 02/61] [rbp/omxplayer] When opening a stream don't try to
Subject: [PATCH 01/46] [rbp/omxplayer] When opening a stream don't try to
update gui so often
---
@ -25,10 +25,10 @@ index 2faceea..889d7a2 100644
g_windowManager.ProcessRenderLoop(false);
if (allowCancel && dialog->IsCanceled())
From 7a7fc569a12d489520142ddb39dedbb6982466d5 Mon Sep 17 00:00:00 2001
From 85821ef29eb1f965e1da208de3d7a6d000b60599 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 29 Apr 2014 15:23:22 +0100
Subject: [PATCH 03/61] [ffmpeg] Speed up wtv index creation
Subject: [PATCH 02/46] [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.
@ -114,10 +114,10 @@ index 0000000..4ac5636
+ }
+ }
From 7b6da2b187ac78022c09d9428a1041d33aa9777e Mon Sep 17 00:00:00 2001
From 59408a700e1818ad9d2379fd5e3796d3c9351b6f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 8 Mar 2014 15:36:06 +0000
Subject: [PATCH 04/61] [hifiberry] Hack: force it to be recognised as IEC958
Subject: [PATCH 03/46] [hifiberry] Hack: force it to be recognised as IEC958
capable to enable passthrough options
---
@ -140,10 +140,10 @@ index e22db7a..0120bd5 100644
info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI")
{
From 877979729163728264ccf1d9d4044cf7871bf85d Mon Sep 17 00:00:00 2001
From b6bcbc583d86c79fba02769c27c0dc8d712ce28f 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/61] Improved file buffering in CArchive
Subject: [PATCH 04/46] 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
@ -203,10 +203,10 @@ index 6ed0f8f..8506d95 100644
}
else
From ed0c376577971a2b7dab4770d6914bb631b86d34 Mon Sep 17 00:00:00 2001
From 72bf22e22624a3c358ae0327f2aa5d038fa84c18 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 12 Aug 2014 00:31:36 +0100
Subject: [PATCH 06/61] [omxcodec] Don't force software codec with dvds
Subject: [PATCH 05/46] [omxcodec] Don't force software codec with dvds
---
xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 ++
@ -227,10 +227,10 @@ index 34e487f..eb5d4de 100644
else if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
{
From 15a146068f22ac23146c6bd832c9e89f041a8f3c Mon Sep 17 00:00:00 2001
From 64bcab29b809b922bd6b5691a37dbf543bee234f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 10 Aug 2014 16:45:16 +0100
Subject: [PATCH 07/61] filesystem: Make support of browsing into archives
Subject: [PATCH 06/46] 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.
@ -248,7 +248,7 @@ We'll let people who don't use archives disable it manually
3 files changed, 18 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 85df475..13b736e 100644
index 6a6f0a3..7f5b860 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16504,6 +16504,15 @@ msgstr ""
@ -313,10 +313,10 @@ index 3a5ba4e..f1f6f79 100644
{ // XBMC Smart playlist - just XML renamed to XSP
// read the name of the playlist in
From ded5fd595dc852491d8f595e8358680f7bb97a6f Mon Sep 17 00:00:00 2001
From 0b2dac86eb9d2e577964d3029fe5ef0895546c7b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 13:06:57 +0000
Subject: [PATCH 09/61] [rbp] Make cachemembuffersize default depend on memory
Subject: [PATCH 08/46] [rbp] Make cachemembuffersize default depend on memory
size
---
@ -419,10 +419,10 @@ index 1ba951d..2d906a6 100644
From ec6bf6a43c0c0680d393dc5039fbb57927a7c10f Mon Sep 17 00:00:00 2001
From c9f83749f598d076ecaacc9b06e5e9c382b882de Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 30 May 2014 14:58:43 +0100
Subject: [PATCH 11/61] [settings] Experiment: Report DESKTOP resolution in
Subject: [PATCH 10/46] [settings] Experiment: Report DESKTOP resolution in
video settings
---
@ -444,10 +444,10 @@ index 1fafd9a..e0288aa 100644
StringUtils::Format("%dx%d%s", resolution->width, resolution->height,
ModeFlagsToString(resolution->flags, false).c_str()),
From 390b641d3904777dba820aa4633a94314386e081 Mon Sep 17 00:00:00 2001
From 8b8db47ad621845fd0a7b216e06566ae6a679d78 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 9 Sep 2014 12:04:26 +0100
Subject: [PATCH 12/61] egl: Treat unknown display aspect ratio as square pixel
Subject: [PATCH 11/46] egl: Treat unknown display aspect ratio as square pixel
---
xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp | 4 ++--
@ -476,10 +476,10 @@ index bda7430..68fc647 100644
SetResolutionString(m_desktopRes);
From ca1037188ea1d60c22b13ab937d21401d4397218 Mon Sep 17 00:00:00 2001
From 6e788e583103df7e1f91a870a448e850d96270fa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 19 Sep 2014 11:54:49 +0100
Subject: [PATCH 13/61] [dvdplayer/rbp] Add pi specific option to maintain
Subject: [PATCH 12/46] [dvdplayer/rbp] Add pi specific option to maintain
vsync with pll adjustment
New A/V sync option in settings/video/playback to do "Adjust PLL".
@ -504,7 +504,7 @@ Needed updated firmware
9 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 13b736e..07a25d3 100644
index 7f5b860..4f9900b 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -6318,7 +6318,22 @@ msgctxt "#13459"
@ -771,10 +771,10 @@ index 7df1bf7..732b69d 100644
float m_audioPlayCountMinimumPercent;
bool m_dvdplayerIgnoreDTSinWAV;
From 8c5c342953abc427f0c0fe8548ce9c6c4c67d08d Mon Sep 17 00:00:00 2001
From 62301da2bdb6484355e35bac591042996c03706b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 27 Sep 2014 15:32:37 +0100
Subject: [PATCH 14/61] [dvdplayer] exerimental: don't raise priority of audio
Subject: [PATCH 13/46] [dvdplayer] exerimental: don't raise priority of audio
thread
---
@ -798,10 +798,10 @@ index eb5d4de..5ea3c51 100644
}
From 66c3e2d5829fac98b54059a4d82e33ec33537b0d Mon Sep 17 00:00:00 2001
From 8798611e2115fad6a08608f2e8e1b66c4fdb70df Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 24 Sep 2014 23:13:52 +0100
Subject: [PATCH 15/61] [audio] Add settings option to boost centre channel
Subject: [PATCH 14/46] [audio] Add settings option to boost centre channel
when downmixing
This allows a dB volume increase to be added to centre channel.
@ -819,7 +819,7 @@ Should work with Pi Sink (dvdplayer/paplayer) and omxplayer
5 files changed, 45 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 07a25d3..7d445f9 100644
index 4f9900b..01aec24 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16572,3 +16572,17 @@ msgctxt "#38006"
@ -923,72 +923,10 @@ index f99c0e6..1911189 100644
// stereo upmix
if (upmix && m_src_channels == 2 && m_dst_channels > 2)
From 9832febb10d609a6e75465b3d82e681252686566 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 3 Oct 2014 18:40:06 +0100
Subject: [PATCH 16/61] [SinkPi] Handle multichannel layout more like OMXAudio
---
xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
index a7691e8..d72a97a 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp
@@ -94,9 +94,9 @@ static void SetAudioProps(bool stream_channels, uint32_t channel_map)
CLog::Log(LOGDEBUG, "%s:%s hdmi_stream_channels %d hdmi_channel_map %08x", CLASSNAME, __func__, stream_channels, channel_map);
}
-static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
+static uint32_t GetChannelMap(const CAEChannelInfo &channelLayout, bool passthrough)
{
- unsigned int channels = format.m_channelLayout.Count();
+ unsigned int channels = channelLayout.Count();
uint32_t channel_map = 0;
if (passthrough)
return 0;
@@ -135,12 +135,12 @@ static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
// According to CEA-861-D only RL and RR are known. In case of a format having SL and SR channels
// but no BR BL channels, we use the wide map in order to open only the num of channels really
// needed.
- if (format.m_channelLayout.HasChannel(AE_CH_BL) && !format.m_channelLayout.HasChannel(AE_CH_SL))
+ if (channelLayout.HasChannel(AE_CH_BL) && !channelLayout.HasChannel(AE_CH_SL))
map = map_back;
for (unsigned int i = 0; i < channels; ++i)
{
- AEChannel c = format.m_channelLayout[i];
+ AEChannel c = channelLayout[i];
unsigned int chan = 0;
if ((unsigned int)c < sizeof map_normal / sizeof *map_normal)
chan = map[(unsigned int)c];
@@ -171,9 +171,9 @@ static uint32_t GetChannelMap(AEAudioFormat &format, bool passthrough)
0xff, // 7
0x13, // 7.1
};
- uint8_t cea = format.m_channelLayout.HasChannel(AE_CH_LFE) ? cea_map_lfe[channels] : cea_map[channels];
+ uint8_t cea = channelLayout.HasChannel(AE_CH_LFE) ? cea_map_lfe[channels] : cea_map[channels];
if (cea == 0xff)
- CLog::Log(LOGERROR, "%s::%s - Unexpected CEA mapping %d,%d", CLASSNAME, __func__, format.m_channelLayout.HasChannel(AE_CH_LFE), channels);
+ CLog::Log(LOGERROR, "%s::%s - Unexpected CEA mapping %d,%d", CLASSNAME, __func__, channelLayout.HasChannel(AE_CH_LFE), channels);
channel_map |= cea << 24;
@@ -215,7 +215,7 @@ bool CAESinkPi::Initialize(AEAudioFormat &format, std::string &device)
format.m_frames = format.m_sampleRate * AUDIO_PLAYBUFFER / NUM_OMX_BUFFERS;
format.m_frameSamples = format.m_frames * channels;
- SetAudioProps(m_passthrough, GetChannelMap(format, m_passthrough));
+ SetAudioProps(m_passthrough, GetChannelMap(format.m_channelLayout, m_passthrough));
m_format = format;
m_sinkbuffer_sec_per_byte = 1.0 / (double)(m_format.m_frameSize * m_format.m_sampleRate);
From d8fae79683f81ead870a5abac67da826e935183c Mon Sep 17 00:00:00 2001
From 2e75b4ea90615800cdbe7a97bbbdf2ae4324235f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 27 Oct 2014 15:23:51 +0000
Subject: [PATCH 17/61] [rbp] Default extract thumbnails to false
Subject: [PATCH 15/46] [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
@ -1018,10 +956,10 @@ index 50fe36a..a54a4c4 100644
<section id="system">
From 1326d4272c2e881b3a154256e6825c181b6ee3ad Mon Sep 17 00:00:00 2001
From cc9c7a136be1dede7c4f00b93f8502f570f9b4b5 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 15 Nov 2014 12:03:34 +0000
Subject: [PATCH 22/61] [dvdplayer] Add lock for player creation
Subject: [PATCH 20/46] [dvdplayer] Add lock for player creation
---
xbmc/cores/dvdplayer/DVDPlayer.cpp | 3 +++
@ -1067,10 +1005,10 @@ index 71a62f1..9993ac0 100644
+ CCriticalSection m_players_lock;
};
From f9b5ced2edadf501b4655a82788eaea620f6e4ed Mon Sep 17 00:00:00 2001
From 32563b7971f5706e8ae130f241aad81ec150a424 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 24 Nov 2014 22:07:25 +0000
Subject: [PATCH 23/61] [dvdplayervideo] Prod decoder when in stills mode
Subject: [PATCH 21/46] [dvdplayervideo] Prod decoder when in stills mode
An asynchronous hardware decoder doesn't only produce output pictures when new packets arrive.
In dvd stills mode give it a chance to return pictures that weren't ready when frame was decoded.
@ -1079,7 +1017,7 @@ In dvd stills mode give it a chance to return pictures that weren't ready when f
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index d725d32..55fa8b1 100644
index 0ee9794..745434f 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -314,7 +314,8 @@ void CDVDPlayerVideo::Process()
@ -1147,10 +1085,10 @@ index d725d32..55fa8b1 100644
if (pMsg->IsType(CDVDMsg::GENERAL_SYNCHRONIZE))
From 36666ba4c6dd8a03f0b0c0055bb5238f4e8920e2 Mon Sep 17 00:00:00 2001
From 3a208d26081720a6972222c776cad359da37fddf Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 27 Nov 2014 16:31:56 +0000
Subject: [PATCH 24/61] [languageinvoker] Reduce priority of python threads
Subject: [PATCH 22/46] [languageinvoker] Reduce priority of python threads
---
xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++
@ -1173,10 +1111,10 @@ index fcdd063..16f0c89 100644
}
From fc7285cbd4934c80ed8ec948ba0762d20ada7138 Mon Sep 17 00:00:00 2001
From b9a3c75dc9dd756c74d860cc3c51d9618a4e5905 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 14 Dec 2013 16:55:05 +0000
Subject: [PATCH 25/61] logging: Add microsecond timer to log messages
Subject: [PATCH 23/46] logging: Add microsecond timer to log messages
---
xbmc/utils/log.cpp | 17 +++++++++++++++--
@ -1229,10 +1167,10 @@ index 3443f12..31c4a99 100644
levelNames[logLevel]) + strData;
From adb7882f273437d58e9aff7c26c11ab1a8d32a73 Mon Sep 17 00:00:00 2001
From c4a64e29a101272659850d16c6e94239b40fdfaa Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 29 Nov 2014 15:25:16 +0000
Subject: [PATCH 26/61] [rbp] hack: wait for splash to complete before changing
Subject: [PATCH 24/46] [rbp] hack: wait for splash to complete before changing
hdmi mode
---
@ -1306,20 +1244,19 @@ index 68fc647..c80114e 100644
if(!m_fixedMode && GETFLAGS_GROUP(res.dwFlags) && GETFLAGS_MODE(res.dwFlags))
From c727022054334a0f10585d36adbe9bb7814b0b82 Mon Sep 17 00:00:00 2001
From 0a3dde2f516974c4837af1990a1865412ee64dca Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 11 Dec 2014 17:00:57 +0000
Subject: [PATCH 27/61] Fix for UI not showing both extractflags and
Subject: [PATCH 25/46] Fix for UI not showing both extractflags and
extractthumb
---
addons/resource.language.en_gb/resources/strings.po | 11 ++++++++---
system/settings/rbp.xml | 4 ----
system/settings/settings.xml | 10 +++++-----
3 files changed, 13 insertions(+), 12 deletions(-)
system/settings/settings.xml | 4 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index c52f230..aee20d0 100644
index f13a578a..45c53a1 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -10945,7 +10945,7 @@ msgstr ""
@ -1344,8 +1281,8 @@ index c52f230..aee20d0 100644
#. Description of setting "Videos -> File lists -> Extract thumbnails and video information" with label #20433
#: system/settings/settings.xml
msgctxt "#36180"
-msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in Library Mode."
+msgid "Extract thumbnails, to display in Library Mode."
-msgid "Extract thumbnails and information, such as codecs and aspect ratio, to display in library Mode."
+msgid "Extract thumbnails, to display in library Mode."
msgstr ""
#: system/settings/settings.xml
@ -1358,59 +1295,26 @@ index c52f230..aee20d0 100644
+msgctxt "#38103"
+msgid "Extract thumbnails from video files"
+msgstr ""
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index a54a4c4..208cd49 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -33,10 +33,6 @@
<setting id="myvideos.extractchapterthumbs">
<default>false</default>
</setting>
- </group>
- </category>
- <category id="myvideos">
- <group id="1">
<setting id="myvideos.extractflags">
<default>false</default>
</setting>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 2aaf772..08d8f41 100644
index 2aaf772..d19b63b 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -846,23 +846,23 @@
</constraints>
<control type="list" format="string" />
</setting>
- <setting id="myvideos.extractflags" type="boolean" label="20433" help="36178">
+ <setting id="myvideos.extractchapterthumbs" type="boolean" label="37044" help="37045">
<level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.extractchapterthumbs" type="boolean" label="37044" help="37045">
+ <setting id="myvideos.extractflags" type="boolean" label="20433" help="36178">
<level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.replacelabels" type="boolean" label="20419" help="36179">
+ <setting id="myvideos.extractthumb" type="boolean" label="38103" help="36180">
<level>1</level>
@@ -861,8 +861,8 @@
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="myvideos.extractthumb" type="boolean" label="20433" help="36180">
- <level>4</level>
+ <setting id="myvideos.replacelabels" type="boolean" label="20419" help="36179">
+ <setting id="myvideos.extractthumb" type="boolean" label="38103" help="36180">
+ <level>1</level>
<default>true</default>
<control type="toggle" />
</setting>
From 5c10acd7538646333db2b57f87e4bf8faa1c2c19 Mon Sep 17 00:00:00 2001
From ba3452b115b308c1cb04ab4e0658f7553fac7f28 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Thu, 11 Sep 2014 21:30:43 +0200
Subject: [PATCH 28/61] Disable autoscrolling while on screensaver and while
Subject: [PATCH 26/46] Disable autoscrolling while on screensaver and while
opening streams.
---
@ -1541,10 +1445,10 @@ index 0d5b3f7..6d23024 100644
if (m_lastRenderTime)
m_autoScrollDelayTime += currentTime - m_lastRenderTime;
From 796877858489b061853455e99cebd3131e76acf3 Mon Sep 17 00:00:00 2001
From 51d804bf14ea3a64a8c2359bec5d70f48203146b Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 13 Dec 2014 18:35:20 +0000
Subject: [PATCH 29/61] [demuxer] Avoid memcpy on every demuxer packet
Subject: [PATCH 27/46] [demuxer] Avoid memcpy on every demuxer packet
Avoids an unnecessary memcpy on every demuxer packet which for
high bitrate videos can be significant.
@ -1639,17 +1543,17 @@ index ab298b2..10c5ee0 100644
}
catch(...) {
From 5c9736a99bc81334fd7aedf28578392c7780fb1a Mon Sep 17 00:00:00 2001
From 8e67b7a09c1b8a2861a22c4135a9bdd4b0cb64d9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 15 Feb 2015 14:06:12 +0000
Subject: [PATCH 30/61] [mmal] Allow mmal codec for dvd stills
Subject: [PATCH 28/46] [mmal] Allow mmal codec for dvd stills
---
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index eafabb3..8a3beb7 100644
index 4c363cf..b90237b 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -50,6 +50,9 @@
@ -1674,10 +1578,10 @@ index eafabb3..8a3beb7 100644
{
// If dvd is an mpeg2 and hint.stills
From 0b367aae0fae2d797055a20dd70949207659220f Mon Sep 17 00:00:00 2001
From 7dd0b05e89a348a4388b88e121d960b351f3f0f7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 31 Mar 2015 17:31:47 +0100
Subject: [PATCH 42/61] [mmalrenderer] Add SetCodecControl function and prefer
Subject: [PATCH 29/46] [mmalrenderer] Add SetCodecControl function and prefer
to return pictures when renderer is low (disabled)
---
@ -1686,7 +1590,7 @@ Subject: [PATCH 42/61] [mmalrenderer] Add SetCodecControl function and prefer
2 files changed, 15 insertions(+)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
index 27fa9c4..a2510be 100644
index 95584aa..c37f321 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
@@ -124,6 +124,7 @@ CMMALVideo::CMMALVideo()
@ -1697,7 +1601,7 @@ index 27fa9c4..a2510be 100644
}
CMMALVideo::~CMMALVideo()
@@ -864,6 +865,9 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
@@ -865,6 +866,9 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
CLog::Log(LOGDEBUG, "%s::%s - got output picture:%d", CLASSNAME, __func__, m_output_ready.size());
ret |= VC_PICTURE;
@ -1707,7 +1611,7 @@ index 27fa9c4..a2510be 100644
}
if (!ret)
{
@@ -942,6 +946,7 @@ void CMMALVideo::Reset(void)
@@ -943,6 +947,7 @@ void CMMALVideo::Reset(void)
m_startframe = false;
m_decoderPts = DVD_NOPTS_VALUE;
m_preroll = !m_hints.stills && (m_speed == DVD_PLAYSPEED_NORMAL || m_speed == DVD_PLAYSPEED_PAUSE);
@ -1715,7 +1619,7 @@ index 27fa9c4..a2510be 100644
}
void CMMALVideo::SetSpeed(int iSpeed)
@@ -1057,3 +1062,11 @@ bool CMMALVideo::GetCodecStats(double &pts, int &droppedPics)
@@ -1058,3 +1063,11 @@ bool CMMALVideo::GetCodecStats(double &pts, int &droppedPics)
droppedPics= -1;
return false;
}
@ -1748,67 +1652,10 @@ index 51a64d1..bde8c06 100644
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_dec;
From 7ec37cce302f39ca91ba8bc86be80e7e1d7368c5 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 Apr 2015 16:31:37 +0100
Subject: [PATCH 43/61] [mmalcodec] Limit submitted video frames. Seems to
avoid stutter issues with low bitrate videos
---
xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
index a2510be..c37f321 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
@@ -848,10 +848,11 @@ int CMMALVideo::Decode(uint8_t* pData, int iSize, double dts, double pts)
break;
}
int ret = 0;
- if (mmal_queue_length(m_dec_input_pool->queue) > 0 && !m_demux_queue_length)
+ double queued = m_decoderPts != DVD_NOPTS_VALUE && pts != DVD_NOPTS_VALUE ? pts - m_decoderPts : 0.0;
+ if (mmal_queue_length(m_dec_input_pool->queue) > 0 && !m_demux_queue_length && queued <= DVD_MSEC_TO_TIME(500))
{
if (g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s - got space for output: demux_queue(%d) space(%d)", CLASSNAME, __func__, m_demux_queue_length, mmal_queue_length(m_dec_input_pool->queue) * m_dec_input->buffer_size);
+ CLog::Log(LOGDEBUG, "%s::%s - got space for output: demux_queue(%d) space(%d) queued(%.2f)", CLASSNAME, __func__, m_demux_queue_length, mmal_queue_length(m_dec_input_pool->queue) * m_dec_input->buffer_size, queued*1e-6);
ret |= VC_BUFFER;
}
else
From 959ec414be56d1d4ca4774508069d350c61a83e9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 24 Feb 2015 15:57:29 +0000
Subject: [PATCH 44/61] [mmalrenderer] Fix for stereo view modes
PR6090 (dirty regions for video) meant that RenderUpate is no longer called with the expected stereo view mode.
So, just explicitly set this before calling ManageDisplay to get the desired rectangles
---
xbmc/cores/VideoRenderers/MMALRenderer.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index fc9dfca..f1e3252 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -366,7 +366,11 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
if (!m_bConfigured) return;
+ if (g_graphicsContext.GetStereoMode())
+ g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_LEFT);
ManageDisplay();
+ if (g_graphicsContext.GetStereoMode())
+ g_graphicsContext.SetStereoView(RENDER_STEREO_VIEW_OFF);
// if running bypass, then the player might need the src/dst rects
// for sizing video playback on a layer other than the gles layer.
From c755cacee4346e3a55cd337d85630471fe6ef309 Mon Sep 17 00:00:00 2001
From e9a8202fb531b900516de5097f914c45263f3240 Mon Sep 17 00:00:00 2001
From: anaconda <anaconda@menakite.eu>
Date: Wed, 25 Feb 2015 18:22:21 +0100
Subject: [PATCH 45/61] Load OSD dialogs on startup.
Subject: [PATCH 30/46] 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.
@ -1903,10 +1750,10 @@ index 4940561..f52698c 100644
CGUIDialogVideoSettings::~CGUIDialogVideoSettings()
{ }
From b54cf11f709c406dfaafdab2703d1c111d0b61b8 Mon Sep 17 00:00:00 2001
From d5c88ba1e2c64edce20da757de03b4f0384e8ee0 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 7 Mar 2015 22:46:21 +0000
Subject: [PATCH 46/61] configure: Add raspberry-pi2 platform
Subject: [PATCH 31/46] configure: Add raspberry-pi2 platform
---
configure.ac | 14 +++++++--
@ -2080,10 +1927,10 @@ index cdc2fe4..379bd1d 100644
set(CMAKE_SYSTEM_NAME Linux)
endif()
From eded2ce0900d7837f4e451d5b58bc02153ce1e79 Mon Sep 17 00:00:00 2001
From a7596d440853b686fa1642f2d7145d703c5fbf13 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 16 Apr 2014 21:18:06 +0100
Subject: [PATCH 47/61] [omxplayer] Don't propagate 3d flags based on supported
Subject: [PATCH 32/46] [omxplayer] Don't propagate 3d flags based on supported
3d modes
---
@ -2139,10 +1986,10 @@ index 212a89b..dd509ea 100644
unsigned int iDisplayHeight = height;
From 98545b6d99c3ab0d9c2b55931cbae5e45b68411c Mon Sep 17 00:00:00 2001
From ec9055a468af481957e7235d9069aa5351ce8f60 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 17 Apr 2014 13:01:51 +0100
Subject: [PATCH 48/61] [graphics] Allow switching to a more suitable 3D
Subject: [PATCH 33/46] [graphics] Allow switching to a more suitable 3D
resolution
---
@ -2228,10 +2075,10 @@ index 5c1501a..aba11cd 100644
void ResetOverscan(RESOLUTION_INFO &resinfo);
void ResetScreenParameters(RESOLUTION res);
From 6376797042cac6d4c821c850e4569ccf66c03ebb Mon Sep 17 00:00:00 2001
From c8c63fe779125e1d0e7e3f9bfe10b7c87dd441ee Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Thu, 17 Apr 2014 13:38:55 +0100
Subject: [PATCH 49/61] [3D] Support switching to 3D resolutions
Subject: [PATCH 34/46] [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.
@ -2313,10 +2160,10 @@ index 4345c0f..cc5dc60 100644
return current;
}
From 1ca60872dbd7c116d44a2f9a49d5cc704e5193e2 Mon Sep 17 00:00:00 2001
From ed709cfbc3e199d02da6df87a968e1beb300696e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 23 Apr 2014 00:05:07 +0100
Subject: [PATCH 50/61] [graphics] Make pixel ratio for 3d modes consistent
Subject: [PATCH 35/46] [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.
@ -2519,10 +2366,10 @@ index c80114e..80c05d2 100644
AddUniqueResolution(res2, resolutions);
From 322614f99f49aea527c75d9573e245da12cfbade Mon Sep 17 00:00:00 2001
From a3399a5f109a7eeccb2cc9ed40d5e7eb5e825a64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 10 Mar 2015 17:05:18 +0000
Subject: [PATCH 51/61] [players] Add settings option to enable MVC support
Subject: [PATCH 36/46] [players] Add settings option to enable MVC support
---
addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++
@ -2532,7 +2379,7 @@ Subject: [PATCH 51/61] [players] Add settings option to enable MVC support
4 files changed, 27 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index aee20d0..3d6b660 100644
index 45c53a1..7778bc7 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16602,6 +16602,16 @@ msgctxt "#38052"
@ -2553,7 +2400,7 @@ index aee20d0..3d6b660 100644
msgctxt "#38103"
msgid "Extract thumbnails from video files"
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 208cd49..6357b1d 100644
index a54a4c4..31a6bcc 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -27,6 +27,13 @@
@ -2603,10 +2450,10 @@ index e4f6d86..5d324f4 100644
case AV_CODEC_ID_MPEG4:
// (role name) video_decoder.mpeg4
From 9fed5fcd6c6c2150ba465abc04fb7776cb878b03 Mon Sep 17 00:00:00 2001
From 79726f4d255bb265accc9a7e6f47e24475bc0db7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sat, 14 Mar 2015 12:38:08 +0000
Subject: [PATCH 52/61] [mmalrenderer] Switch to using transform flags for 3d
Subject: [PATCH 37/46] [mmalrenderer] Switch to using transform flags for 3d
modes
---
@ -2620,7 +2467,7 @@ Subject: [PATCH 52/61] [mmalrenderer] Switch to using transform flags for 3d
7 files changed, 75 insertions(+), 130 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 3d6b660..eeb6d0a 100644
index 7778bc7..c7a1f43 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16612,6 +16612,16 @@ msgctxt "#38111"
@ -2641,7 +2488,7 @@ index 3d6b660..eeb6d0a 100644
msgctxt "#38103"
msgid "Extract thumbnails from video files"
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 6357b1d..77e983b 100644
index 31a6bcc..b5af261 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -33,6 +33,14 @@
@ -2660,7 +2507,7 @@ index 6357b1d..77e983b 100644
</category>
<category id="myvideos">
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index f1e3252..8ffcf23 100644
index 9f1f803..6cde0c5 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -366,11 +366,7 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
@ -2986,10 +2833,10 @@ index 80c05d2..ae85484 100644
m_width, m_height, dst_rect.width, dst_rect.height, res.fRefreshRate, GETFLAGS_GROUP(res.dwFlags), GETFLAGS_MODE(res.dwFlags), (int)res.dwFlags, res.fPixelRatio);
From 1935fc178acf61dacda8f982802e4f326390dba5 Mon Sep 17 00:00:00 2001
From 76cd4ab8e288b007647e3a0a98ce9161c0398c76 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 17 Mar 2015 20:33:54 +0000
Subject: [PATCH 53/61] alsa: enable-shared is required
Subject: [PATCH 38/46] alsa: enable-shared is required
---
tools/depends/target/alsa-lib/Makefile | 2 +-
@ -3009,11 +2856,10 @@ index b03fc19..a04d933 100644
LIBDYLIB=$(PLATFORM)/src/.libs/$(LIBNAME).a
From 1d7052cf03293af8a4247348ae72b8ca07731a9f Mon Sep 17 00:00:00 2001
From a0a42be2f87e29adbc34da07b737bd935b496749 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 14 Apr 2015 20:51:14 +0100
Subject: [PATCH 56/61] [gui] Also limit GUI updates when in non full-screen
Subject: [PATCH 41/46] [gui] Also limit GUI updates when in non full-screen
video mode
---
@ -3043,10 +2889,10 @@ index 9c6496b..01a711e 100644
g_windowManager.FrameMove();
}
From 0768d7332735c93b675a7553c2f50988e10218cd Mon Sep 17 00:00:00 2001
From fa49e68e233dd0e205c6b8f3fa1ef6c4c9dc7f64 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 21 Apr 2015 14:32:07 +0100
Subject: [PATCH 57/61] [mmalrenderer] Add sharpness control
Subject: [PATCH 42/46] [mmalrenderer] Add sharpness control
---
addons/resource.language.en_gb/resources/strings.po | 2 +-
@ -3055,20 +2901,20 @@ Subject: [PATCH 57/61] [mmalrenderer] Add sharpness control
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index d8ffaf4..474ffef 100644
index bc6b417..8fb37a3 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -7474,7 +7474,7 @@ msgstr ""
#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
msgctxt "#16313"
-msgid "(VDPAU)Sharpness"
-msgid "VDPAU - Sharpness"
+msgid "Sharpness"
msgstr ""
#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
diff --git a/xbmc/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
index 8ffcf23..67daa9e 100644
index 6cde0c5..9bf1aed 100644
--- a/xbmc/cores/VideoRenderers/MMALRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/MMALRenderer.cpp
@@ -207,6 +207,7 @@ CMMALRenderer::CMMALRenderer()
@ -3118,17 +2964,17 @@ index 1404fb3..9bced7e 100644
CCriticalSection m_sharedSection;
MMAL_COMPONENT_T *m_vout;
From bbc34ab2aff74da8ce3ba13dd6937ea5f00f1844 Mon Sep 17 00:00:00 2001
From 49730d43c565241b2b1703e007f2b0c2e173a188 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 24 Apr 2015 13:49:51 +0100
Subject: [PATCH 58/61] [dvdplayer] Add back required include
Subject: [PATCH 43/46] [dvdplayer] Add back required include
---
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index 55fa8b1..23edcd6 100644
index 745434f..0fac9b1 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -33,6 +33,7 @@
@ -3140,10 +2986,10 @@ index 55fa8b1..23edcd6 100644
#include "guilib/GraphicContext.h"
#include <sstream>
From 93943251b2afa14881cd57ba1cc7a1b917e007b9 Mon Sep 17 00:00:00 2001
From 225c4fae8a948ef4f8c58ea475adff277017e313 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 May 2015 23:58:06 +0100
Subject: [PATCH 60/61] [screensaver] Leave GUI contents available for
Subject: [PATCH 45/46] [screensaver] Leave GUI contents available for
screensaver
---
@ -3172,3 +3018,4 @@ index a22fb74..eb35710 100644
g_infoManager.SetNextWindow(WINDOW_INVALID);
// Add window to the history list (we must do this before we activate it,