diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 6db49055c2..0152e206d7 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="f5446ba" +PKG_VERSION="3845593" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index bc8c5b9b2f..1008f87d5e 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="inputstream.adaptive" -PKG_VERSION="a347296" +PKG_VERSION="aa0d511" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/liberty-developer/inputstream.adaptive/archive/$PKG_VERSION.tar.gz" diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index de62d196d6..97fc9b8825 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="peripheral.joystick" -PKG_VERSION="110ddb7" +PKG_VERSION="0c47f0e" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk index 89fe4640cc..aa33970d60 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.dvblink" -PKG_VERSION="418962c" +PKG_VERSION="63cf195" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk index 540a35c4ea..0d8ec32181 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.mythtv" -PKG_VERSION="18fe56e" +PKG_VERSION="a3e4a50" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk index 1c8782f6a0..3ac8ff23de 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.vdr.vnsi" -PKG_VERSION="9659c8c" +PKG_VERSION="960f2d3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk index c7c4c63236..e7acb8a2f6 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="visualization.projectm" -PKG_VERSION="c5a86e9" +PKG_VERSION="5450aa2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index cd4adb329c..8163cb9f3a 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="da07d20" +PKG_VERSION="fc1619b" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.1009-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1009-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch new file mode 100644 index 0000000000..37b53e8fb6 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-99.1009-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch @@ -0,0 +1,55 @@ +From 7adc8f706efab65d8d7e5f960690faca3d5c190d Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Sat, 4 Mar 2017 19:24:02 +0000 +Subject: [PATCH] ffmpeg: Call get_format to fix an issue with MMAL rendering + +--- + libavcodec/dvdec.c | 7 +++++++ + libavcodec/rv34.c | 6 +++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c +index 0b4c1bc..00081ef 100644 +--- a/libavcodec/dvdec.c ++++ b/libavcodec/dvdec.c +@@ -49,6 +49,7 @@ + #include "internal.h" + #include "put_bits.h" + #include "simple_idct.h" ++#include "thread.h" + + typedef struct BlockInfo { + const uint32_t *factor_table; +@@ -196,6 +197,12 @@ static av_cold int dvvideo_decode_init(AVCodecContext *avctx) + s->idct_put[0] = idsp.idct_put; + s->idct_put[1] = ff_simple_idct248_put; + ++ static const enum AVPixelFormat pix_fmts[] = { ++ AV_PIX_FMT_YUV420P, ++ AV_PIX_FMT_NONE ++ }; ++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); ++ + return ff_dvvideo_init(avctx); + } + +diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c +index aca8382..f473f6c 100644 +--- a/libavcodec/rv34.c ++++ b/libavcodec/rv34.c +@@ -1493,7 +1493,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) + ff_mpv_decode_init(s, avctx); + s->out_format = FMT_H263; + +- avctx->pix_fmt = AV_PIX_FMT_YUV420P; ++ static const enum AVPixelFormat pix_fmts[] = { ++ AV_PIX_FMT_YUV420P, ++ AV_PIX_FMT_NONE ++ }; ++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); + avctx->has_b_frames = 1; + s->low_delay = 0; + +-- +2.7.4 + diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 389654060b..ba3fe69d3a 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="f5446ba" +PKG_VERSION="3845593" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/RPi/patches/kodi/kodi-001-backport.patch b/projects/RPi/patches/kodi/kodi-001-backport.patch index 42910f0a13..8693d0abc3 100644 --- a/projects/RPi/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi/patches/kodi/kodi-001-backport.patch @@ -1,7 +1,91 @@ -From fb711d36229c80705b4a0a36ce2e120c3e1466fd Mon Sep 17 00:00:00 2001 +From ca8af64149c77c0fce5d240115afb91caa08a6a9 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 28 Oct 2014 00:19:40 +0000 +Subject: [PATCH 01/68] [cec] Add settings for configuring button repeats + +--- + addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ + system/peripherals.xml | 4 +++- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 16 ++++++++++++++++ + 3 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po +index e0060d1fae556de529274dbc6be07455701573a3..6443f3dd885bf0aa8e031039e36e273972a310ae 100644 +--- a/addons/resource.language.en_gb/resources/strings.po ++++ b/addons/resource.language.en_gb/resources/strings.po +@@ -19745,3 +19745,18 @@ msgstr "" + msgctxt "#39010" + msgid "Select sort method" + msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38050" ++msgid "Remote button press delay before repeating (ms)" ++msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38051" ++msgid "Remote button press repeat rate (ms)" ++msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38052" ++msgid "Remote button press release time (ms)" ++msgstr "" +diff --git a/system/peripherals.xml b/system/peripherals.xml +index d5704b249c3065b2980dc92c7c81dc7b384187bc..02b1a9ed6fce1986bd864bba09a9df0621f9e041 100644 +--- a/system/peripherals.xml ++++ b/system/peripherals.xml +@@ -31,7 +31,9 @@ + + + +- ++ ++ ++ + + + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index d032ffd707fee5eec035e90bdf618530f7215c37..30367a3fde956090afdca9930fa52e829f35046f 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1296,6 +1296,20 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu + m_configuration.bActivateSource = config.bActivateSource; + bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1); + ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) ++ m_configuration.iDoubleTapTimeout50Ms = config.iDoubleTapTimeout50Ms; ++ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeout50Ms * 50); ++#else ++ m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs; ++ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs); ++#endif ++ ++ m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs; ++ bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs); ++ ++ m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs; ++ bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs); ++ + m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby; + + m_configuration.iFirmwareVersion = config.iFirmwareVersion; +@@ -1398,6 +1412,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + // backwards compatibility. will be removed once the next major release of libCEC is out + m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); + #endif ++ m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms"); ++ m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms"); + + if (GetSettingBool("pause_playback_on_deactivate")) + { + +From b551892df962870860845022b74db883f71d8094 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 02/67] [cec] Don't suspend pi on tv switch off - it can't wake +Subject: [PATCH 02/68] [cec] Don't suspend pi on tv switch off - it can't wake up --- @@ -22,10 +106,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325 -From 6b34039dc27c952fc5217ffc1f0e1fac49992bed Mon Sep 17 00:00:00 2001 +From 51342652317692c0547de6fd46ab406027caaeaf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 03/67] [rbp/omxplayer] When opening a stream don't try to +Subject: [PATCH 03/68] [rbp/omxplayer] When opening a stream don't try to update gui so often --- @@ -49,10 +133,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 4757e370bc4f5fc42f7191b893c2d806d6c76bbc Mon Sep 17 00:00:00 2001 +From 0b198a0ee941b51d9c384a0e86f4d6ba5b62990f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 -Subject: [PATCH 04/67] [hifiberry] Hack: force it to be recognised as IEC958 +Subject: [PATCH 04/68] [hifiberry] Hack: force it to be recognised as IEC958 capable to enable passthrough options --- @@ -75,10 +159,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From eec779f1dba335e11b9b30955f047fa432896b2f Mon Sep 17 00:00:00 2001 +From 20cfc448b8f0c17cc3a6d945473f538bb05232ba Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 05/67] Improved file buffering in CArchive +Subject: [PATCH 05/68] 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 +222,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 2ed4fa5cf7935b1e04d2e2aebd0f214047ed358f Mon Sep 17 00:00:00 2001 +From 7fd1cae524a13cb22fe4b77131672d19ef5f92b4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 06/67] filesystem: Make support of browsing into archives +Subject: [PATCH 06/68] 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 +335,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From dcebf738cde43680261a85a3385c728189b84cdb Mon Sep 17 00:00:00 2001 +From 35a10ad57387d4bef6ad79e05fd8f9f25ecf9142 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 07/67] [rbp] Make cachemembuffersize default depend on memory +Subject: [PATCH 07/68] [rbp] Make cachemembuffersize default depend on memory size --- @@ -318,7 +402,7 @@ index a35a509a91483f13e2cf0e688fc7e9528f254290..fffa5182126159f6dfcf750b21fa0464 void Deinitialize(); int GetArmMem() { return m_arm_mem; } diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 1c00edab33101b82a5817ac03c7f1d98007e1856..12ba1aca0ba838bd8d33e9ca1043845c10f90954 100644 +index 91574029c28c4fabacb4bc022aa028dcaf299adb..46d72aa072d34119f4a7273dc8f71176abebd27c 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -50,6 +50,9 @@ @@ -356,10 +440,10 @@ index 1c00edab33101b82a5817ac03c7f1d98007e1856..12ba1aca0ba838bd8d33e9ca1043845c } -From b3cfcae349f63dc41713cb9cd24707f02b0184d6 Mon Sep 17 00:00:00 2001 +From 7feb38888a4ee8ef04f761dd2573c2a46d195955 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 08/67] [settings] Experiment: Report DESKTOP resolution in +Subject: [PATCH 08/68] [settings] Experiment: Report DESKTOP resolution in video settings --- @@ -381,10 +465,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9 StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From 4a486ce217ef15870a9c23d6e0cbd2c69137100a Mon Sep 17 00:00:00 2001 +From a46d6e4c452c058760600eea4721a9d518484dcf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 09/67] [audio] Add settings option to boost centre channel +Subject: [PATCH 09/68] [audio] Add settings option to boost centre channel when downmixing This allows a dB volume increase to be added to centre channel. @@ -510,10 +594,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From d3125a94e433da8ead850dfa45ed1d6ded3f3148 Mon Sep 17 00:00:00 2001 +From 70c28bcf5c9e5ba3b1e3a1b91d1743341d591b9f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 10/67] [rbp] Default extract thumbnails to false +Subject: [PATCH 10/68] [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 +623,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From 2e4c872b8c0b795156f96918cb8a2d4e099b1d1e Mon Sep 17 00:00:00 2001 +From bbbe30844e691b9ae17241dd1a5aecaf90a22bd2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 11/67] [languageinvoker] Reduce priority of python threads +Subject: [PATCH 11/68] [languageinvoker] Reduce priority of python threads --- xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ @@ -565,10 +649,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From 97ce5209853a7f18a79e5d98893353a3bb52f3dd Mon Sep 17 00:00:00 2001 +From b89858ab1bdc803820d91c159fa7d2ac68d5b918 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 12/67] [rbp] hack: wait for splash to complete before changing +Subject: [PATCH 12/68] [rbp] hack: wait for splash to complete before changing hdmi mode --- @@ -652,10 +736,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From 70f0ff25bc73321491cc1ad85e3fbb5514dfdc16 Mon Sep 17 00:00:00 2001 +From 2e91585fb7ec92f9d6bb8d46ff7bc8e68c11a2c7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 13/67] Fix for UI not showing both extractflags and +Subject: [PATCH 13/68] Fix for UI not showing both extractflags and extractthumb --- @@ -718,10 +802,10 @@ index 5f1f3ca48342ef1a4eeed7432221d7b2dda354e8..2ed5fb217c6b9f63f28d760e2a2c00b2 -From a1f119e0986ee89641e533cbafae576147e5848d Mon Sep 17 00:00:00 2001 +From 5fc4c807a80cce1ab24353d04092ed5c576a781f Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 14/67] Disable autoscrolling while on screensaver and while +Subject: [PATCH 14/68] Disable autoscrolling while on screensaver and while opening streams. --- @@ -852,10 +936,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From 65ee3a30d6489b53126e6d34b01ed8c29a4920e5 Mon Sep 17 00:00:00 2001 +From 2d74aea7d35fa5cf43b9b52346430f6f8e68b56b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 15/67] [demuxer] Avoid memcpy on every demuxer packet +Subject: [PATCH 15/68] [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 +1039,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 66365771b22ae63d65bbb6df6f8d77d5a5dab33e Mon Sep 17 00:00:00 2001 +From 0101e6d27e57aebb4bf0b28d376dbe3f25e95c07 Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 16/67] Load OSD dialogs on startup. +Subject: [PATCH 16/68] 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 +1137,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 2c71f9b477cfd5ecb5cdedb6688502dc8cef8fa8 Mon Sep 17 00:00:00 2001 +From ff61d0493fbad70c4814c3533f5710f45ebae78f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 17/67] [gui] Also limit GUI updates when in non full-screen +Subject: [PATCH 17/68] [gui] Also limit GUI updates when in non full-screen video mode --- @@ -1086,10 +1170,10 @@ index fdf7b1dc04e31ffe8e1d1b83825343b24c645b02..513deb7f27846891fb875b9263ad4d61 g_windowManager.FrameMove(); } -From e0ee1d794615a8f4378801b55fe4c36e12d7aab5 Mon Sep 17 00:00:00 2001 +From fe1f769b0fcef97a4c99da0bd2ebd83520163307 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 18/67] [screensaver] Leave GUI contents available for +Subject: [PATCH 18/68] [screensaver] Leave GUI contents available for screensaver --- @@ -1119,10 +1203,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac // Add window to the history list (we must do this before we activate it, -From fb4c838814069e7178ecfde96cecf43ba76cf722 Mon Sep 17 00:00:00 2001 +From 3319b6d93724794d1c5f0171c448fd0089b4e8b7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 19/67] ffmpeg: Automatic switch to software decode for GMC +Subject: [PATCH 19/68] ffmpeg: Automatic switch to software decode for GMC with more than one warp point --- @@ -1350,10 +1434,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From acde728909548c939ae05ff179e461fdffda3e1b Mon Sep 17 00:00:00 2001 +From b2121b831c2b596eb98a3beb709762ba7f9ebcf2 Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 20/67] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer +Subject: [PATCH 20/68] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - fixes #15794 --- @@ -1545,10 +1629,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 79220cf49a616e2d1f18a6872323dc02521d4440 Mon Sep 17 00:00:00 2001 +From 88f06a06210729f8d903f2edf2f256483c35159d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 21/67] codecoverlay: Include codec name in overlay +Subject: [PATCH 21/68] codecoverlay: Include codec name in overlay --- xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ @@ -1642,10 +1726,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From 5813a683f670077d064bba5fe2592c105b4f73b4 Mon Sep 17 00:00:00 2001 +From a2c5b68ac547e37b40b0a6080db5be3dae6b2ea8 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 22/67] [DebugInfo] Add cpu usage info. +Subject: [PATCH 22/68] [DebugInfo] Add cpu usage info. --- .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- @@ -1815,10 +1899,10 @@ index 420b5b5d8e6089e1049ef9af25e23d915df50dc1..fd8a0a2447c40357a9e13003f2ef45ef m_debugTimer.Set(1000); -From 37063ea86134466d1a61a6b6e1cf51638cb7088b Mon Sep 17 00:00:00 2001 +From 2adc8646ee6f95e23c0a791142958c02e93caaf8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 23/67] ffmpeg: Allow neon to be enabled in unified builds +Subject: [PATCH 23/68] ffmpeg: Allow neon to be enabled in unified builds --- tools/depends/target/ffmpeg/Makefile | 4 ++++ @@ -1841,10 +1925,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153 ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From ba52537598de76e187946e0869fcadda7c7d48be Mon Sep 17 00:00:00 2001 +From 0579dc27a97375bd5a42724940e84fb855d3a051 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 24/67] ffmpeg: Add some upstream HEVC optimisations +Subject: [PATCH 24/68] ffmpeg: Add some upstream HEVC optimisations --- tools/depends/target/ffmpeg/Makefile | 6 +- @@ -5642,10 +5726,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From b7d0926bb1263518cc9c6fda4945b1b24ba0bf63 Mon Sep 17 00:00:00 2001 +From f790771ded23e5084251c1ef51a0446304ad3e7f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 25/67] [ffmpeg] Add GPU acceleration to hevc +Subject: [PATCH 25/68] [ffmpeg] Add GPU acceleration to hevc --- tools/depends/target/ffmpeg/Makefile | 4 +- @@ -43831,10 +43915,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 1c5e663d7d0ad95e5fc3de874b006531a50d9b47 Mon Sep 17 00:00:00 2001 +From 60380daef33b31a30317f5c4f0bb1a3662ccd21e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 26/67] ffmpeg: Add cabac opimisations for hevc +Subject: [PATCH 26/68] ffmpeg: Add cabac opimisations for hevc --- .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ @@ -46079,10 +46163,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b make -j ${BUILDTHREADS} -From cea464637de727807464b87e3efa161268b891ad Mon Sep 17 00:00:00 2001 +From 10ae426227617095c3a16dd78823470efbbbc822 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 27/67] [3d] Make MVC a valid 3D filename tag +Subject: [PATCH 27/68] [3d] Make MVC a valid 3D filename tag --- xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ @@ -46111,7 +46195,7 @@ index b34873cba6534086ae243326550385867a03256a..1443acaf0f25df458ae49766e13dd032 } diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 12ba1aca0ba838bd8d33e9ca1043845c10f90954..3478719e18e9430224542c3ed825cd036e975434 100644 +index 46d72aa072d34119f4a7273dc8f71176abebd27c..cca5c7f932241d146291d2bb0a0042f99fa0d596 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -402,6 +402,7 @@ void CAdvancedSettings::Initialize() @@ -46143,10 +46227,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef bool m_useDisplayControlHWStereo; -From bb14b6e47f39bf9e9c659175e397d4b54057b904 Mon Sep 17 00:00:00 2001 +From 77a3ef3f7d6db5ebd4e3f57f280bc503c4123623 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 28/67] [3d] Swap top/bottom sides of GUI +Subject: [PATCH 28/68] [3d] Swap top/bottom sides of GUI --- xbmc/guilib/GraphicContext.cpp | 2 +- @@ -46166,10 +46250,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 6ea3e583f9bf50d3e4d9fba65442d965db2e7c60 Mon Sep 17 00:00:00 2001 +From 67e1d0520450d59e44732176170c5ad163c265e6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 29/67] Revert "Revert "Disable extra logging by default"" +Subject: [PATCH 29/68] Revert "Revert "Disable extra logging by default"" This reverts commit a880554325be187b877cd8f0e2b338e7267da636. --- @@ -46196,10 +46280,10 @@ index 2ed5fb217c6b9f63f28d760e2a2c00b29942315a..850abcd174cc8773319639c7e337f2e2 loggingcomponents , -From e4a199961a0f9eef3de3b6d9b2f43746aae44e2a Mon Sep 17 00:00:00 2001 +From 784828e93758de14cfabdb225e69fc6ea17ca508 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 30/67] [omximage] Fall back to arm jpeg encode/decode when gpu +Subject: [PATCH 30/68] [omximage] Fall back to arm jpeg encode/decode when gpu is busy --- @@ -46442,10 +46526,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 4d10ca2fe22af671bc3ee041242aa19fcc6d986d Mon Sep 17 00:00:00 2001 +From da8da2bcd8f1f7863710085834afb12b3bf2fa49 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 31/67] [mmalcodec] Fail to open when width is invalid. Can +Subject: [PATCH 31/68] [mmalcodec] Fail to open when width is invalid. Can happen with mpegts files --- @@ -46467,10 +46551,10 @@ index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568 if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From 1c412e8a9559575ce37830782c994eeaf608aace Mon Sep 17 00:00:00 2001 +From 83acbaf2b2181108d49592c77e561def10b93c7e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 32/67] [videoplayer/rbp] Add pi specific option to maintain +Subject: [PATCH 32/68] [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 +46995,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50 extern CRBP g_RBP; -From 8fcc6e14f70281abfe8f29d4eecb09d3a1981750 Mon Sep 17 00:00:00 2001 +From 7e8e2ba84b6e905b4dbb56d697f3e4fedeace49c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 33/67] rbp: Support zero copy interface with hevc acceleration +Subject: [PATCH 33/68] rbp: Support zero copy interface with hevc acceleration --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ @@ -46958,10 +47042,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 d13334643b6bdf8df9c7711fc2942498092f6a88 Mon Sep 17 00:00:00 2001 +From b029701efc29f558d3a4ca8b10d2a18cfa44743c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 34/67] ffmpeg: use upstream mvc patches +Subject: [PATCH 34/68] ffmpeg: use upstream mvc patches --- ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ @@ -47271,10 +47355,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From a31ff8c43a33afc551e852ac68dcce470c418c67 Mon Sep 17 00:00:00 2001 +From 0728f32f0d6eec99e1925062c4069d187a459da7 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 35/67] [win32] Settings: Added setting to enable/disable MVC +Subject: [PATCH 35/68] [win32] Settings: Added setting to enable/disable MVC decoder. --- @@ -47304,10 +47388,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9 -From 8accdc748ba93a0ff8406a12da77b3456887eea9 Mon Sep 17 00:00:00 2001 +From 4f033de223f29d7d3dd4e925d5f51c67dfa98e82 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 36/67] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc +Subject: [PATCH 36/68] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc streams. --- @@ -47370,10 +47454,10 @@ index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff81 } case AVMEDIA_TYPE_DATA: -From f24fa3672ebcb63848be6e7b3669f7034616287c Mon Sep 17 00:00:00 2001 +From 365c13cd712926583d19d8ab4afbb60cf2ee40a2 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 37/67] [Stereo3D] Added block_lr and block_rl to supported +Subject: [PATCH 37/68] [Stereo3D] Added block_lr and block_rl to supported modes. --- @@ -47423,10 +47507,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814 i++; } -From b61e26e406192689178f2059d91ce73d10cf0a5c Mon Sep 17 00:00:00 2001 +From 10eba95271f94477d62a8e479810365a18c91e7d Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 38/67] [VideoPlayer] Fix possible wrong aspect. +Subject: [PATCH 38/68] [VideoPlayer] Fix possible wrong aspect. --- xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- @@ -47446,10 +47530,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd else m_fForcedAspectRatio = 0.0; -From 88e75af3d50f9e4c2912317f3f3713372a472fec Mon Sep 17 00:00:00 2001 +From 421ce0b26a2446438200d4f320febb3aca94564b Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 39/67] [VideoPlayer] DemuxFFmpeg: ssif remux +Subject: [PATCH 39/68] [VideoPlayer] DemuxFFmpeg: ssif remux --- xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + @@ -47870,7 +47954,7 @@ index e4f8aed0af96fe0dceec4d8517087742f2c7df81..30076937bd084936571abf0e6eeecf5a LIB = DVDDemuxers.a diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 3478719e18e9430224542c3ed825cd036e975434..748354c94045ca279801464930e98bd57963de96 100644 +index cca5c7f932241d146291d2bb0a0042f99fa0d596..edbc96f7be3ae4dae994320f8c137555c927d455 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -391,7 +391,7 @@ void CAdvancedSettings::Initialize() @@ -47883,10 +47967,10 @@ index 3478719e18e9430224542c3ed825cd036e975434..748354c94045ca279801464930e98bd5 m_discStubExtensions = ".disc"; // internal music extensions -From 91fa36649e96a95270e2296449aaa7aa92a25713 Mon Sep 17 00:00:00 2001 +From 5b946c59476a5132ec920cd1aeee00e61473c67c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 40/67] [3DBD] Added support of 3D-BluRay playback. +Subject: [PATCH 40/68] [3DBD] Added support of 3D-BluRay playback. --- lib/DllLibbluray.h | 8 + @@ -48876,10 +48960,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 7c59c8fe5dfd19c92cd01adba7203588fc9a05cf Mon Sep 17 00:00:00 2001 +From 7f62ce78ecb3391a3f6d60365d348edb4f2aafd0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 41/67] [VideoPlayer] HasVideo returns true if video stream +Subject: [PATCH 41/68] [VideoPlayer] HasVideo returns true if video stream exists. This don't allow start visualization if audio is opened before video. --- @@ -48887,7 +48971,7 @@ Subject: [PATCH 41/67] [VideoPlayer] HasVideo returns true if video stream 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index defe4e44a4cca76527186abb989dcb847e1431cd..b45b7573636de0cecd86606d942d5e3baf214c91 100644 +index f206847aa8bd9e57c9e558362ef0728fd7737efd..b533aa5395dac512d3b153b44b86d2fa7276ddb2 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -3074,7 +3074,7 @@ void CVideoPlayer::Pause() @@ -48900,10 +48984,10 @@ index defe4e44a4cca76527186abb989dcb847e1431cd..b45b7573636de0cecd86606d942d5e3b bool CVideoPlayer::HasAudio() const -From 21b67480972e81a6892a02477468fc4d33d786c4 Mon Sep 17 00:00:00 2001 +From 8f4f33f8ce611f3a621f273c99eff401adad8f95 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 42/67] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 42/68] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -48940,10 +49024,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45 CDVDOverlayImage* overlay = new CDVDOverlayImage(); -From 7fe6612e145e2868b058726f22dfcd8292092aa5 Mon Sep 17 00:00:00 2001 +From 684733427abe150f550c4e9153c3f4ac11b5eb02 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 43/67] [VideoPlayer] Disable reading extension stream from +Subject: [PATCH 43/68] [VideoPlayer] Disable reading extension stream from input stream if decoder doesn't support it. --- @@ -49173,7 +49257,7 @@ index 0b676c9b611fe956f1aa721013412e41ff5b62f6..6762e733848d1298a75a862b0aaf81aa class CDVDAudioCodec; diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index b45b7573636de0cecd86606d942d5e3baf214c91..ccc371d723b386eb76f022f794c7563d70e1dadd 100644 +index b533aa5395dac512d3b153b44b86d2fa7276ddb2..505747a6d7c45c0a4e67fefa711c85dd5236e35d 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -3802,6 +3802,10 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset) @@ -49200,10 +49284,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1 // classes CDVDOverlayContainer* m_pOverlayContainer; -From 29f7bc99e15245a3303f2b70c46b6c3f4d15fd84 Mon Sep 17 00:00:00 2001 +From 59cb640ab14a7a9cebcf33173fb527043c408079 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 44/67] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from +Subject: [PATCH 44/68] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from platform settings to common settings. --- @@ -49299,10 +49383,10 @@ index 473ca093f45f6a5779cade1268269bb7ba483e9d..11a422b1a5cbfde9914d3bfd23b5b540 m_simpleConditions.insert("have_lcms2"); #endif -From 6cafd78f07821d41e50d95015e7531b47ff4ba22 Mon Sep 17 00:00:00 2001 +From d83f42e75f32b1fa65118aee75d5924ba6422c49 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 45/67] [VideoPlayer] SSIF: fix for corner case when mvc stream +Subject: [PATCH 45/68] [VideoPlayer] SSIF: fix for corner case when mvc stream is switched before the last packet is read from previous stream. --- @@ -49491,33 +49575,33 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9 typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From a94a694d85b3f7bb7ebd528cbff1c22500dcd033 Mon Sep 17 00:00:00 2001 +From a302ecf71dca436add6e414416abde1dbff9f37c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 46/67] [libbluray] bump libbluray to 0.9.2-mvc. +Subject: [PATCH 46/68] [libbluray] bump libbluray to 0.9.2-mvc. --- project/BuildDependencies/scripts/0_package.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list -index 3ca0ecb8b91f4db2a0dae1f0fac217bd18c7bc43..48f6088640142b2d40d9a4bce525baa87d3278a3 100644 +index 33f87aec9968a24f5c9ba35ab5ea2eb1786feaf9..4fdebd9401b40ca18a474aece3e27f4b696c9d5b 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list -@@ -17,7 +17,7 @@ freetype-dc2b38-win32-vc140-v2.7z +@@ -17,7 +17,7 @@ freetype-db5a22-win32-vc140.7z giflib-5.1.4-win32-vc140.7z jsonschemabuilder-1.0.0-win32-3.7z - libass-6aaaf5-win32-vc140.7z + libass-ddb383-win32-vc140.7z -libbluray-0.9.3-win32-vc140.7z +libbluray-0.9.2-mvc-win32-vc120.7z libcdio-0.9.3-win32-vc140.7z libcec-4.0.1-win32-vc140-2.7z libfribidi-0.19.2-win32.7z -From 4b4f63b3b9083dc559680a33095ffd21ec6c8d81 Mon Sep 17 00:00:00 2001 +From 73a2044f791aa2854f68a3fcabad3f322cf88b50 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 47/67] libbluray: Bump to Nevcairie's v0.9.2 +Subject: [PATCH 47/68] libbluray: Bump to Nevcairie's v0.9.2 This includes 3D support --- @@ -51174,10 +51258,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From 05f619cf0bde4209267f1de6270e7fc93718b0d7 Mon Sep 17 00:00:00 2001 +From 005b8b0aafa1e915d35af44951f31517af6f21e6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 48/67] mvc: Automatically enable stereo mode +Subject: [PATCH 48/68] mvc: Automatically enable stereo mode --- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- @@ -51235,10 +51319,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 0792d059c421811de7a52b55638373c26c21e008 Mon Sep 17 00:00:00 2001 +From 8aa8a74b93220298b5a0634b2b15067c752805fd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 49/67] ffmpeg: mvc: fix for pixelation from packets with no +Subject: [PATCH 49/68] ffmpeg: mvc: fix for pixelation from packets with no pts/dts --- @@ -51300,10 +51384,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 7cca3aef831e26c2e43a92646a0243b58486981d Mon Sep 17 00:00:00 2001 +From d72e410373784b1c11de8d8a96993678eb4d90ad Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 50/67] stereoscopicmanager: fixups for rbp +Subject: [PATCH 50/68] stereoscopicmanager: fixups for rbp --- xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ @@ -51541,10 +51625,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782 }; -From 780c207fcd4e086d32f74d6a097642ba86b8b8a3 Mon Sep 17 00:00:00 2001 +From 3c8a76f384bb29cf19d3838d115cdcbc91f0a002 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 51/67] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 51/68] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -51564,10 +51648,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18 } -From be1121b5490ba594b4338223d0587c4ce12b6030 Mon Sep 17 00:00:00 2001 +From 097f3f179d98342367c7d3585c44b24eb3fa8eed Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 52/67] DemuxMVC: fixup after SeekTime API change +Subject: [PATCH 52/68] DemuxMVC: fixup after SeekTime API change --- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- @@ -51601,10 +51685,36 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425 virtual int GetStreamLength() { return 0; }; virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -From 76a51144a06e9b8147407ccb4d6fe926e8a7816b Mon Sep 17 00:00:00 2001 +From b8be297f0b24924f32af51950557b29ed45ba42f Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 3 Nov 2014 23:17:46 +0000 +Subject: [PATCH 53/68] [cec] Don't discard buttons when repeat mode is enabled + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 30367a3fde956090afdca9930fa52e829f35046f..febacb3b7964eab3b8615a6a807e0f27d911b4da 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -803,7 +803,10 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) + CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); + + CSingleLock lock(m_critSection); +- if (key.iDuration > 0) ++ // avoid the queue getting too long ++ if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) ++ return; ++ if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) + { + if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) + { + +From 0574f5f0334a0cce8227f141469b67590e6d1f2b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 54/67] [cec] Temp - more logging +Subject: [PATCH 54/68] [cec] Temp - more logging --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- @@ -51656,10 +51766,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a } -From 205a27d0a81ab333c53a786a00dffae7e1d6205f Mon Sep 17 00:00:00 2001 +From 38fa33062a3468b80b58951e2636adbf0e681e6f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 55/67] rbp: Hard code the number of buffers to improve audio +Subject: [PATCH 55/68] rbp: Hard code the number of buffers to improve audio sync --- @@ -51701,10 +51811,10 @@ index fd8a0a2447c40357a9e13003f2ef45ef20ccb205..be0de0d962fd374bc17bfa48a27ca17d } -From ac68b8f32842e24009e2de53e42fa6775af263a8 Mon Sep 17 00:00:00 2001 +From ec9bbb9cc255dceaedaed291a6053a544c8f5cc0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 56/67] rbp: Update the GL libs to new naming scheme +Subject: [PATCH 56/68] 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. @@ -51718,7 +51828,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index a37c8c5d2d92194731203b19a5cf8a369e96d3fa..772facc7c837e730317b8708800741efc608a9c9 100644 +index 9bd8d6ec09ff5cf0c6e6caf39850f650f1dd2665..291ff72c1845037f97e215232ab1c2667687f289 100644 --- a/configure.ac +++ b/configure.ac @@ -949,7 +949,7 @@ if test "$use_gles" = "yes"; then @@ -51769,10 +51879,10 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71 fi -From 9838684c2520a11221010731a75d1ee556216205 Mon Sep 17 00:00:00 2001 +From 18d96915a596a96c9b73b480331455c06226910a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 57/67] ffmpeg: hacky fix for files with GMC +Subject: [PATCH 57/68] ffmpeg: hacky fix for files with GMC --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- @@ -51794,10 +51904,10 @@ index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675 { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From d31579fe437b86fb71198d5f077645cfaae0f017 Mon Sep 17 00:00:00 2001 +From 0fa6a704aaa9a1e94e78728815bf492b2f383670 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 58/67] mmalrender: Add sharpness control +Subject: [PATCH 58/68] mmalrender: Add sharpness control --- addons/resource.language.en_gb/resources/strings.po | 2 +- @@ -51869,10 +51979,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From bf759c6dad91e60580981c29146bf495a18167cf Mon Sep 17 00:00:00 2001 +From 90fcda3eef3bf74f8baec388a2d975c4a915033a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 59/67] MMALFFMpeg: Report as SW decode in codec overlay info +Subject: [PATCH 59/68] MMALFFMpeg: Report as SW decode in codec overlay info --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- @@ -51892,10 +52002,10 @@ index 8bace5b3eb98b3b1ddad7f56af83a41ae067bc75..c820a04c903866862b5ff04b38124ff0 CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); } -From 8c3b6d8a7d39d535cc73cd5d0479fb2a01fd1171 Mon Sep 17 00:00:00 2001 +From 33381091746e0719b21818bfd5f3bba8439a9f70 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Nov 2016 18:28:01 +0000 -Subject: [PATCH 60/67] advancedsettings: Add option to set cache size on +Subject: [PATCH 60/68] advancedsettings: Add option to set cache size on libass E.g to set total cache size in libass to 32M @@ -51961,7 +52071,7 @@ index f9de4f15e7c612d69ef46e7cad870ecb61afaec3..b5303fd100f1a930eb5c010a95193206 END_METHOD_RESOLVE() }; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 748354c94045ca279801464930e98bd57963de96..5bdd6244e28c8320e18fed5148d332da19801221 100644 +index edbc96f7be3ae4dae994320f8c137555c927d455..7f3325392993823b8d2d6a915579c48401ca2c12 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -364,6 +364,8 @@ void CAdvancedSettings::Initialize() @@ -51997,10 +52107,10 @@ index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97 unsigned int m_jsonTcpPort; -From 4ce0c7911dba73b04ae32cb813b9a5fca1d44998 Mon Sep 17 00:00:00 2001 +From 5a7d0e7aefb3a1ea7a11056cd6b4148ce24abe0e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 13 Nov 2016 20:30:15 +0000 -Subject: [PATCH 61/67] [rbp] Experimental limit libass cache size depending on +Subject: [PATCH 61/68] [rbp] Experimental limit libass cache size depending on arm memory size --- @@ -52031,7 +52141,7 @@ index 6e8529001b1a464b4547a846f553d98f5bc0b6c0..238eba372af2cbab11d7543c857ee476 response[sizeof(response) - 1] = '\0'; CLog::Log(LOGNOTICE, "Config:\n%s", response); diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 5bdd6244e28c8320e18fed5148d332da19801221..95a9d347049dbfa04d74248dce9167a6896566dc 100644 +index 7f3325392993823b8d2d6a915579c48401ca2c12..410ad30aeb60316e9438ee56aaca7e73f0b3bedd 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -361,8 +361,10 @@ void CAdvancedSettings::Initialize() @@ -52046,10 +52156,10 @@ index 5bdd6244e28c8320e18fed5148d332da19801221..95a9d347049dbfa04d74248dce9167a6 m_libAssCache = 0; -From 8f293b32905920446d7d84c031a01ef451e8fa4c Mon Sep 17 00:00:00 2001 +From 41b760881da0c4440e9e19041ab856d239785d0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 22 Jun 2015 21:46:57 +0100 -Subject: [PATCH 62/67] [rbp] Use default resampling setting on Pi2 +Subject: [PATCH 62/68] [rbp] Use default resampling setting on Pi2 --- system/settings/rbp2.xml | 5 +++++ @@ -52072,10 +52182,10 @@ index 50bd55e9c90864c1ff4c36c4650e9ec247737a44..f218216e615d9723e5a163aab9c42ca5 -From d96d809cdb68c8299b0b6771a11eb390060df5b8 Mon Sep 17 00:00:00 2001 +From f5b8dc97e759784ef8644aa47bf7049f87ca48ee Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 1 Dec 2016 17:06:01 +0000 -Subject: [PATCH 63/67] MMALRender: Allow advanced deinterlace with software +Subject: [PATCH 63/68] MMALRender: Allow advanced deinterlace with software decode Uses YUV420 directly which improves performance. @@ -52098,10 +52208,10 @@ index f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9..05cbd8eeaef1a21fc32ea1fa23ea686e status = mmal_port_format_commit(m_deint_output); if (status != MMAL_SUCCESS) -From 38b097a6d6653267c52de2a2d5f6a09c39642684 Mon Sep 17 00:00:00 2001 +From 38c1467506f79354d682fdc0ac485d28c717365c Mon Sep 17 00:00:00 2001 From: Nuno Senica Date: Tue, 27 Dec 2016 20:59:56 +0000 -Subject: [PATCH 64/67] Apply ffmpeg patches automatically after downloading +Subject: [PATCH 64/68] Apply ffmpeg patches automatically after downloading and extracting the ffmpeg tar ball --- @@ -52109,10 +52219,10 @@ Subject: [PATCH 64/67] Apply ffmpeg patches automatically after downloading 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 3d7fcc8ca30224fc589c720e37102588f3739448..486842e9bd6c6e7c65ca0dd9c2a6fc6f26169a5d 100644 +index 7c68b4c3d09a037d3b85c81604d47a7ea6dd1c21..eec635ef493d13ea97c9b806eb57cccbc452297d 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake -@@ -260,7 +260,17 @@ if(NOT FFMPEG_FOUND) +@@ -261,7 +261,17 @@ if(NOT FFMPEG_FOUND) && ${CMAKE_COMMAND} -E copy ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake @@ -52132,10 +52242,10 @@ index 3d7fcc8ca30224fc589c720e37102588f3739448..486842e9bd6c6e7c65ca0dd9c2a6fc6f file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper "#!/bin/bash -From 41d5ae2774e4c5ed6386180c1553f129a1be549c Mon Sep 17 00:00:00 2001 +From 85308cfc4c4cadea966028f36d133c436dee0f44 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 1 May 2016 19:56:43 +0100 -Subject: [PATCH 65/67] omxplayer: Avoid CAEFactory::Suspend which should only +Subject: [PATCH 65/68] omxplayer: Avoid CAEFactory::Suspend which should only be called by application --- @@ -52235,10 +52345,10 @@ index db7f98ddbc2db2f20bdc42379df3f08eba165bfc..02acfc8cfe57446be4e00b991ef6fde9 COMXCoreComponent m_omx_render_analog; COMXCoreComponent m_omx_render_hdmi; -From a6419a20e48ee45774ef61d41ae9124228e632ca Mon Sep 17 00:00:00 2001 +From 7e1af74827644365c69208d25e6aa81ce6c4bc96 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 Mar 2017 21:40:22 +0000 -Subject: [PATCH 66/67] MMALRender: default to bob (x2) deinterlace for HD +Subject: [PATCH 66/68] 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 +52390,10 @@ index 39bc0530cecd54ae8c3a5481c92f1a6a18a4d9c5..cb0a06888a919879155fea2a689c1bae if (m_deinterlace && interlace_method != VS_INTERLACEMETHOD_NONE) { -From 58b2734d76c3e32caed3ed96da93b3b02391c8d8 Mon Sep 17 00:00:00 2001 +From ebd0a42fa87037a9cf90eeb0d6b8187d787a866a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Feb 2017 17:58:13 +0000 -Subject: [PATCH 67/67] ffmpeg: Update hevc optimisation to use the gpu service +Subject: [PATCH 67/68] ffmpeg: Update hevc optimisation to use the gpu service --- project/cmake/modules/FindFFMPEG.cmake | 14 +- @@ -52293,10 +52403,10 @@ Subject: [PATCH 67/67] ffmpeg: Update hevc optimisation to use the gpu service 4 files changed, 16342 insertions(+), 35924 deletions(-) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 486842e9bd6c6e7c65ca0dd9c2a6fc6f26169a5d..92e79eb225640bb8a965ee63b3fd5c743e09758f 100644 +index eec635ef493d13ea97c9b806eb57cccbc452297d..301534c5b0113815f9a196fdd0ed9db6ff587cda 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake -@@ -261,14 +261,14 @@ if(NOT FFMPEG_FOUND) +@@ -262,14 +262,14 @@ if(NOT FFMPEG_FOUND) ${CMAKE_COMMAND} -E copy ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake && @@ -105594,3 +105704,128 @@ index e172ebf157aebffe1ae50b4a2b25fd71bc708c93..852815d5f4ae80771c5304f6f3520b5e ++pi-util/rebase_liblinks.py $DST ++ ++ + +From 7b463eb51346ae788f1f12bb89f8cf2102c14241 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Sat, 4 Mar 2017 19:25:40 +0000 +Subject: [PATCH 68/68] ffmpeg: Call get_format to fix an issue with MMAL + rendering + +--- + project/cmake/modules/FindFFMPEG.cmake | 3 +- + ...-get_format-to-fix-an-issue-with-MMAL-ren.patch | 55 ++++++++++++++++++++++ + tools/depends/target/ffmpeg/Makefile | 4 +- + tools/depends/target/ffmpeg/autobuild.sh | 2 + + 4 files changed, 62 insertions(+), 2 deletions(-) + create mode 100644 tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + +diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake +index 301534c5b0113815f9a196fdd0ed9db6ff587cda..2cfd61642d52f05a84bea5ca7eb1766ad8e8ddbd 100644 +--- a/project/cmake/modules/FindFFMPEG.cmake ++++ b/project/cmake/modules/FindFFMPEG.cmake +@@ -270,7 +270,8 @@ if(NOT FFMPEG_FOUND) + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch && + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch && + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch && +- patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch && ++ patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + ) + + file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper +diff --git a/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch b/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..37b53e8fb6974b5330e0e05f74a1f2c760693bf8 +--- /dev/null ++++ b/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch +@@ -0,0 +1,55 @@ ++From 7adc8f706efab65d8d7e5f960690faca3d5c190d Mon Sep 17 00:00:00 2001 ++From: popcornmix ++Date: Sat, 4 Mar 2017 19:24:02 +0000 ++Subject: [PATCH] ffmpeg: Call get_format to fix an issue with MMAL rendering ++ ++--- ++ libavcodec/dvdec.c | 7 +++++++ ++ libavcodec/rv34.c | 6 +++++- ++ 2 files changed, 12 insertions(+), 1 deletion(-) ++ ++diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c ++index 0b4c1bc..00081ef 100644 ++--- a/libavcodec/dvdec.c +++++ b/libavcodec/dvdec.c ++@@ -49,6 +49,7 @@ ++ #include "internal.h" ++ #include "put_bits.h" ++ #include "simple_idct.h" +++#include "thread.h" ++ ++ typedef struct BlockInfo { ++ const uint32_t *factor_table; ++@@ -196,6 +197,12 @@ static av_cold int dvvideo_decode_init(AVCodecContext *avctx) ++ s->idct_put[0] = idsp.idct_put; ++ s->idct_put[1] = ff_simple_idct248_put; ++ +++ static const enum AVPixelFormat pix_fmts[] = { +++ AV_PIX_FMT_YUV420P, +++ AV_PIX_FMT_NONE +++ }; +++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); +++ ++ return ff_dvvideo_init(avctx); ++ } ++ ++diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c ++index aca8382..f473f6c 100644 ++--- a/libavcodec/rv34.c +++++ b/libavcodec/rv34.c ++@@ -1493,7 +1493,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ++ ff_mpv_decode_init(s, avctx); ++ s->out_format = FMT_H263; ++ ++- avctx->pix_fmt = AV_PIX_FMT_YUV420P; +++ static const enum AVPixelFormat pix_fmts[] = { +++ AV_PIX_FMT_YUV420P, +++ AV_PIX_FMT_NONE +++ }; +++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); ++ avctx->has_b_frames = 1; ++ s->low_delay = 0; ++ ++-- ++2.7.4 ++ +diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile +index 11e92a9ad618b748cad4831fa6af7565e29081ab..96abff05829e365545aaccf3aa78915e273fb93c 100644 +--- a/tools/depends/target/ffmpeg/Makefile ++++ b/tools/depends/target/ffmpeg/Makefile +@@ -7,7 +7,8 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ + 0001-Squashed-commit-of-the-following.patch \ + 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ + h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch \ +- 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch \ ++ 0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + # set to "yes" to enable patching + # we don't apply patches until we move to a vanilla ffmpeg tarball +@@ -97,6 +98,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) + #cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch + #cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch + cd $(PLATFORM); patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ cd $(PLATFORM); patch -p1 < ../0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + cd $(PLATFORM);\ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ +diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh +index 3d970429012c1f3aede4df0545ced5006c165d50..e070d96fc340f5bff94d72ae9004c4a91ec5198c 100755 +--- a/tools/depends/target/ffmpeg/autobuild.sh ++++ b/tools/depends/target/ffmpeg/autobuild.sh +@@ -140,6 +140,8 @@ patch -p1 < ../pfcd_hevc_optimisations.patch + #patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch + #patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch + #patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch ++patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++patch -p1 < ../0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ + ./configure --prefix=$FFMPEG_PREFIX \ diff --git a/projects/RPi2/patches/kodi/kodi-001-backport.patch b/projects/RPi2/patches/kodi/kodi-001-backport.patch index 42910f0a13..8693d0abc3 100644 --- a/projects/RPi2/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi2/patches/kodi/kodi-001-backport.patch @@ -1,7 +1,91 @@ -From fb711d36229c80705b4a0a36ce2e120c3e1466fd Mon Sep 17 00:00:00 2001 +From ca8af64149c77c0fce5d240115afb91caa08a6a9 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 28 Oct 2014 00:19:40 +0000 +Subject: [PATCH 01/68] [cec] Add settings for configuring button repeats + +--- + addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ + system/peripherals.xml | 4 +++- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 16 ++++++++++++++++ + 3 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po +index e0060d1fae556de529274dbc6be07455701573a3..6443f3dd885bf0aa8e031039e36e273972a310ae 100644 +--- a/addons/resource.language.en_gb/resources/strings.po ++++ b/addons/resource.language.en_gb/resources/strings.po +@@ -19745,3 +19745,18 @@ msgstr "" + msgctxt "#39010" + msgid "Select sort method" + msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38050" ++msgid "Remote button press delay before repeating (ms)" ++msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38051" ++msgid "Remote button press repeat rate (ms)" ++msgstr "" ++ ++#: system/peripherals.xml ++msgctxt "#38052" ++msgid "Remote button press release time (ms)" ++msgstr "" +diff --git a/system/peripherals.xml b/system/peripherals.xml +index d5704b249c3065b2980dc92c7c81dc7b384187bc..02b1a9ed6fce1986bd864bba09a9df0621f9e041 100644 +--- a/system/peripherals.xml ++++ b/system/peripherals.xml +@@ -31,7 +31,9 @@ + + + +- ++ ++ ++ + + + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index d032ffd707fee5eec035e90bdf618530f7215c37..30367a3fde956090afdca9930fa52e829f35046f 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1296,6 +1296,20 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu + m_configuration.bActivateSource = config.bActivateSource; + bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1); + ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) ++ m_configuration.iDoubleTapTimeout50Ms = config.iDoubleTapTimeout50Ms; ++ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeout50Ms * 50); ++#else ++ m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs; ++ bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs); ++#endif ++ ++ m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs; ++ bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs); ++ ++ m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs; ++ bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs); ++ + m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby; + + m_configuration.iFirmwareVersion = config.iFirmwareVersion; +@@ -1398,6 +1412,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + // backwards compatibility. will be removed once the next major release of libCEC is out + m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); + #endif ++ m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms"); ++ m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms"); + + if (GetSettingBool("pause_playback_on_deactivate")) + { + +From b551892df962870860845022b74db883f71d8094 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 02/67] [cec] Don't suspend pi on tv switch off - it can't wake +Subject: [PATCH 02/68] [cec] Don't suspend pi on tv switch off - it can't wake up --- @@ -22,10 +106,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325 -From 6b34039dc27c952fc5217ffc1f0e1fac49992bed Mon Sep 17 00:00:00 2001 +From 51342652317692c0547de6fd46ab406027caaeaf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 03/67] [rbp/omxplayer] When opening a stream don't try to +Subject: [PATCH 03/68] [rbp/omxplayer] When opening a stream don't try to update gui so often --- @@ -49,10 +133,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 4757e370bc4f5fc42f7191b893c2d806d6c76bbc Mon Sep 17 00:00:00 2001 +From 0b198a0ee941b51d9c384a0e86f4d6ba5b62990f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 -Subject: [PATCH 04/67] [hifiberry] Hack: force it to be recognised as IEC958 +Subject: [PATCH 04/68] [hifiberry] Hack: force it to be recognised as IEC958 capable to enable passthrough options --- @@ -75,10 +159,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From eec779f1dba335e11b9b30955f047fa432896b2f Mon Sep 17 00:00:00 2001 +From 20cfc448b8f0c17cc3a6d945473f538bb05232ba Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 05/67] Improved file buffering in CArchive +Subject: [PATCH 05/68] 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 +222,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 2ed4fa5cf7935b1e04d2e2aebd0f214047ed358f Mon Sep 17 00:00:00 2001 +From 7fd1cae524a13cb22fe4b77131672d19ef5f92b4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 06/67] filesystem: Make support of browsing into archives +Subject: [PATCH 06/68] 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 +335,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From dcebf738cde43680261a85a3385c728189b84cdb Mon Sep 17 00:00:00 2001 +From 35a10ad57387d4bef6ad79e05fd8f9f25ecf9142 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 07/67] [rbp] Make cachemembuffersize default depend on memory +Subject: [PATCH 07/68] [rbp] Make cachemembuffersize default depend on memory size --- @@ -318,7 +402,7 @@ index a35a509a91483f13e2cf0e688fc7e9528f254290..fffa5182126159f6dfcf750b21fa0464 void Deinitialize(); int GetArmMem() { return m_arm_mem; } diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 1c00edab33101b82a5817ac03c7f1d98007e1856..12ba1aca0ba838bd8d33e9ca1043845c10f90954 100644 +index 91574029c28c4fabacb4bc022aa028dcaf299adb..46d72aa072d34119f4a7273dc8f71176abebd27c 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -50,6 +50,9 @@ @@ -356,10 +440,10 @@ index 1c00edab33101b82a5817ac03c7f1d98007e1856..12ba1aca0ba838bd8d33e9ca1043845c } -From b3cfcae349f63dc41713cb9cd24707f02b0184d6 Mon Sep 17 00:00:00 2001 +From 7feb38888a4ee8ef04f761dd2573c2a46d195955 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 08/67] [settings] Experiment: Report DESKTOP resolution in +Subject: [PATCH 08/68] [settings] Experiment: Report DESKTOP resolution in video settings --- @@ -381,10 +465,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9 StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From 4a486ce217ef15870a9c23d6e0cbd2c69137100a Mon Sep 17 00:00:00 2001 +From a46d6e4c452c058760600eea4721a9d518484dcf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 09/67] [audio] Add settings option to boost centre channel +Subject: [PATCH 09/68] [audio] Add settings option to boost centre channel when downmixing This allows a dB volume increase to be added to centre channel. @@ -510,10 +594,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From d3125a94e433da8ead850dfa45ed1d6ded3f3148 Mon Sep 17 00:00:00 2001 +From 70c28bcf5c9e5ba3b1e3a1b91d1743341d591b9f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 10/67] [rbp] Default extract thumbnails to false +Subject: [PATCH 10/68] [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 +623,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From 2e4c872b8c0b795156f96918cb8a2d4e099b1d1e Mon Sep 17 00:00:00 2001 +From bbbe30844e691b9ae17241dd1a5aecaf90a22bd2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 11/67] [languageinvoker] Reduce priority of python threads +Subject: [PATCH 11/68] [languageinvoker] Reduce priority of python threads --- xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ @@ -565,10 +649,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From 97ce5209853a7f18a79e5d98893353a3bb52f3dd Mon Sep 17 00:00:00 2001 +From b89858ab1bdc803820d91c159fa7d2ac68d5b918 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 12/67] [rbp] hack: wait for splash to complete before changing +Subject: [PATCH 12/68] [rbp] hack: wait for splash to complete before changing hdmi mode --- @@ -652,10 +736,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From 70f0ff25bc73321491cc1ad85e3fbb5514dfdc16 Mon Sep 17 00:00:00 2001 +From 2e91585fb7ec92f9d6bb8d46ff7bc8e68c11a2c7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 13/67] Fix for UI not showing both extractflags and +Subject: [PATCH 13/68] Fix for UI not showing both extractflags and extractthumb --- @@ -718,10 +802,10 @@ index 5f1f3ca48342ef1a4eeed7432221d7b2dda354e8..2ed5fb217c6b9f63f28d760e2a2c00b2 -From a1f119e0986ee89641e533cbafae576147e5848d Mon Sep 17 00:00:00 2001 +From 5fc4c807a80cce1ab24353d04092ed5c576a781f Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 14/67] Disable autoscrolling while on screensaver and while +Subject: [PATCH 14/68] Disable autoscrolling while on screensaver and while opening streams. --- @@ -852,10 +936,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From 65ee3a30d6489b53126e6d34b01ed8c29a4920e5 Mon Sep 17 00:00:00 2001 +From 2d74aea7d35fa5cf43b9b52346430f6f8e68b56b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 15/67] [demuxer] Avoid memcpy on every demuxer packet +Subject: [PATCH 15/68] [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 +1039,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 66365771b22ae63d65bbb6df6f8d77d5a5dab33e Mon Sep 17 00:00:00 2001 +From 0101e6d27e57aebb4bf0b28d376dbe3f25e95c07 Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 16/67] Load OSD dialogs on startup. +Subject: [PATCH 16/68] 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 +1137,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 2c71f9b477cfd5ecb5cdedb6688502dc8cef8fa8 Mon Sep 17 00:00:00 2001 +From ff61d0493fbad70c4814c3533f5710f45ebae78f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 17/67] [gui] Also limit GUI updates when in non full-screen +Subject: [PATCH 17/68] [gui] Also limit GUI updates when in non full-screen video mode --- @@ -1086,10 +1170,10 @@ index fdf7b1dc04e31ffe8e1d1b83825343b24c645b02..513deb7f27846891fb875b9263ad4d61 g_windowManager.FrameMove(); } -From e0ee1d794615a8f4378801b55fe4c36e12d7aab5 Mon Sep 17 00:00:00 2001 +From fe1f769b0fcef97a4c99da0bd2ebd83520163307 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 18/67] [screensaver] Leave GUI contents available for +Subject: [PATCH 18/68] [screensaver] Leave GUI contents available for screensaver --- @@ -1119,10 +1203,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac // Add window to the history list (we must do this before we activate it, -From fb4c838814069e7178ecfde96cecf43ba76cf722 Mon Sep 17 00:00:00 2001 +From 3319b6d93724794d1c5f0171c448fd0089b4e8b7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 19/67] ffmpeg: Automatic switch to software decode for GMC +Subject: [PATCH 19/68] ffmpeg: Automatic switch to software decode for GMC with more than one warp point --- @@ -1350,10 +1434,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From acde728909548c939ae05ff179e461fdffda3e1b Mon Sep 17 00:00:00 2001 +From b2121b831c2b596eb98a3beb709762ba7f9ebcf2 Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 20/67] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer +Subject: [PATCH 20/68] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - fixes #15794 --- @@ -1545,10 +1629,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 79220cf49a616e2d1f18a6872323dc02521d4440 Mon Sep 17 00:00:00 2001 +From 88f06a06210729f8d903f2edf2f256483c35159d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 21/67] codecoverlay: Include codec name in overlay +Subject: [PATCH 21/68] codecoverlay: Include codec name in overlay --- xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ @@ -1642,10 +1726,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From 5813a683f670077d064bba5fe2592c105b4f73b4 Mon Sep 17 00:00:00 2001 +From a2c5b68ac547e37b40b0a6080db5be3dae6b2ea8 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 22/67] [DebugInfo] Add cpu usage info. +Subject: [PATCH 22/68] [DebugInfo] Add cpu usage info. --- .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- @@ -1815,10 +1899,10 @@ index 420b5b5d8e6089e1049ef9af25e23d915df50dc1..fd8a0a2447c40357a9e13003f2ef45ef m_debugTimer.Set(1000); -From 37063ea86134466d1a61a6b6e1cf51638cb7088b Mon Sep 17 00:00:00 2001 +From 2adc8646ee6f95e23c0a791142958c02e93caaf8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 23/67] ffmpeg: Allow neon to be enabled in unified builds +Subject: [PATCH 23/68] ffmpeg: Allow neon to be enabled in unified builds --- tools/depends/target/ffmpeg/Makefile | 4 ++++ @@ -1841,10 +1925,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153 ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From ba52537598de76e187946e0869fcadda7c7d48be Mon Sep 17 00:00:00 2001 +From 0579dc27a97375bd5a42724940e84fb855d3a051 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 24/67] ffmpeg: Add some upstream HEVC optimisations +Subject: [PATCH 24/68] ffmpeg: Add some upstream HEVC optimisations --- tools/depends/target/ffmpeg/Makefile | 6 +- @@ -5642,10 +5726,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From b7d0926bb1263518cc9c6fda4945b1b24ba0bf63 Mon Sep 17 00:00:00 2001 +From f790771ded23e5084251c1ef51a0446304ad3e7f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 25/67] [ffmpeg] Add GPU acceleration to hevc +Subject: [PATCH 25/68] [ffmpeg] Add GPU acceleration to hevc --- tools/depends/target/ffmpeg/Makefile | 4 +- @@ -43831,10 +43915,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 1c5e663d7d0ad95e5fc3de874b006531a50d9b47 Mon Sep 17 00:00:00 2001 +From 60380daef33b31a30317f5c4f0bb1a3662ccd21e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 26/67] ffmpeg: Add cabac opimisations for hevc +Subject: [PATCH 26/68] ffmpeg: Add cabac opimisations for hevc --- .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ @@ -46079,10 +46163,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b make -j ${BUILDTHREADS} -From cea464637de727807464b87e3efa161268b891ad Mon Sep 17 00:00:00 2001 +From 10ae426227617095c3a16dd78823470efbbbc822 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 27/67] [3d] Make MVC a valid 3D filename tag +Subject: [PATCH 27/68] [3d] Make MVC a valid 3D filename tag --- xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ @@ -46111,7 +46195,7 @@ index b34873cba6534086ae243326550385867a03256a..1443acaf0f25df458ae49766e13dd032 } diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 12ba1aca0ba838bd8d33e9ca1043845c10f90954..3478719e18e9430224542c3ed825cd036e975434 100644 +index 46d72aa072d34119f4a7273dc8f71176abebd27c..cca5c7f932241d146291d2bb0a0042f99fa0d596 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -402,6 +402,7 @@ void CAdvancedSettings::Initialize() @@ -46143,10 +46227,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef bool m_useDisplayControlHWStereo; -From bb14b6e47f39bf9e9c659175e397d4b54057b904 Mon Sep 17 00:00:00 2001 +From 77a3ef3f7d6db5ebd4e3f57f280bc503c4123623 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 28/67] [3d] Swap top/bottom sides of GUI +Subject: [PATCH 28/68] [3d] Swap top/bottom sides of GUI --- xbmc/guilib/GraphicContext.cpp | 2 +- @@ -46166,10 +46250,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 6ea3e583f9bf50d3e4d9fba65442d965db2e7c60 Mon Sep 17 00:00:00 2001 +From 67e1d0520450d59e44732176170c5ad163c265e6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 29/67] Revert "Revert "Disable extra logging by default"" +Subject: [PATCH 29/68] Revert "Revert "Disable extra logging by default"" This reverts commit a880554325be187b877cd8f0e2b338e7267da636. --- @@ -46196,10 +46280,10 @@ index 2ed5fb217c6b9f63f28d760e2a2c00b29942315a..850abcd174cc8773319639c7e337f2e2 loggingcomponents , -From e4a199961a0f9eef3de3b6d9b2f43746aae44e2a Mon Sep 17 00:00:00 2001 +From 784828e93758de14cfabdb225e69fc6ea17ca508 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 30/67] [omximage] Fall back to arm jpeg encode/decode when gpu +Subject: [PATCH 30/68] [omximage] Fall back to arm jpeg encode/decode when gpu is busy --- @@ -46442,10 +46526,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 4d10ca2fe22af671bc3ee041242aa19fcc6d986d Mon Sep 17 00:00:00 2001 +From da8da2bcd8f1f7863710085834afb12b3bf2fa49 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 31/67] [mmalcodec] Fail to open when width is invalid. Can +Subject: [PATCH 31/68] [mmalcodec] Fail to open when width is invalid. Can happen with mpegts files --- @@ -46467,10 +46551,10 @@ index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568 if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From 1c412e8a9559575ce37830782c994eeaf608aace Mon Sep 17 00:00:00 2001 +From 83acbaf2b2181108d49592c77e561def10b93c7e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 32/67] [videoplayer/rbp] Add pi specific option to maintain +Subject: [PATCH 32/68] [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 +46995,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50 extern CRBP g_RBP; -From 8fcc6e14f70281abfe8f29d4eecb09d3a1981750 Mon Sep 17 00:00:00 2001 +From 7e8e2ba84b6e905b4dbb56d697f3e4fedeace49c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 33/67] rbp: Support zero copy interface with hevc acceleration +Subject: [PATCH 33/68] rbp: Support zero copy interface with hevc acceleration --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ @@ -46958,10 +47042,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 d13334643b6bdf8df9c7711fc2942498092f6a88 Mon Sep 17 00:00:00 2001 +From b029701efc29f558d3a4ca8b10d2a18cfa44743c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 34/67] ffmpeg: use upstream mvc patches +Subject: [PATCH 34/68] ffmpeg: use upstream mvc patches --- ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ @@ -47271,10 +47355,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From a31ff8c43a33afc551e852ac68dcce470c418c67 Mon Sep 17 00:00:00 2001 +From 0728f32f0d6eec99e1925062c4069d187a459da7 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 35/67] [win32] Settings: Added setting to enable/disable MVC +Subject: [PATCH 35/68] [win32] Settings: Added setting to enable/disable MVC decoder. --- @@ -47304,10 +47388,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9 -From 8accdc748ba93a0ff8406a12da77b3456887eea9 Mon Sep 17 00:00:00 2001 +From 4f033de223f29d7d3dd4e925d5f51c67dfa98e82 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 36/67] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc +Subject: [PATCH 36/68] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc streams. --- @@ -47370,10 +47454,10 @@ index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff81 } case AVMEDIA_TYPE_DATA: -From f24fa3672ebcb63848be6e7b3669f7034616287c Mon Sep 17 00:00:00 2001 +From 365c13cd712926583d19d8ab4afbb60cf2ee40a2 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 37/67] [Stereo3D] Added block_lr and block_rl to supported +Subject: [PATCH 37/68] [Stereo3D] Added block_lr and block_rl to supported modes. --- @@ -47423,10 +47507,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814 i++; } -From b61e26e406192689178f2059d91ce73d10cf0a5c Mon Sep 17 00:00:00 2001 +From 10eba95271f94477d62a8e479810365a18c91e7d Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 38/67] [VideoPlayer] Fix possible wrong aspect. +Subject: [PATCH 38/68] [VideoPlayer] Fix possible wrong aspect. --- xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- @@ -47446,10 +47530,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd else m_fForcedAspectRatio = 0.0; -From 88e75af3d50f9e4c2912317f3f3713372a472fec Mon Sep 17 00:00:00 2001 +From 421ce0b26a2446438200d4f320febb3aca94564b Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 39/67] [VideoPlayer] DemuxFFmpeg: ssif remux +Subject: [PATCH 39/68] [VideoPlayer] DemuxFFmpeg: ssif remux --- xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + @@ -47870,7 +47954,7 @@ index e4f8aed0af96fe0dceec4d8517087742f2c7df81..30076937bd084936571abf0e6eeecf5a LIB = DVDDemuxers.a diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 3478719e18e9430224542c3ed825cd036e975434..748354c94045ca279801464930e98bd57963de96 100644 +index cca5c7f932241d146291d2bb0a0042f99fa0d596..edbc96f7be3ae4dae994320f8c137555c927d455 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -391,7 +391,7 @@ void CAdvancedSettings::Initialize() @@ -47883,10 +47967,10 @@ index 3478719e18e9430224542c3ed825cd036e975434..748354c94045ca279801464930e98bd5 m_discStubExtensions = ".disc"; // internal music extensions -From 91fa36649e96a95270e2296449aaa7aa92a25713 Mon Sep 17 00:00:00 2001 +From 5b946c59476a5132ec920cd1aeee00e61473c67c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 40/67] [3DBD] Added support of 3D-BluRay playback. +Subject: [PATCH 40/68] [3DBD] Added support of 3D-BluRay playback. --- lib/DllLibbluray.h | 8 + @@ -48876,10 +48960,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 7c59c8fe5dfd19c92cd01adba7203588fc9a05cf Mon Sep 17 00:00:00 2001 +From 7f62ce78ecb3391a3f6d60365d348edb4f2aafd0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 41/67] [VideoPlayer] HasVideo returns true if video stream +Subject: [PATCH 41/68] [VideoPlayer] HasVideo returns true if video stream exists. This don't allow start visualization if audio is opened before video. --- @@ -48887,7 +48971,7 @@ Subject: [PATCH 41/67] [VideoPlayer] HasVideo returns true if video stream 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index defe4e44a4cca76527186abb989dcb847e1431cd..b45b7573636de0cecd86606d942d5e3baf214c91 100644 +index f206847aa8bd9e57c9e558362ef0728fd7737efd..b533aa5395dac512d3b153b44b86d2fa7276ddb2 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -3074,7 +3074,7 @@ void CVideoPlayer::Pause() @@ -48900,10 +48984,10 @@ index defe4e44a4cca76527186abb989dcb847e1431cd..b45b7573636de0cecd86606d942d5e3b bool CVideoPlayer::HasAudio() const -From 21b67480972e81a6892a02477468fc4d33d786c4 Mon Sep 17 00:00:00 2001 +From 8f4f33f8ce611f3a621f273c99eff401adad8f95 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 42/67] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 42/68] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -48940,10 +49024,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45 CDVDOverlayImage* overlay = new CDVDOverlayImage(); -From 7fe6612e145e2868b058726f22dfcd8292092aa5 Mon Sep 17 00:00:00 2001 +From 684733427abe150f550c4e9153c3f4ac11b5eb02 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 43/67] [VideoPlayer] Disable reading extension stream from +Subject: [PATCH 43/68] [VideoPlayer] Disable reading extension stream from input stream if decoder doesn't support it. --- @@ -49173,7 +49257,7 @@ index 0b676c9b611fe956f1aa721013412e41ff5b62f6..6762e733848d1298a75a862b0aaf81aa class CDVDAudioCodec; diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index b45b7573636de0cecd86606d942d5e3baf214c91..ccc371d723b386eb76f022f794c7563d70e1dadd 100644 +index b533aa5395dac512d3b153b44b86d2fa7276ddb2..505747a6d7c45c0a4e67fefa711c85dd5236e35d 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -3802,6 +3802,10 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset) @@ -49200,10 +49284,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1 // classes CDVDOverlayContainer* m_pOverlayContainer; -From 29f7bc99e15245a3303f2b70c46b6c3f4d15fd84 Mon Sep 17 00:00:00 2001 +From 59cb640ab14a7a9cebcf33173fb527043c408079 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 44/67] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from +Subject: [PATCH 44/68] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from platform settings to common settings. --- @@ -49299,10 +49383,10 @@ index 473ca093f45f6a5779cade1268269bb7ba483e9d..11a422b1a5cbfde9914d3bfd23b5b540 m_simpleConditions.insert("have_lcms2"); #endif -From 6cafd78f07821d41e50d95015e7531b47ff4ba22 Mon Sep 17 00:00:00 2001 +From d83f42e75f32b1fa65118aee75d5924ba6422c49 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 45/67] [VideoPlayer] SSIF: fix for corner case when mvc stream +Subject: [PATCH 45/68] [VideoPlayer] SSIF: fix for corner case when mvc stream is switched before the last packet is read from previous stream. --- @@ -49491,33 +49575,33 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9 typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From a94a694d85b3f7bb7ebd528cbff1c22500dcd033 Mon Sep 17 00:00:00 2001 +From a302ecf71dca436add6e414416abde1dbff9f37c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 46/67] [libbluray] bump libbluray to 0.9.2-mvc. +Subject: [PATCH 46/68] [libbluray] bump libbluray to 0.9.2-mvc. --- project/BuildDependencies/scripts/0_package.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list -index 3ca0ecb8b91f4db2a0dae1f0fac217bd18c7bc43..48f6088640142b2d40d9a4bce525baa87d3278a3 100644 +index 33f87aec9968a24f5c9ba35ab5ea2eb1786feaf9..4fdebd9401b40ca18a474aece3e27f4b696c9d5b 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list -@@ -17,7 +17,7 @@ freetype-dc2b38-win32-vc140-v2.7z +@@ -17,7 +17,7 @@ freetype-db5a22-win32-vc140.7z giflib-5.1.4-win32-vc140.7z jsonschemabuilder-1.0.0-win32-3.7z - libass-6aaaf5-win32-vc140.7z + libass-ddb383-win32-vc140.7z -libbluray-0.9.3-win32-vc140.7z +libbluray-0.9.2-mvc-win32-vc120.7z libcdio-0.9.3-win32-vc140.7z libcec-4.0.1-win32-vc140-2.7z libfribidi-0.19.2-win32.7z -From 4b4f63b3b9083dc559680a33095ffd21ec6c8d81 Mon Sep 17 00:00:00 2001 +From 73a2044f791aa2854f68a3fcabad3f322cf88b50 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 47/67] libbluray: Bump to Nevcairie's v0.9.2 +Subject: [PATCH 47/68] libbluray: Bump to Nevcairie's v0.9.2 This includes 3D support --- @@ -51174,10 +51258,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From 05f619cf0bde4209267f1de6270e7fc93718b0d7 Mon Sep 17 00:00:00 2001 +From 005b8b0aafa1e915d35af44951f31517af6f21e6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 48/67] mvc: Automatically enable stereo mode +Subject: [PATCH 48/68] mvc: Automatically enable stereo mode --- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- @@ -51235,10 +51319,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 0792d059c421811de7a52b55638373c26c21e008 Mon Sep 17 00:00:00 2001 +From 8aa8a74b93220298b5a0634b2b15067c752805fd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 49/67] ffmpeg: mvc: fix for pixelation from packets with no +Subject: [PATCH 49/68] ffmpeg: mvc: fix for pixelation from packets with no pts/dts --- @@ -51300,10 +51384,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 7cca3aef831e26c2e43a92646a0243b58486981d Mon Sep 17 00:00:00 2001 +From d72e410373784b1c11de8d8a96993678eb4d90ad Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 50/67] stereoscopicmanager: fixups for rbp +Subject: [PATCH 50/68] stereoscopicmanager: fixups for rbp --- xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ @@ -51541,10 +51625,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782 }; -From 780c207fcd4e086d32f74d6a097642ba86b8b8a3 Mon Sep 17 00:00:00 2001 +From 3c8a76f384bb29cf19d3838d115cdcbc91f0a002 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 51/67] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 51/68] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -51564,10 +51648,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18 } -From be1121b5490ba594b4338223d0587c4ce12b6030 Mon Sep 17 00:00:00 2001 +From 097f3f179d98342367c7d3585c44b24eb3fa8eed Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 52/67] DemuxMVC: fixup after SeekTime API change +Subject: [PATCH 52/68] DemuxMVC: fixup after SeekTime API change --- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- @@ -51601,10 +51685,36 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425 virtual int GetStreamLength() { return 0; }; virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -From 76a51144a06e9b8147407ccb4d6fe926e8a7816b Mon Sep 17 00:00:00 2001 +From b8be297f0b24924f32af51950557b29ed45ba42f Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 3 Nov 2014 23:17:46 +0000 +Subject: [PATCH 53/68] [cec] Don't discard buttons when repeat mode is enabled + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 30367a3fde956090afdca9930fa52e829f35046f..febacb3b7964eab3b8615a6a807e0f27d911b4da 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -803,7 +803,10 @@ void CPeripheralCecAdapter::PushCecKeypress(const CecButtonPress &key) + CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration); + + CSingleLock lock(m_critSection); +- if (key.iDuration > 0) ++ // avoid the queue getting too long ++ if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5) ++ return; ++ if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0) + { + if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) + { + +From 0574f5f0334a0cce8227f141469b67590e6d1f2b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 54/67] [cec] Temp - more logging +Subject: [PATCH 54/68] [cec] Temp - more logging --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- @@ -51656,10 +51766,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a } -From 205a27d0a81ab333c53a786a00dffae7e1d6205f Mon Sep 17 00:00:00 2001 +From 38fa33062a3468b80b58951e2636adbf0e681e6f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 55/67] rbp: Hard code the number of buffers to improve audio +Subject: [PATCH 55/68] rbp: Hard code the number of buffers to improve audio sync --- @@ -51701,10 +51811,10 @@ index fd8a0a2447c40357a9e13003f2ef45ef20ccb205..be0de0d962fd374bc17bfa48a27ca17d } -From ac68b8f32842e24009e2de53e42fa6775af263a8 Mon Sep 17 00:00:00 2001 +From ec9bbb9cc255dceaedaed291a6053a544c8f5cc0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 56/67] rbp: Update the GL libs to new naming scheme +Subject: [PATCH 56/68] 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. @@ -51718,7 +51828,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index a37c8c5d2d92194731203b19a5cf8a369e96d3fa..772facc7c837e730317b8708800741efc608a9c9 100644 +index 9bd8d6ec09ff5cf0c6e6caf39850f650f1dd2665..291ff72c1845037f97e215232ab1c2667687f289 100644 --- a/configure.ac +++ b/configure.ac @@ -949,7 +949,7 @@ if test "$use_gles" = "yes"; then @@ -51769,10 +51879,10 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71 fi -From 9838684c2520a11221010731a75d1ee556216205 Mon Sep 17 00:00:00 2001 +From 18d96915a596a96c9b73b480331455c06226910a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 57/67] ffmpeg: hacky fix for files with GMC +Subject: [PATCH 57/68] ffmpeg: hacky fix for files with GMC --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- @@ -51794,10 +51904,10 @@ index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675 { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From d31579fe437b86fb71198d5f077645cfaae0f017 Mon Sep 17 00:00:00 2001 +From 0fa6a704aaa9a1e94e78728815bf492b2f383670 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 58/67] mmalrender: Add sharpness control +Subject: [PATCH 58/68] mmalrender: Add sharpness control --- addons/resource.language.en_gb/resources/strings.po | 2 +- @@ -51869,10 +51979,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From bf759c6dad91e60580981c29146bf495a18167cf Mon Sep 17 00:00:00 2001 +From 90fcda3eef3bf74f8baec388a2d975c4a915033a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 59/67] MMALFFMpeg: Report as SW decode in codec overlay info +Subject: [PATCH 59/68] MMALFFMpeg: Report as SW decode in codec overlay info --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- @@ -51892,10 +52002,10 @@ index 8bace5b3eb98b3b1ddad7f56af83a41ae067bc75..c820a04c903866862b5ff04b38124ff0 CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); } -From 8c3b6d8a7d39d535cc73cd5d0479fb2a01fd1171 Mon Sep 17 00:00:00 2001 +From 33381091746e0719b21818bfd5f3bba8439a9f70 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Nov 2016 18:28:01 +0000 -Subject: [PATCH 60/67] advancedsettings: Add option to set cache size on +Subject: [PATCH 60/68] advancedsettings: Add option to set cache size on libass E.g to set total cache size in libass to 32M @@ -51961,7 +52071,7 @@ index f9de4f15e7c612d69ef46e7cad870ecb61afaec3..b5303fd100f1a930eb5c010a95193206 END_METHOD_RESOLVE() }; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 748354c94045ca279801464930e98bd57963de96..5bdd6244e28c8320e18fed5148d332da19801221 100644 +index edbc96f7be3ae4dae994320f8c137555c927d455..7f3325392993823b8d2d6a915579c48401ca2c12 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -364,6 +364,8 @@ void CAdvancedSettings::Initialize() @@ -51997,10 +52107,10 @@ index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97 unsigned int m_jsonTcpPort; -From 4ce0c7911dba73b04ae32cb813b9a5fca1d44998 Mon Sep 17 00:00:00 2001 +From 5a7d0e7aefb3a1ea7a11056cd6b4148ce24abe0e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 13 Nov 2016 20:30:15 +0000 -Subject: [PATCH 61/67] [rbp] Experimental limit libass cache size depending on +Subject: [PATCH 61/68] [rbp] Experimental limit libass cache size depending on arm memory size --- @@ -52031,7 +52141,7 @@ index 6e8529001b1a464b4547a846f553d98f5bc0b6c0..238eba372af2cbab11d7543c857ee476 response[sizeof(response) - 1] = '\0'; CLog::Log(LOGNOTICE, "Config:\n%s", response); diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 5bdd6244e28c8320e18fed5148d332da19801221..95a9d347049dbfa04d74248dce9167a6896566dc 100644 +index 7f3325392993823b8d2d6a915579c48401ca2c12..410ad30aeb60316e9438ee56aaca7e73f0b3bedd 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -361,8 +361,10 @@ void CAdvancedSettings::Initialize() @@ -52046,10 +52156,10 @@ index 5bdd6244e28c8320e18fed5148d332da19801221..95a9d347049dbfa04d74248dce9167a6 m_libAssCache = 0; -From 8f293b32905920446d7d84c031a01ef451e8fa4c Mon Sep 17 00:00:00 2001 +From 41b760881da0c4440e9e19041ab856d239785d0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 22 Jun 2015 21:46:57 +0100 -Subject: [PATCH 62/67] [rbp] Use default resampling setting on Pi2 +Subject: [PATCH 62/68] [rbp] Use default resampling setting on Pi2 --- system/settings/rbp2.xml | 5 +++++ @@ -52072,10 +52182,10 @@ index 50bd55e9c90864c1ff4c36c4650e9ec247737a44..f218216e615d9723e5a163aab9c42ca5 -From d96d809cdb68c8299b0b6771a11eb390060df5b8 Mon Sep 17 00:00:00 2001 +From f5b8dc97e759784ef8644aa47bf7049f87ca48ee Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 1 Dec 2016 17:06:01 +0000 -Subject: [PATCH 63/67] MMALRender: Allow advanced deinterlace with software +Subject: [PATCH 63/68] MMALRender: Allow advanced deinterlace with software decode Uses YUV420 directly which improves performance. @@ -52098,10 +52208,10 @@ index f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9..05cbd8eeaef1a21fc32ea1fa23ea686e status = mmal_port_format_commit(m_deint_output); if (status != MMAL_SUCCESS) -From 38b097a6d6653267c52de2a2d5f6a09c39642684 Mon Sep 17 00:00:00 2001 +From 38c1467506f79354d682fdc0ac485d28c717365c Mon Sep 17 00:00:00 2001 From: Nuno Senica Date: Tue, 27 Dec 2016 20:59:56 +0000 -Subject: [PATCH 64/67] Apply ffmpeg patches automatically after downloading +Subject: [PATCH 64/68] Apply ffmpeg patches automatically after downloading and extracting the ffmpeg tar ball --- @@ -52109,10 +52219,10 @@ Subject: [PATCH 64/67] Apply ffmpeg patches automatically after downloading 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 3d7fcc8ca30224fc589c720e37102588f3739448..486842e9bd6c6e7c65ca0dd9c2a6fc6f26169a5d 100644 +index 7c68b4c3d09a037d3b85c81604d47a7ea6dd1c21..eec635ef493d13ea97c9b806eb57cccbc452297d 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake -@@ -260,7 +260,17 @@ if(NOT FFMPEG_FOUND) +@@ -261,7 +261,17 @@ if(NOT FFMPEG_FOUND) && ${CMAKE_COMMAND} -E copy ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake @@ -52132,10 +52242,10 @@ index 3d7fcc8ca30224fc589c720e37102588f3739448..486842e9bd6c6e7c65ca0dd9c2a6fc6f file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper "#!/bin/bash -From 41d5ae2774e4c5ed6386180c1553f129a1be549c Mon Sep 17 00:00:00 2001 +From 85308cfc4c4cadea966028f36d133c436dee0f44 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 1 May 2016 19:56:43 +0100 -Subject: [PATCH 65/67] omxplayer: Avoid CAEFactory::Suspend which should only +Subject: [PATCH 65/68] omxplayer: Avoid CAEFactory::Suspend which should only be called by application --- @@ -52235,10 +52345,10 @@ index db7f98ddbc2db2f20bdc42379df3f08eba165bfc..02acfc8cfe57446be4e00b991ef6fde9 COMXCoreComponent m_omx_render_analog; COMXCoreComponent m_omx_render_hdmi; -From a6419a20e48ee45774ef61d41ae9124228e632ca Mon Sep 17 00:00:00 2001 +From 7e1af74827644365c69208d25e6aa81ce6c4bc96 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 1 Mar 2017 21:40:22 +0000 -Subject: [PATCH 66/67] MMALRender: default to bob (x2) deinterlace for HD +Subject: [PATCH 66/68] 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 +52390,10 @@ index 39bc0530cecd54ae8c3a5481c92f1a6a18a4d9c5..cb0a06888a919879155fea2a689c1bae if (m_deinterlace && interlace_method != VS_INTERLACEMETHOD_NONE) { -From 58b2734d76c3e32caed3ed96da93b3b02391c8d8 Mon Sep 17 00:00:00 2001 +From ebd0a42fa87037a9cf90eeb0d6b8187d787a866a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Feb 2017 17:58:13 +0000 -Subject: [PATCH 67/67] ffmpeg: Update hevc optimisation to use the gpu service +Subject: [PATCH 67/68] ffmpeg: Update hevc optimisation to use the gpu service --- project/cmake/modules/FindFFMPEG.cmake | 14 +- @@ -52293,10 +52403,10 @@ Subject: [PATCH 67/67] ffmpeg: Update hevc optimisation to use the gpu service 4 files changed, 16342 insertions(+), 35924 deletions(-) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 486842e9bd6c6e7c65ca0dd9c2a6fc6f26169a5d..92e79eb225640bb8a965ee63b3fd5c743e09758f 100644 +index eec635ef493d13ea97c9b806eb57cccbc452297d..301534c5b0113815f9a196fdd0ed9db6ff587cda 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake -@@ -261,14 +261,14 @@ if(NOT FFMPEG_FOUND) +@@ -262,14 +262,14 @@ if(NOT FFMPEG_FOUND) ${CMAKE_COMMAND} -E copy ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake && @@ -105594,3 +105704,128 @@ index e172ebf157aebffe1ae50b4a2b25fd71bc708c93..852815d5f4ae80771c5304f6f3520b5e ++pi-util/rebase_liblinks.py $DST ++ ++ + +From 7b463eb51346ae788f1f12bb89f8cf2102c14241 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Sat, 4 Mar 2017 19:25:40 +0000 +Subject: [PATCH 68/68] ffmpeg: Call get_format to fix an issue with MMAL + rendering + +--- + project/cmake/modules/FindFFMPEG.cmake | 3 +- + ...-get_format-to-fix-an-issue-with-MMAL-ren.patch | 55 ++++++++++++++++++++++ + tools/depends/target/ffmpeg/Makefile | 4 +- + tools/depends/target/ffmpeg/autobuild.sh | 2 + + 4 files changed, 62 insertions(+), 2 deletions(-) + create mode 100644 tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + +diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake +index 301534c5b0113815f9a196fdd0ed9db6ff587cda..2cfd61642d52f05a84bea5ca7eb1766ad8e8ddbd 100644 +--- a/project/cmake/modules/FindFFMPEG.cmake ++++ b/project/cmake/modules/FindFFMPEG.cmake +@@ -270,7 +270,8 @@ if(NOT FFMPEG_FOUND) + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch && + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch && + #patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch && +- patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch && ++ patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + ) + + file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper +diff --git a/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch b/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch +new file mode 100644 +index 0000000000000000000000000000000000000000..37b53e8fb6974b5330e0e05f74a1f2c760693bf8 +--- /dev/null ++++ b/tools/depends/target/ffmpeg/0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch +@@ -0,0 +1,55 @@ ++From 7adc8f706efab65d8d7e5f960690faca3d5c190d Mon Sep 17 00:00:00 2001 ++From: popcornmix ++Date: Sat, 4 Mar 2017 19:24:02 +0000 ++Subject: [PATCH] ffmpeg: Call get_format to fix an issue with MMAL rendering ++ ++--- ++ libavcodec/dvdec.c | 7 +++++++ ++ libavcodec/rv34.c | 6 +++++- ++ 2 files changed, 12 insertions(+), 1 deletion(-) ++ ++diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c ++index 0b4c1bc..00081ef 100644 ++--- a/libavcodec/dvdec.c +++++ b/libavcodec/dvdec.c ++@@ -49,6 +49,7 @@ ++ #include "internal.h" ++ #include "put_bits.h" ++ #include "simple_idct.h" +++#include "thread.h" ++ ++ typedef struct BlockInfo { ++ const uint32_t *factor_table; ++@@ -196,6 +197,12 @@ static av_cold int dvvideo_decode_init(AVCodecContext *avctx) ++ s->idct_put[0] = idsp.idct_put; ++ s->idct_put[1] = ff_simple_idct248_put; ++ +++ static const enum AVPixelFormat pix_fmts[] = { +++ AV_PIX_FMT_YUV420P, +++ AV_PIX_FMT_NONE +++ }; +++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); +++ ++ return ff_dvvideo_init(avctx); ++ } ++ ++diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c ++index aca8382..f473f6c 100644 ++--- a/libavcodec/rv34.c +++++ b/libavcodec/rv34.c ++@@ -1493,7 +1493,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ++ ff_mpv_decode_init(s, avctx); ++ s->out_format = FMT_H263; ++ ++- avctx->pix_fmt = AV_PIX_FMT_YUV420P; +++ static const enum AVPixelFormat pix_fmts[] = { +++ AV_PIX_FMT_YUV420P, +++ AV_PIX_FMT_NONE +++ }; +++ avctx->pix_fmt = ff_get_format(avctx, pix_fmts); ++ avctx->has_b_frames = 1; ++ s->low_delay = 0; ++ ++-- ++2.7.4 ++ +diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile +index 11e92a9ad618b748cad4831fa6af7565e29081ab..96abff05829e365545aaccf3aa78915e273fb93c 100644 +--- a/tools/depends/target/ffmpeg/Makefile ++++ b/tools/depends/target/ffmpeg/Makefile +@@ -7,7 +7,8 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile \ + 0001-Squashed-commit-of-the-following.patch \ + 0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch 0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch \ + h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch \ +- 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ 73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch \ ++ 0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + # set to "yes" to enable patching + # we don't apply patches until we move to a vanilla ffmpeg tarball +@@ -97,6 +98,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) + #cd $(PLATFORM); patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch + #cd $(PLATFORM); patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch + cd $(PLATFORM); patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++ cd $(PLATFORM); patch -p1 < ../0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + cd $(PLATFORM);\ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ +diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh +index 3d970429012c1f3aede4df0545ced5006c165d50..e070d96fc340f5bff94d72ae9004c4a91ec5198c 100755 +--- a/tools/depends/target/ffmpeg/autobuild.sh ++++ b/tools/depends/target/ffmpeg/autobuild.sh +@@ -140,6 +140,8 @@ patch -p1 < ../pfcd_hevc_optimisations.patch + #patch -p1 < ../0001-avcodec-add-h264_mvc-codec-id-and-profiles.patch + #patch -p1 < ../0001-h264_parser-add-support-for-parsing-h264-mvc-NALUs.patch + #patch -p1 < ../h264_parser_fix_parsing_of_mvc_slices_in_some_corner_cases.patch ++patch -p1 < ../73fde6f9f3d01f7fc0f3ae4b66f6c725f9fb1105.patch ++patch -p1 < ../0001-ffmpeg-Call-get_format-to-fix-an-issue-with-MMAL-ren.patch + + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ + ./configure --prefix=$FFMPEG_PREFIX \