From ffae2894de52699d861e8f7cf9bf06a4afd820e4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 16 Dec 2016 11:09:27 -0800 Subject: [PATCH 1/4] bcm2835-driver: install static libraries into the sysroot --- packages/graphics/bcm2835-driver/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 655ae902eb..233d533cc5 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -45,6 +45,7 @@ make_target() { cp -PRv $FLOAT/opt/vc/lib/*.so $SYSROOT_PREFIX/usr/lib ln -sf $SYSROOT_PREFIX/usr/lib/libbrcmEGL.so $SYSROOT_PREFIX/usr/lib/libEGL.so ln -sf $SYSROOT_PREFIX/usr/lib/libbrcmGLESv2.so $SYSROOT_PREFIX/usr/lib/libGLESv2.so + cp -PRv $FLOAT/opt/vc/lib/*.a $SYSROOT_PREFIX/usr/lib } makeinstall_target() { From 5759404c2c52292e53dbced818879b9e4a59f319 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 16 Dec 2016 10:44:51 -0800 Subject: [PATCH 2/4] kodi: update to 17.0-beta7-7581c4a --- packages/mediacenter/kodi-theme-Estuary/package.mk | 2 +- packages/mediacenter/kodi/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk index fe20419b09..d845508e58 100644 --- a/packages/mediacenter/kodi-theme-Estuary/package.mk +++ b/packages/mediacenter/kodi-theme-Estuary/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-theme-Estuary" -PKG_VERSION="17.0-beta6-654f1b7" +PKG_VERSION="17.0-beta7-7581c4a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index c9fc39a279..3fcad429d2 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="17.0-beta6-654f1b7" +PKG_VERSION="17.0-beta7-7581c4a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From a53882b4d0b25a59656d3866807543b5697ecbdc Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 16 Dec 2016 10:45:10 -0800 Subject: [PATCH 3/4] kodi-binary-addons: update to latest --- .../mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk | 2 +- .../kodi-binary-addons/inputstream.adaptive/package.mk | 2 +- .../kodi-binary-addons/peripheral.joystick/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk | 2 +- .../mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk | 2 +- .../mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk | 2 +- .../mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk | 2 +- .../kodi-binary-addons/pvr.mediaportal.tvserver/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk | 2 +- packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk | 2 +- .../kodi-binary-addons/visualization.projectm/package.mk | 2 +- .../kodi-binary-addons/visualization.spectrum/package.mk | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk index fc8177440f..9a9d587cc4 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="audiodecoder.dumb" -PKG_VERSION="f000b7d" +PKG_VERSION="6c15ef8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index ffb26edb79..da9f56bc80 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="ab78291" +PKG_VERSION="fc86263" 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 fa49729e34..b947a64e2d 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="d09e0c6" +PKG_VERSION="987a818" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk index d0d51b87c6..8e2bcfe4e3 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.argustv" -PKG_VERSION="7d3bdba" +PKG_VERSION="aff4142" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk index 1d8364044a..f37c190645 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.demo" -PKG_VERSION="9ebc62c" +PKG_VERSION="147fd97" PKG_REV="1" 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 4d9bde0eb5..be4018cb79 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="42207a0" +PKG_VERSION="fc24ba5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk index 9dd4d0d9bf..43c40c2a8b 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.dvbviewer" -PKG_VERSION="2449df9" +PKG_VERSION="a6c7652" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk index 754c89951f..2a9ed5a0bb 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.filmon" -PKG_VERSION="ca709b9" +PKG_VERSION="d490810" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk index 04fdcb2464..cde8f7ad08 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.hdhomerun" -PKG_VERSION="ef45d3f" +PKG_VERSION="c4eeb1d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk index 65e52b1cc4..0d77b36ffb 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.hts" -PKG_VERSION="4f406f4" +PKG_VERSION="f275132" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index 7cf440593a..040d33167c 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.iptvsimple" -PKG_VERSION="d69778e" +PKG_VERSION="d2531ac" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk index 245ed0ee0a..3aa05332fb 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.mediaportal.tvserver" -PKG_VERSION="8ba6a79" +PKG_VERSION="6cce554" 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 5b74be0427..1bd32b2130 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="b22cfa0" +PKG_VERSION="313bab6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index 66aaf6757e..1bfbcd237a 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.nextpvr" -PKG_VERSION="fe85f2a" +PKG_VERSION="fd6b845" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk index a81f2c43fb..af6dff9764 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.njoy" -PKG_VERSION="3a32276" +PKG_VERSION="57393bd" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk index 0fc65c677b..06599ba1bc 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.pctv" -PKG_VERSION="e829beb" +PKG_VERSION="9bbf2aa" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index 1886ac36d5..89e3106de3 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.stalker" -PKG_VERSION="fd800fd" +PKG_VERSION="c89f640" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk index 49ba2cf681..eb2aacceab 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.vbox" -PKG_VERSION="4bc6f1e" +PKG_VERSION="c1a141b" 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 27b0d470e9..4d3bb33d72 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="4b06d83" +PKG_VERSION="64d7033" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk index 5301aefe16..7173337e54 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.vuplus" -PKG_VERSION="d2c5442" +PKG_VERSION="763a644" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk index 83a48d6ada..12f0196c6e 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.wmc" -PKG_VERSION="bffb41d" +PKG_VERSION="a0ec457" 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 5f37b3532c..15b8aeb457 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="0487ebb" +PKG_VERSION="c5a86e9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk index 1cd0c7f426..7108dd4e68 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="visualization.spectrum" -PKG_VERSION="b3ed787" +PKG_VERSION="73c8786" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 5c4119be390772ddbaad1014ffc082eaaead19ac Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 16 Dec 2016 11:08:44 -0800 Subject: [PATCH 4/4] RPi/RPi2: Update kodi support patches --- .../RPi/patches/kodi/kodi-001-backport.patch | 633 +++++++++--------- .../RPi2/patches/kodi/kodi-001-backport.patch | 633 +++++++++--------- 2 files changed, 662 insertions(+), 604 deletions(-) diff --git a/projects/RPi/patches/kodi/kodi-001-backport.patch b/projects/RPi/patches/kodi/kodi-001-backport.patch index b84fadf6ce..959635340f 100644 --- a/projects/RPi/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi/patches/kodi/kodi-001-backport.patch @@ -1,39 +1,7 @@ -From 78147d45acfa1e8416b3c86888aaf68d64bb584e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 11 Nov 2016 14:03:29 +0000 -Subject: [PATCH 01/63] cec: fixup strings after PR 10775 - ---- - system/peripherals.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index ed707b6767f6fc9184adf2090810b5b1ad89d10d..d5704b249c3065b2980dc92c7c81dc7b384187bc 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -16,7 +16,7 @@ - - - -- -+ - - - -@@ -24,7 +24,7 @@ - - - -- -+ - - - - -From 1febcd53bb19499e0820cb7bcaaf39619d8a3666 Mon Sep 17 00:00:00 2001 +From 6100acd857e81c9b9bf070ea6ffdbf3b19ff4be3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Oct 2014 00:19:40 +0000 -Subject: [PATCH 02/63] [cec] Add settings for configuring button repeats +Subject: [PATCH 01/63] [cec] Add settings for configuring button repeats --- addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ @@ -114,10 +82,10 @@ index d032ffd707fee5eec035e90bdf618530f7215c37..30367a3fde956090afdca9930fa52e82 if (GetSettingBool("pause_playback_on_deactivate")) { -From b713d931abc454fd9248650c21b93820688e8f5b Mon Sep 17 00:00:00 2001 +From d21b9db3a87136ff290fc377ab8e412efa76a085 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 03/63] [cec] Don't suspend pi on tv switch off - it can't wake +Subject: [PATCH 02/63] [cec] Don't suspend pi on tv switch off - it can't wake up --- @@ -138,10 +106,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325 -From 2971cf8df975ab6fc221bf1d5342d3371ce5b41e Mon Sep 17 00:00:00 2001 +From eac4b3bc8918309f1593491fa1285c95fdacf918 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 21 Apr 2016 16:49:02 +0100 -Subject: [PATCH 04/63] Revert "[settings] remove show EXIF picture information +Subject: [PATCH 03/63] Revert "[settings] remove show EXIF picture information setting" This reverts commit e7d90188436b6966eff23fd695e1a9d18f4af1b4. @@ -264,10 +232,10 @@ index 482f61db8aab70aff4013fee2f1c73a5b5a9b4a9..269a3a741340d60354037166c3b03ddf static const std::string SETTING_PICTURES_SHOWVIDEOS; static const std::string SETTING_PICTURES_DISPLAYRESOLUTION; -From 1a444eea815b96b8d61c847161d08452022c2192 Mon Sep 17 00:00:00 2001 +From ffcec98caeb49b2e639fd505dd5df3e11b595597 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 05/63] [rbp/omxplayer] When opening a stream don't try to +Subject: [PATCH 04/63] [rbp/omxplayer] When opening a stream don't try to update gui so often --- @@ -291,10 +259,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 68f330731015a5b4abbacbd458c8309e9729fd76 Mon Sep 17 00:00:00 2001 +From 3c7342f8e036cc94a1e0e9ccc40e19eff1651c1a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 -Subject: [PATCH 06/63] [hifiberry] Hack: force it to be recognised as IEC958 +Subject: [PATCH 05/63] [hifiberry] Hack: force it to be recognised as IEC958 capable to enable passthrough options --- @@ -317,10 +285,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From 76cd8f440e9203cc4ba28a0bbeede281dc391559 Mon Sep 17 00:00:00 2001 +From 3385f3da75439f79d3de874ad5f6b4fdbcc7645d Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 07/63] Improved file buffering in CArchive +Subject: [PATCH 06/63] 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 @@ -380,10 +348,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 46eb2adb4e1c586c374f9bedeac9fef6f2dca4f0 Mon Sep 17 00:00:00 2001 +From b98d7ff674f63e984d28446de3fdd882517a79d6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 08/63] filesystem: Make support of browsing into archives +Subject: [PATCH 07/63] 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. @@ -493,10 +461,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From 5a6fdf25a8adde963039cf03732fda057bca72a5 Mon Sep 17 00:00:00 2001 +From 92e911331efde359883afd9681398a70a62e843c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 09/63] [rbp] Make cachemembuffersize default depend on memory +Subject: [PATCH 08/63] [rbp] Make cachemembuffersize default depend on memory size --- @@ -598,10 +566,10 @@ index cc37998f0c9edfb38cf609666374cfa96530bf8f..3891a7ed34acb3489a860678d56a8ec0 } -From 366c33404013529d89c2442e09dbfdba3d6e7c34 Mon Sep 17 00:00:00 2001 +From 394fc81b6d005a775235f8d611a550f957017077 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 10/63] [settings] Experiment: Report DESKTOP resolution in +Subject: [PATCH 09/63] [settings] Experiment: Report DESKTOP resolution in video settings --- @@ -623,10 +591,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9 StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From de4036d5f101d94439763545120b52bb346f4875 Mon Sep 17 00:00:00 2001 +From 259d52ab15a53aa587770f3378bf969c257f2604 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 11/63] [audio] Add settings option to boost centre channel +Subject: [PATCH 10/63] [audio] Add settings option to boost centre channel when downmixing This allows a dB volume increase to be added to centre channel. @@ -752,10 +720,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From abc2a09d9cb7b423a37f1dfae6f198dfa361f1af Mon Sep 17 00:00:00 2001 +From ae94a4eb877dd5b1f9db1ead2ed0b4f4ea6391a0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 12/63] [rbp] Default extract thumbnails to false +Subject: [PATCH 11/63] [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 @@ -781,10 +749,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From 747d6a7aa129348078f5b4e36d47bbc1307806a8 Mon Sep 17 00:00:00 2001 +From 1e96dc54fc2957b799f73866b2bd50dfd9464b5b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 13/63] [languageinvoker] Reduce priority of python threads +Subject: [PATCH 12/63] [languageinvoker] Reduce priority of python threads --- xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ @@ -807,10 +775,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From 0732dc96e4f4e84c14eebc953e3cf571363afb34 Mon Sep 17 00:00:00 2001 +From ce1cb36c6ef3bf2ef267b6169b57dc41cac2a6c2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 14/63] [rbp] hack: wait for splash to complete before changing +Subject: [PATCH 13/63] [rbp] hack: wait for splash to complete before changing hdmi mode --- @@ -894,10 +862,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From e182b3ca45dd427c939d6c39366664e9afb382a8 Mon Sep 17 00:00:00 2001 +From 884539fb7d73eb73519a3f5b6577f9bda428fb26 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 15/63] Fix for UI not showing both extractflags and +Subject: [PATCH 14/63] Fix for UI not showing both extractflags and extractthumb --- @@ -960,10 +928,10 @@ index 9ce9e725aec4d8ed000200342a2a99f3bc34a749..326ffbd0f08428c3b4a95208134253fe -From 31ef126da025be5761a86664e2c9428f5208f2ae Mon Sep 17 00:00:00 2001 +From 94e0f0e873c766e5462e40529ba06c21793d9be4 Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 16/63] Disable autoscrolling while on screensaver and while +Subject: [PATCH 15/63] Disable autoscrolling while on screensaver and while opening streams. --- @@ -976,10 +944,10 @@ Subject: [PATCH 16/63] Disable autoscrolling while on screensaver and while 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 100a2f2cd2a097ec275751a75e82500324166757..6e5c33c1118cbda79a614d90c6ca4b610f338c87 100644 +index 2dbe4c1728636ea269ab6c770d37433fa720ecb1..a4eac32be2091e4b5d432d2c32266a7348eab0ee 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -5240,3 +5240,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const +@@ -5233,3 +5233,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const return false; } @@ -1094,10 +1062,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From 485dc3edb739f64c1816177cc34305c9a45931df Mon Sep 17 00:00:00 2001 +From e2bab5041c584b9807532acd1b4d390e48f75a70 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 17/63] [demuxer] Avoid memcpy on every demuxer packet +Subject: [PATCH 16/63] [demuxer] Avoid memcpy on every demuxer packet Avoids an unnecessary memcpy on every demuxer packet which for high bitrate videos can be significant. @@ -1108,7 +1076,7 @@ high bitrate videos can be significant. 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3540a8f0c89e4f82b5ae3c40fe58ca8bfffd2360..fedbff21018d352d88a820c6354aa7d7d4623e79 100644 +index 33d1e5ab627d8099018190699f3b532c2b1f3b08..e015e65dea43e7b682b704edb7f468b63b8c2ac5 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -921,7 +921,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() @@ -1197,10 +1165,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 6f64ae9541cbeebd2d0169efea2e19639604d019 Mon Sep 17 00:00:00 2001 +From 8f8e1f256c747bdc7cd0953ba2f99ec3d22eda88 Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 18/63] Load OSD dialogs on startup. +Subject: [PATCH 17/63] 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. @@ -1254,7 +1222,7 @@ index eb67552344f59b8857b16c882c29e3fa62bed75c..f31572b34d376e70a35003a8c2e175b4 CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings() { } diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -index 29c2917aa5aaaf4160c8f6fafadda45a71c54835..84204c1b1a058377d9d0d03d8af7d97f35ba119f 100644 +index 398558e4d5d0cae30ee1c73e2b70e3b2f787e8fc..4e8a9b1e307a89d3a7b68402e2ff11b57e7dccd4 100644 --- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp +++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp @@ -103,7 +103,7 @@ CGUIDialogSubtitles::CGUIDialogSubtitles(void) @@ -1295,10 +1263,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 381a8656cb8bbd3a32edd2b9e7f717e3fc195ec3 Mon Sep 17 00:00:00 2001 +From 320d1c9bddbd0e838385aaecc2e87edb5fdd15aa Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 19/63] [gui] Also limit GUI updates when in non full-screen +Subject: [PATCH 18/63] [gui] Also limit GUI updates when in non full-screen video mode --- @@ -1306,10 +1274,10 @@ Subject: [PATCH 19/63] [gui] Also limit GUI updates when in non full-screen 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e55c48277 100644 +index a4eac32be2091e4b5d432d2c32266a7348eab0ee..d3e82c733998247ab0c20ed3b660dc4e70c9a542 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2780,7 +2780,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2779,7 +2779,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) #if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) // This code reduces rendering fps of the GUI layer when playing videos in fullscreen mode // it makes only sense on architectures with multiple layers @@ -1318,7 +1286,7 @@ index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e fps = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); #endif -@@ -2793,6 +2793,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2792,6 +2792,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) { if (!m_skipGuiRender) g_windowManager.Process(CTimeUtils::GetFrameTime()); @@ -1328,10 +1296,10 @@ index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e g_windowManager.FrameMove(); } -From d60d5b5d2c0fe031a50e595888a5b704e33c39b6 Mon Sep 17 00:00:00 2001 +From ba8f27ffe6778166947de1a7f7ee8de96adf3262 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 20/63] [screensaver] Leave GUI contents available for +Subject: [PATCH 19/63] [screensaver] Leave GUI contents available for screensaver --- @@ -1361,10 +1329,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac // Add window to the history list (we must do this before we activate it, -From 052ea3734af13684c6b187e4eb61d93216b50d30 Mon Sep 17 00:00:00 2001 +From 592b18d996b3bfb1ccaf26089646925d618d01b2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 21/63] ffmpeg: Automatic switch to software decode for GMC +Subject: [PATCH 20/63] ffmpeg: Automatic switch to software decode for GMC with more than one warp point --- @@ -1469,7 +1437,7 @@ index 5c2976278eb5ec5b8b4a4f9f9c7174b164ab5201..dde29adf425e54f54e4104b3370352db ./configure --prefix=$FFMPEG_PREFIX \ --extra-version="kodi-${VERSION}" \ diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 8997e3c8dfb9d37cc6c1b0706366d0b193201dd9..1884c27272ad98ba5f8cbc7f275a7d9850cfab1d 100644 +index ff3729bde30c0e46de67c4df9b01ee5846c181ee..822b7bf75f2e732b5eed8687403d0eda503fa641 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -47,6 +47,10 @@ @@ -1513,10 +1481,10 @@ index 3bb003b634c83d2c1b0ecd12b53027950e58be99..24341dc23e97e86e1b20b255548573c8 class CDemuxStreamAudio : public CDemuxStream diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fedbff21018d352d88a820c6354aa7d7d4623e79..b3bdc5a75b77af7dff90ded100a97b848db358da 100644 +index e015e65dea43e7b682b704edb7f468b63b8c2ac5..54a18c669a058b705e0276cb7e14522ae6cd04ae 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1415,7 +1415,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1416,7 +1416,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -1592,10 +1560,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From f972d5b044f4cee30fcfe87371751f35b2f56d51 Mon Sep 17 00:00:00 2001 +From 4eef9dc16f10ca8224b50c34991e3b8ce2af44db Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 22/63] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer +Subject: [PATCH 21/63] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - fixes #15794 --- @@ -1787,10 +1755,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 96c9a7bcce868adebd570d86fd3411d83c8aed9f Mon Sep 17 00:00:00 2001 +From 4eee4e41c65df8442d80d8e0e47d88f0cd720ba2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 23/63] codecoverlay: Include codec name in overlay +Subject: [PATCH 22/63] codecoverlay: Include codec name in overlay --- xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ @@ -1884,10 +1852,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From d3b64baa508e43fc2e1d108653754b3abcb3ab56 Mon Sep 17 00:00:00 2001 +From 601a1842b957786b2131a91739a008b1dfa01d9b Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 24/63] [DebugInfo] Add cpu usage info. +Subject: [PATCH 23/63] [DebugInfo] Add cpu usage info. --- .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- @@ -2057,10 +2025,10 @@ index 482142e46a714d1821d0bb25a552b043d6dcce66..54cf477648bba4583904cf122b4e66f6 m_debugTimer.Set(1000); -From eb2da354526d4f0dedd27542d28f358bafddf868 Mon Sep 17 00:00:00 2001 +From 1b441d8f8efe27734c66e6f3e7ba8d21c48708eb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 25/63] ffmpeg: Allow neon to be enabled in unified builds +Subject: [PATCH 24/63] ffmpeg: Allow neon to be enabled in unified builds --- tools/depends/target/ffmpeg/Makefile | 4 ++++ @@ -2083,10 +2051,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153 ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From f3d6aa22f4d91deedc2b54096b762a7a8d99c440 Mon Sep 17 00:00:00 2001 +From 701d02ab8b924bfab0d61bf7ceb098222e0bd074 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 26/63] ffmpeg: Add some upstream HEVC optimisations +Subject: [PATCH 25/63] ffmpeg: Add some upstream HEVC optimisations --- tools/depends/target/ffmpeg/Makefile | 6 +- @@ -5884,10 +5852,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From 86764acae60faf07ae737a25e5232fa32b69f584 Mon Sep 17 00:00:00 2001 +From 3f2249b51917db197cac915107dc8db71159f0b7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 27/63] [ffmpeg] Add GPU acceleration to hevc +Subject: [PATCH 26/63] [ffmpeg] Add GPU acceleration to hevc --- tools/depends/target/ffmpeg/Makefile | 4 +- @@ -44073,10 +44041,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 6a887bec79c0c9c51ecfdf826d9d9673bcc9f288 Mon Sep 17 00:00:00 2001 +From dc6aec941ca8f460216ca8bf66b46656715a2bfb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 28/63] ffmpeg: Add cabac opimisations for hevc +Subject: [PATCH 27/63] ffmpeg: Add cabac opimisations for hevc --- .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ @@ -46321,10 +46289,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b make -j ${BUILDTHREADS} -From 55692ec5212ee1967dceb12271886d4438845257 Mon Sep 17 00:00:00 2001 +From 36a6ba5f840732df28e390357ba46b449b2c41be Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 29/63] [3d] Make MVC a valid 3D filename tag +Subject: [PATCH 28/63] [3d] Make MVC a valid 3D filename tag --- xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ @@ -46385,10 +46353,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef bool m_useDisplayControlHWStereo; -From 317d4c5e46f0530b27f5ba01179e34175d8e9a03 Mon Sep 17 00:00:00 2001 +From 65a8984dee8017c5d4caa905c3b5a7bb93b6b71f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 30/63] [3d] Swap top/bottom sides of GUI +Subject: [PATCH 29/63] [3d] Swap top/bottom sides of GUI --- xbmc/guilib/GraphicContext.cpp | 2 +- @@ -46408,10 +46376,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 1a9778af9ccb8c27a58a82907b6f1d18ac84a2a7 Mon Sep 17 00:00:00 2001 +From c6d749fbe5a53a5f46bdf2f7892d83d660b1a142 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 31/63] Revert "Revert "Disable extra logging by default"" +Subject: [PATCH 30/63] Revert "Revert "Disable extra logging by default"" This reverts commit a880554325be187b877cd8f0e2b338e7267da636. --- @@ -46438,10 +46406,10 @@ index 326ffbd0f08428c3b4a95208134253feeabf1b1f..22dcff1c06577055f84c3d2c2fda73cf loggingcomponents , -From 4800a5c41c44a33c3bccb52716474ed77309e21e Mon Sep 17 00:00:00 2001 +From e9bcaf32252f8ae5577656784089ac72a36dfca0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 32/63] [omximage] Fall back to arm jpeg encode/decode when gpu +Subject: [PATCH 31/63] [omximage] Fall back to arm jpeg encode/decode when gpu is busy --- @@ -46684,10 +46652,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 3834081dfbf66a8faa92a5f514c86de0b6c09179 Mon Sep 17 00:00:00 2001 +From 8494d6d8a306a9120de78d405a26bb2aa02a60e0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 33/63] [mmalcodec] Fail to open when width is invalid. Can +Subject: [PATCH 32/63] [mmalcodec] Fail to open when width is invalid. Can happen with mpegts files --- @@ -46695,7 +46663,7 @@ Subject: [PATCH 33/63] [mmalcodec] Fail to open when width is invalid. Can 1 file changed, 3 insertions(+) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 1884c27272ad98ba5f8cbc7f275a7d9850cfab1d..e757ca64c1caf5c43988c2cb77da159b8f8eee93 100644 +index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568f79ca010 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -368,6 +368,9 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) @@ -46709,10 +46677,10 @@ index 1884c27272ad98ba5f8cbc7f275a7d9850cfab1d..e757ca64c1caf5c43988c2cb77da159b if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From c8985bee54655c26528c3b8ed5101d8f669f17f6 Mon Sep 17 00:00:00 2001 +From 56341aeab6129a9f1703e775106942990dba356f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 34/63] [videoplayer/rbp] Add pi specific option to maintain +Subject: [PATCH 33/63] [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". @@ -47153,10 +47121,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50 extern CRBP g_RBP; -From 044a640b88cd4a02095731737711d011577bf809 Mon Sep 17 00:00:00 2001 +From 8f4047df28e4d97bd557c25c48a28f84f8137c9e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 35/63] rbp: Support zero copy interface with hevc acceleration +Subject: [PATCH 34/63] rbp: Support zero copy interface with hevc acceleration --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ @@ -47184,10 +47152,10 @@ index 4129d3d6a77ce1a3f15bad045746970f6e640ea6..619515c9411172261d8f0bef24c5d679 else { diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index e0ba70f31e3972f23e0231a16b9ba84f4b511d2c..d42e3090c9b38a43ee72fdc3780a244317ece11a 100644 +index 77ae3273bc8e224fe6c193300ccef32fb7fbafe1..c0b3f19f2ef9cdef9adf00cf81154803b12feb4f 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -294,8 +294,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture +@@ -296,8 +296,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; picture->MMALBuffer->m_stills = m_hints.stills; @@ -47200,10 +47168,10 @@ index e0ba70f31e3972f23e0231a16b9ba84f4b511d2c..d42e3090c9b38a43ee72fdc3780a2443 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 534cd8664f784d6ce1dd59484f5cacafe90c9f9a Mon Sep 17 00:00:00 2001 +From 7cfd53ad93c69bc2bc352edd85f5bf6b1b1485a7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 36/63] ffmpeg: use upstream mvc patches +Subject: [PATCH 35/63] ffmpeg: use upstream mvc patches --- ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ @@ -47513,10 +47481,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From 42c3af7c453ee02e0c83a267c150938389df0e4a Mon Sep 17 00:00:00 2001 +From 9e9ac546116d114bb9bab6a82251454aee6400a6 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 37/63] [win32] Settings: Added setting to enable/disable MVC +Subject: [PATCH 36/63] [win32] Settings: Added setting to enable/disable MVC decoder. --- @@ -47546,10 +47514,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9 -From e717a6b60088a6c405c17503e3ab5ad1d1d67ecc Mon Sep 17 00:00:00 2001 +From 0e84b075e51f1457c98b7d38c7ba2fc4d0e12ad0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 38/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc +Subject: [PATCH 37/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc streams. --- @@ -47557,7 +47525,7 @@ Subject: [PATCH 38/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a7e85f08d 100644 +index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff815cc74433 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -25,6 +25,7 @@ @@ -47568,7 +47536,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a #include "DVDClock.h" // for DVD_TIME_BASE #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" -@@ -1354,6 +1355,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1355,6 +1356,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) } case AVMEDIA_TYPE_VIDEO: { @@ -47584,7 +47552,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); stream = st; if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1362,7 +1372,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1363,7 +1373,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) st->bVFR = false; // never trust pts in avi files with h264. @@ -47593,7 +47561,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a st->bPTSInvalid = true; #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1433,6 +1443,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1434,6 +1444,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (av_dict_get(pStream->metadata, "title", NULL, 0)) st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value; @@ -47612,10 +47580,10 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a } case AVMEDIA_TYPE_DATA: -From 9a4d3b6f6b304d51aa12d734e023059926ef34c4 Mon Sep 17 00:00:00 2001 +From e584658e6fd01160f6929b8b27ba60018dcbc3d4 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 39/63] [Stereo3D] Added block_lr and block_rl to supported +Subject: [PATCH 38/63] [Stereo3D] Added block_lr and block_rl to supported modes. --- @@ -47665,10 +47633,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814 i++; } -From 0d7219d8c5e63b80cf07e4d2e45d7af5d225cc16 Mon Sep 17 00:00:00 2001 +From 2a63f273c86b704f4440180dad180aa0b6baa249 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 40/63] [VideoPlayer] Fix possible wrong aspect. +Subject: [PATCH 39/63] [VideoPlayer] Fix possible wrong aspect. --- xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- @@ -47688,10 +47656,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd else m_fForcedAspectRatio = 0.0; -From 9f3dabbe75b336823dfe5ec3a453f9d48c4ee769 Mon Sep 17 00:00:00 2001 +From cad8678e8e0c8e5f6df1784e39b09d0b50e46ea0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 41/63] [VideoPlayer] DemuxFFmpeg: ssif remux +Subject: [PATCH 40/63] [VideoPlayer] DemuxFFmpeg: ssif remux --- xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + @@ -47726,7 +47694,7 @@ index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..156ec2021002d9d7a355db2f0dcf099a DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc77b3d7ef 100644 +index 55431978dcfabee8da95e2e76292ff815cc74433..6df586ac1f2d00e55307358228a4be89278ce67e 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -166,6 +166,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() @@ -47824,7 +47792,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc return (ret >= 0); } -@@ -1357,11 +1385,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1358,11 +1386,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) { @@ -47840,7 +47808,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc break; } CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1447,7 +1476,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1448,7 +1477,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) { @@ -47853,7 +47821,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) { -@@ -1559,7 +1592,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1560,7 +1593,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (langTag) strncpy(stream->language, langTag->value, 3); @@ -48125,10 +48093,10 @@ index 974305ff329eb6999c908d5e05d723f93137ae33..985ecf9722141d78471c00e90da15bfa m_discStubExtensions = ".disc"; // internal music extensions -From 7d58e1dbdf0a13bbb9e7264c6a7a500ddfd29c8b Mon Sep 17 00:00:00 2001 +From cc733938cde1d42634d7d8e42257fc6e083be8e8 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 42/63] [3DBD] Added support of 3D-BluRay playback. +Subject: [PATCH 41/63] [3DBD] Added support of 3D-BluRay playback. --- lib/DllLibbluray.h | 8 + @@ -48206,7 +48174,7 @@ index 156ec2021002d9d7a355db2f0dcf099aabb1db48..87d27b666f703743bb0170252cf1190d DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65fbafa4326 100644 +index 6df586ac1f2d00e55307358228a4be89278ce67e..b7e5081bc0fc32eaaae42d894a288e7971139356 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -27,6 +27,7 @@ @@ -48267,7 +48235,7 @@ index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65f if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) stream = GetStream(pPacket->iStreamId); } -@@ -1480,6 +1485,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1481,6 +1486,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { m_pSSIF->SetH264StreamId(streamIdx); pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); @@ -48297,7 +48265,7 @@ index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65f } } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1803,6 +1831,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) +@@ -1804,6 +1832,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) bool CDVDDemuxFFmpeg::IsProgramChange() { @@ -49118,10 +49086,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 3de6eb54b199d8c1bfe75061558d176de257be55 Mon Sep 17 00:00:00 2001 +From 3080245f6674405c3b0b707822c25e4b79e13161 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 43/63] [VideoPlayer] HasVideo returns true if video stream +Subject: [PATCH 42/63] [VideoPlayer] HasVideo returns true if video stream exists. This don't allow start visualization if audio is opened before video. --- @@ -49142,10 +49110,10 @@ index bb80b836b9c7528def9b623966d8b66aca9bcc92..d2482bcfb036cd5705afc3bae9bf759b bool CVideoPlayer::HasAudio() const -From 5a0375aa55d9fcc679382b12482cc66861df7ff5 Mon Sep 17 00:00:00 2001 +From a47ca13d3fd16c4b6f290d27e0f8de096efe2267 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 44/63] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 43/63] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -49182,10 +49150,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45 CDVDOverlayImage* overlay = new CDVDOverlayImage(); -From e2498d26f1b7928017f856108aa8263e6c73194d Mon Sep 17 00:00:00 2001 +From 46403fe47fb6d6031ff14b7b87f617c62a1ffac6 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 45/63] [VideoPlayer] Disable reading extension stream from +Subject: [PATCH 44/63] [VideoPlayer] Disable reading extension stream from input stream if decoder doesn't support it. --- @@ -49218,7 +49186,7 @@ index a2da9de4375939f3711c594dc854b9a533c755b4..8101b6eeff0341a94736df7ee815dd4c CProcessInfo &m_processInfo; }; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3d4d22930da1ac1e090ba95ef0faa65fbafa4326..0282b3e0c70c023c412128acae508d7ece3f294b 100644 +index b7e5081bc0fc32eaaae42d894a288e7971139356..6ea1a19173e36d49f7391b6f350c8ae3173db7ff 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -504,14 +504,14 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein @@ -49240,7 +49208,7 @@ index 3d4d22930da1ac1e090ba95ef0faa65fbafa4326..0282b3e0c70c023c412128acae508d7e } } // in case of mpegts and we have not seen pat/pmt, defer creation of streams -@@ -1487,13 +1487,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1488,13 +1488,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); AVStream* mvcStream = nullptr; @@ -49442,10 +49410,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1 // classes CDVDOverlayContainer* m_pOverlayContainer; -From 9352e854adf22fa92a355da385cf0b9930ab9821 Mon Sep 17 00:00:00 2001 +From b476191f4025c1df738647da0d6c5d0668245f2c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 46/63] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from +Subject: [PATCH 45/63] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from platform settings to common settings. --- @@ -49541,10 +49509,10 @@ index 6b1f2b6d757354d6065c2862b44dfb47184a1dcc..9163ec85bd0feb48a698a025d9870bf4 m_simpleConditions.insert("have_lcms2"); #endif -From 0bc38979bbe7ace03e826101248397b845581a7f Mon Sep 17 00:00:00 2001 +From bd777e3c8abfadd62da4d49ca716ff78ecd5874a Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 47/63] [VideoPlayer] SSIF: fix for corner case when mvc stream +Subject: [PATCH 46/63] [VideoPlayer] SSIF: fix for corner case when mvc stream is switched before the last packet is read from previous stream. --- @@ -49556,7 +49524,7 @@ Subject: [PATCH 47/63] [VideoPlayer] SSIF: fix for corner case when mvc stream 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 0282b3e0c70c023c412128acae508d7ece3f294b..c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e 100644 +index 6ea1a19173e36d49f7391b6f350c8ae3173db7ff..9149698884c8ae6a23649abbaa0e659587dfe982 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -1120,9 +1120,6 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) @@ -49733,10 +49701,10 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9 typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From ed5005bc45795b939aeff91bed0f117c16b4dc2c Mon Sep 17 00:00:00 2001 +From a96b994955207e0c7ff733bc2b31d8b8a7605c48 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 48/63] [libbluray] bump libbluray to 0.9.2-mvc. +Subject: [PATCH 47/63] [libbluray] bump libbluray to 0.9.2-mvc. --- project/BuildDependencies/scripts/0_package.list | 2 +- @@ -49756,10 +49724,10 @@ index e6c608023a46d377ef520bf23e9863ee0350d980..f8db70ab3861835f33f0e4be79cf3d19 libcec-4.0.0-win32-vc140-2.7z libfribidi-0.19.2-win32.7z -From c0fee4b9928898a5d274afb281bcb47914858ebb Mon Sep 17 00:00:00 2001 +From 88dcdffc2fe7eace35620fde0315a82b252f8d9f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 49/63] libbluray: Bump to Nevcairie's v0.9.2 +Subject: [PATCH 48/63] libbluray: Bump to Nevcairie's v0.9.2 This includes 3D support --- @@ -51416,10 +51384,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From a8036877d09fcadda752e2ef27141713d375db8e Mon Sep 17 00:00:00 2001 +From e5d32f65e3ee192a733c4b00d20f378268a79023 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 50/63] mvc: Automatically enable stereo mode +Subject: [PATCH 49/63] mvc: Automatically enable stereo mode --- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- @@ -51427,7 +51395,7 @@ Subject: [PATCH 50/63] mvc: Automatically enable stereo mode 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index e757ca64c1caf5c43988c2cb77da159b8f8eee93..368a26d9d7f1f3ca8b1666cb188446b120b934c2 100644 +index c43952d4d29b42f3a5c7605573294568f79ca010..68459e35bc2cda048c150c7079fb30eb0ffb823c 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -403,13 +403,17 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) @@ -51477,10 +51445,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 16bdfb5fba5132fc097c56c116a4628cf8ba05aa Mon Sep 17 00:00:00 2001 +From 2ed9e6c6d5c849ea462f639c1a17839c6e6b43de Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 51/63] ffmpeg: mvc: fix for pixelation from packets with no +Subject: [PATCH 50/63] ffmpeg: mvc: fix for pixelation from packets with no pts/dts --- @@ -51542,10 +51510,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 47c649a1866f8897059db26a63e43e3666223b95 Mon Sep 17 00:00:00 2001 +From 1639d699062f89bc1d7e5138f5545b91f24050d0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 52/63] stereoscopicmanager: fixups for rbp +Subject: [PATCH 51/63] stereoscopicmanager: fixups for rbp --- xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ @@ -51668,7 +51636,7 @@ index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bf static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); }; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 368a26d9d7f1f3ca8b1666cb188446b120b934c2..2257c94a6b095d9b0926c418c1faaf2ebfadf088 100644 +index 68459e35bc2cda048c150c7079fb30eb0ffb823c..dca872373080156100618d58d9782e2461fa2648 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -362,6 +362,11 @@ bool CMMALVideo::SendCodecConfigData() @@ -51783,10 +51751,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782 }; -From 89abe07219f314eb147833325a41323ca13932bc Mon Sep 17 00:00:00 2001 +From a9e35159a5ba7e50e4236943baf842488748d316 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 53/63] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 52/63] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -51806,10 +51774,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18 } -From 6c4da5b733b9fd7092ad84c0213f99c9f917b1b5 Mon Sep 17 00:00:00 2001 +From 062eb2cc1e8a906151c391b924626cd0b0b67cf2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 54/63] DemuxMVC: fixup after SeekTime API change +Subject: [PATCH 53/63] DemuxMVC: fixup after SeekTime API change --- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- @@ -51843,10 +51811,10 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425 virtual int GetStreamLength() { return 0; }; virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -From 08f34e983316fb995d27145fe023c5dbf7316df9 Mon Sep 17 00:00:00 2001 +From ab0855cffe8439245a78bb782a87403c9a648fa6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Nov 2014 23:17:46 +0000 -Subject: [PATCH 55/63] [cec] Don't discard buttons when repeat mode is enabled +Subject: [PATCH 54/63] [cec] Don't discard buttons when repeat mode is enabled --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- @@ -51869,10 +51837,10 @@ index 30367a3fde956090afdca9930fa52e829f35046f..febacb3b7964eab3b8615a6a807e0f27 if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) { -From fc196a50f90057e3eb1b6553347a9d400c717db8 Mon Sep 17 00:00:00 2001 +From 01134bb4ce99d42b301cb59a056f8b3a4a950691 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 56/63] [cec] Temp - more logging +Subject: [PATCH 55/63] [cec] Temp - more logging --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- @@ -51924,37 +51892,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a } -From dd28ae7d01450884dca135169ca72a6ac6344117 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 22 Mar 2016 09:51:52 +0100 -Subject: [PATCH 57/63] python: use kodi provided cert if available - ---- - xbmc/interfaces/python/XBPython.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp -index bc84af9411ef55eaf5ba71a320b5cbfec5f49548..ff4ed7db26845905108ea0ae504e4f589f9c7d0f 100644 ---- a/xbmc/interfaces/python/XBPython.cpp -+++ b/xbmc/interfaces/python/XBPython.cpp -@@ -595,6 +595,12 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker) - CEnvironment::putenv(buf); - #endif - -+#if !defined(TARGET_WINDOWS) -+ // use Kodi provided cert if available -+ if (XFILE::CFile::Exists("special://xbmc/system/certs/cacert.pem")) -+ setenv("SSL_CERT_FILE", CSpecialProtocol::TranslatePath("special://xbmc/system/certs/cacert.pem").c_str(), 1); -+#endif -+ - if (PyEval_ThreadsInitialized()) - PyEval_AcquireLock(); - else - -From 2ed41ab819cb7060380c1f7cba57edbd0ad0fba8 Mon Sep 17 00:00:00 2001 +From dd34508720f1d953309dae3d5c60b1b7dde6f0fb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 58/63] rbp: Hard code the number of buffers to improve audio +Subject: [PATCH 56/63] rbp: Hard code the number of buffers to improve audio sync --- @@ -51996,10 +51937,10 @@ index 54cf477648bba4583904cf122b4e66f6bbdd9469..908d73b151845c2f85a897ca5714fa1f } -From 82f3257a709241542444806947dc2b573715e399 Mon Sep 17 00:00:00 2001 +From b7162b31cca37bb6132f1d8c41e3706d1542e74f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 59/63] rbp: Update the GL libs to new naming scheme +Subject: [PATCH 57/63] 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. @@ -52013,7 +51954,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 87bfbbfe8b833cec9cdef6b16d311471b162d564..dd67c5e53183b5c2c19de44bb246ed7b86372453 100644 +index 9b8b8892651d6f343346657469159a0d9789a147..d55d3596deec47bf71f400af4ea936ab4ea9063a 100644 --- a/configure.ac +++ b/configure.ac @@ -949,7 +949,7 @@ if test "$use_gles" = "yes"; then @@ -52064,20 +52005,20 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71 fi -From 364926a71cd3cf33b948a2e1ef1fd13881a0a95e Mon Sep 17 00:00:00 2001 +From e7066cc50413ee4ed047c6a4ed559b64ef189d08 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 60/63] ffmpeg: hacky fix for files with GMC +Subject: [PATCH 58/63] ffmpeg: hacky fix for files with GMC --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e..0a46eef4d265f1d0bca9215fd92a355af7d242ca 100644 +index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675deab7991 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1457,8 +1457,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1458,8 +1458,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -52089,10 +52030,10 @@ index c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e..0a46eef4d265f1d0bca9215fd92a355a { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From 2a1502990a40ce020d6f51681e6adffdea9a0bc8 Mon Sep 17 00:00:00 2001 +From 8300544c9c4a4de028efc0b19873b6f1907100c8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 61/63] mmalrender: Add sharpness control +Subject: [PATCH 59/63] mmalrender: Add sharpness control --- addons/resource.language.en_gb/resources/strings.po | 2 +- @@ -52114,7 +52055,7 @@ index 7c7969d381bf15ac1ba2fd8f16e463f6b12fe4c3..45cf0830ea6079a0f2ad22792f2497c5 #empty string with id 16314 diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf80ac527c 100644 +index 84953d116610e9fd262de968ffe26d6063a9193b..f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp @@ -411,6 +411,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer"), m_processThread(this, @@ -52125,7 +52066,7 @@ index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf m_vout_width = 0; m_vout_height = 0; m_vout_aligned_width = 0; -@@ -845,6 +846,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) +@@ -847,6 +848,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) goto exit; } @@ -52141,7 +52082,7 @@ index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf if (m_format != RENDER_FMT_MMAL) { if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -@@ -1021,7 +1031,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) +@@ -1023,7 +1033,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) feature == RENDERFEATURE_ZOOM || feature == RENDERFEATURE_ROTATION || feature == RENDERFEATURE_VERTICAL_SHIFT || @@ -52164,10 +52105,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From 60198462cb88a0e0bcee714c4d3d0b418b01af76 Mon Sep 17 00:00:00 2001 +From 3e41494ac12f46aa414ff58d218644a2041d8690 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 62/63] MMALFFMpeg: Report as SW decode in codec overlay info +Subject: [PATCH 60/63] MMALFFMpeg: Report as SW decode in codec overlay info --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- @@ -52187,98 +52128,186 @@ index 619515c9411172261d8f0bef24c5d679c35e5d7d..b31c984c0a507891f2754146a4c62802 CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); } -From 7d4c324285dbe6d3a90c6f379178388841395f66 Mon Sep 17 00:00:00 2001 +From 6d6039a219811d116427ed7419b6cd815d5980c5 Mon Sep 17 00:00:00 2001 From: popcornmix -Date: Tue, 8 Nov 2016 17:29:02 +0000 -Subject: [PATCH 63/63] MMALRender: Reduce log spam +Date: Mon, 7 Nov 2016 18:28:01 +0000 +Subject: [PATCH 61/63] advancedsettings: Add option to set cache size on + libass + +E.g to set total cache size in libass to 32M + + + 32 + + +When unset it defaults to 192M +--- + xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp | 3 +++ + xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h | 3 +++ + xbmc/settings/AdvancedSettings.cpp | 5 +++++ + xbmc/settings/AdvancedSettings.h | 2 ++ + 4 files changed, 13 insertions(+) + +diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp +index 0f5e1ace4c85f65a0ab5dbd8e6f1c2715d60467d..7a236080bc96466d34e14b9b0d82ba4084276abd 100644 +--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp ++++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp +@@ -28,6 +28,7 @@ + #include "utils/StringUtils.h" + #include "threads/SingleLock.h" + #include "guilib/GraphicContext.h" ++#include "settings/AdvancedSettings.h" + + static void libass_log(int level, const char *fmt, va_list args, void *data) + { +@@ -75,6 +76,8 @@ CDVDSubtitlesLibass::CDVDSubtitlesLibass() + if(!m_renderer) + return; + ++ m_dll.ass_set_cache_limits(m_renderer, 0, g_advancedSettings.m_libAssCache); ++ + //Setting default font to the Arial in \media\fonts (used if FontConfig fails) + strPath = URIUtils::AddFileToFolder("special://home/media/Fonts/", CSettings::GetInstance().GetString(CSettings::SETTING_SUBTITLES_FONT)); + if (!XFILE::CFile::Exists(strPath)) +diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h +index f9de4f15e7c612d69ef46e7cad870ecb61afaec3..b5303fd100f1a930eb5c010a951932064d5190c4 100644 +--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h ++++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h +@@ -64,6 +64,7 @@ public: + virtual void ass_set_message_cb(ASS_Library *priv + , void (*msg_cb)(int level, const char *fmt, va_list args, void *data) + , void *data)=0; ++ virtual void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, int bitmap_max)=0; + }; + + class DllLibass : public DllDynamic, DllLibassInterface +@@ -91,6 +92,7 @@ class DllLibass : public DllDynamic, DllLibassInterface + DEFINE_METHOD5(void, ass_process_chunk, (ASS_Track* p1, char* p2, int p3, long long p4, long long p5)) + DEFINE_METHOD3(void, ass_process_codec_private, (ASS_Track* p1, char* p2, int p3)) + DEFINE_METHOD3(void, ass_set_message_cb, (ASS_Library* p1, void (*p2)(int level, const char *fmt, va_list args, void *data), void* p3)) ++ DEFINE_METHOD3(void, ass_set_cache_limits, (ASS_Renderer *p1, int p2, int p3)) + BEGIN_METHOD_RESOLVE() + RESOLVE_METHOD(ass_set_extract_fonts) + RESOLVE_METHOD(ass_set_fonts_dir) +@@ -114,5 +116,6 @@ class DllLibass : public DllDynamic, DllLibassInterface + RESOLVE_METHOD(ass_process_chunk) + RESOLVE_METHOD(ass_process_codec_private) + RESOLVE_METHOD(ass_set_message_cb) ++ RESOLVE_METHOD(ass_set_cache_limits) + END_METHOD_RESOLVE() + }; +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index 985ecf9722141d78471c00e90da15bfad931462a..a33581ba02a26110105a2d0ae810d96c410efbf1 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -364,6 +364,8 @@ void CAdvancedSettings::Initialize() + #else + m_cacheMemSize = 1024 * 1024 * 20; + #endif ++ m_libAssCache = 0; ++ + m_cacheBufferMode = CACHE_BUFFER_MODE_INTERNET; // Default (buffer all internet streams/filesystems) + // the following setting determines the readRate of a player data + // as multiply of the default data read rate +@@ -1026,6 +1028,9 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) + XMLUtils::GetFloat(pRootElement, "controllerdeadzone", m_controllerDeadzone, 0.0f, 1.0f); + XMLUtils::GetUInt(pRootElement, "fanartres", m_fanartRes, 0, 1080); + XMLUtils::GetUInt(pRootElement, "imageres", m_imageRes, 0, 1080); ++ ++ XMLUtils::GetUInt(pRootElement, "libasscache", m_libAssCache, 0, 1024); ++ + if (XMLUtils::GetString(pRootElement, "imagescalingalgorithm", tmp)) + m_imageScalingAlgorithm = CPictureScalingAlgorithm::FromString(tmp); + XMLUtils::GetBoolean(pRootElement, "playlistasfolders", m_playlistAsFolders); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97f6aceca7 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -345,6 +345,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler + unsigned int m_cacheBufferMode; + float m_cacheReadFactor; + ++ unsigned int m_libAssCache; ++ + bool m_jsonOutputCompact; + unsigned int m_jsonTcpPort; + + +From 697282f92f3ed14814f1db2d6948f49213bdd8c0 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Sun, 13 Nov 2016 20:30:15 +0000 +Subject: [PATCH 62/63] [rbp] Experimental limit libass cache size depending on + arm memory size --- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 4 ++-- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 6 ++++-- - .../cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 8 +++++--- - 3 files changed, 11 insertions(+), 7 deletions(-) + xbmc/linux/RBP.cpp | 4 +++- + xbmc/settings/AdvancedSettings.cpp | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 2257c94a6b095d9b0926c418c1faaf2ebfadf088..dca872373080156100618d58d9782e2461fa2648 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -224,7 +224,7 @@ static void dec_input_port_cb_static(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *bu - void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) +diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp +index 6e8529001b1a464b4547a846f553d98f5bc0b6c0..238eba372af2cbab11d7543c857ee47640901d13 100644 +--- a/xbmc/linux/RBP.cpp ++++ b/xbmc/linux/RBP.cpp +@@ -65,6 +65,8 @@ void CRBP::InitializeSettings() { - if (!(buffer->cmd == 0 && buffer->length > 0)) -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s port:%p buffer %p, len %d cmd:%x flags:%x", CLASSNAME, __func__, port, buffer, buffer->length, buffer->cmd, buffer->flags); - - bool kept = false; -@@ -617,7 +617,7 @@ void CMMALVideo::Dispose() - - void CMMALVideo::SetDropState(bool bDrop) - { -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (bDrop != m_dropState) - CLog::Log(LOGDEBUG, "%s::%s - bDrop(%d)", CLASSNAME, __func__, bDrop); - m_dropState = bDrop; - } -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index d42e3090c9b38a43ee72fdc3780a244317ece11a..c0b3f19f2ef9cdef9adf00cf81154803b12feb4f 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -42,6 +42,8 @@ using namespace MMAL; - - #define CLASSNAME "CMMALYUVBuffer" - -+#define VERBOSE 0 -+ - CMMALYUVBuffer::CMMALYUVBuffer(CDecoder *omv, std::shared_ptr pool, uint32_t mmal_encoding, uint32_t width, uint32_t height, uint32_t aligned_width, uint32_t aligned_height, uint32_t size) - : CMMALBuffer(pool), m_omv(omv) - { -@@ -72,13 +74,13 @@ CMMALYUVBuffer::CMMALYUVBuffer(CDecoder *omv, std::shared_ptr pool, u - gmem = m_pool->AllocateBuffer(size_pic); - if (gmem) - gmem->m_opaque = (void *)this; -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p mmal:%p %dx%d (%dx%d) size:%d %.4s", CLASSNAME, __FUNCTION__, this, gmem, mmal_buffer, m_width, m_height, m_aligned_width, m_aligned_height, gmem->m_numbytes, (char *)&m_encoding); + if (m_initialized && g_advancedSettings.m_cacheMemSize == ~0U) + g_advancedSettings.m_cacheMemSize = m_arm_mem < 256 ? 1024 * 1024 * 2 : 1024 * 1024 * 20; ++ if (m_initialized && g_advancedSettings.m_libAssCache == ~0U) ++ g_advancedSettings.m_libAssCache = m_arm_mem < 256 ? 21 : m_arm_mem < 512 ? 42 : 96; } - CMMALYUVBuffer::~CMMALYUVBuffer() - { -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p mmal:%p %dx%d (%dx%d) size:%d %.4s", CLASSNAME, __FUNCTION__, this, gmem, mmal_buffer, m_width, m_height, m_aligned_width, m_aligned_height, gmem->m_numbytes, (char *)&m_encoding); - if (gmem) - m_pool->ReleaseBuffer(gmem); -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index 0b73b7700ce8a63932d3fa3b90dda8cf80ac527c..f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -638,7 +638,8 @@ void CMMALRenderer::Run() - if (m_queue_render) - { - mmal_queue_put(m_queue_render, buffer); -- CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, omvb); -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, omvb); - kept = true; - } - else -@@ -646,7 +647,8 @@ void CMMALRenderer::Run() - CheckConfigurationVout(omvb->m_width, omvb->m_height, omvb->m_aligned_width, omvb->m_aligned_height, omvb->m_encoding); - if (m_vout_input) - { -- CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, omvb); -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, omvb); - MMAL_STATUS_T status = mmal_port_send_buffer(m_vout_input, buffer); - if (status != MMAL_SUCCESS) - CLog::Log(LOGERROR, "%s::%s - Failed to send buffer %p to %s (status=0%x %s)", CLASSNAME, __func__, buffer, m_vout_input->name, status, mmal_status_to_string(status)); -@@ -765,7 +767,7 @@ int CMMALRenderer::GetImage(YV12Image *image, int source, bool readonly) - CLog::Log(LOGDEBUG, "%s::%s - invalid: format:%d image:%p source:%d ro:%d", CLASSNAME, __func__, m_format, image, source, readonly); - return -1; - } -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s - MMAL: image:%p source:%d ro:%d", CLASSNAME, __func__, image, source, readonly); - return source; - } + bool CRBP::Initialize() +@@ -120,7 +122,7 @@ void CRBP::LogFirmwareVerison() + response[sizeof(response) - 1] = '\0'; + CLog::Log(LOGNOTICE, "Raspberry PI firmware version: %s", response); + CLog::Log(LOGNOTICE, "ARM mem: %dMB GPU mem: %dMB MPG2:%d WVC1:%d", m_arm_mem, m_gpu_mem, m_codec_mpg2_enabled, m_codec_wvc1_enabled); +- CLog::Log(LOGNOTICE, "cache.memorysize: %dMB", g_advancedSettings.m_cacheMemSize >> 20); ++ CLog::Log(LOGNOTICE, "cache.memorysize: %dMB libass.cache: %dMB", g_advancedSettings.m_cacheMemSize >> 20, g_advancedSettings.m_libAssCache); + m_DllBcmHost->vc_gencmd(response, sizeof response, "get_config int"); + 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 a33581ba02a26110105a2d0ae810d96c410efbf1..d70e2cf3113bbe0dad60dfc7accc8d77f7f30c30 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -361,8 +361,10 @@ void CAdvancedSettings::Initialize() + #ifdef TARGET_RASPBERRY_PI + // want default to be memory dependent, but interface to gpu not available yet, so set in RBP.cpp + m_cacheMemSize = ~0; ++ m_libAssCache = ~0; + #else + m_cacheMemSize = 1024 * 1024 * 20; ++ m_libAssCache = 0; + #endif + m_libAssCache = 0; + + +From 8023a6f6c50211f85546ec1fb32237b9bcc119b0 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Wed, 14 Dec 2016 21:50:33 +0000 +Subject: [PATCH 63/63] VideoPlayer: Don't add timestamp offsets to + DVD_NOPTS_VALUE + +I have a dvd menu that results in a renderer configure timeout. +The dts and pts timestamps are wild. +I've traced it back to pts=DVD_NOPTS_VALUE being adjusted and so no longer being treated as invalid +--- + xbmc/cores/VideoPlayer/VideoPlayer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp +index eda74e7b74452c7e8dfc18571ebcd355bd12a247..60900cac14932061eedc317e2efd2f0d8ae4a029 100644 +--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp ++++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp +@@ -1610,9 +1610,9 @@ void CVideoPlayer::Process() + if (CDVDInputStream::IMenus* menu = dynamic_cast(m_pInputStream)) + { + double correction = menu->GetTimeStampCorrection(); +- if (pPacket->dts > correction) ++ if (pPacket->dts != DVD_NOPTS_VALUE && pPacket->dts > correction) + pPacket->dts -= correction; +- if (pPacket->pts > correction) ++ if (pPacket->pts != DVD_NOPTS_VALUE && pPacket->pts > correction) + pPacket->pts -= correction; + } + if (m_dvd.syncClock) diff --git a/projects/RPi2/patches/kodi/kodi-001-backport.patch b/projects/RPi2/patches/kodi/kodi-001-backport.patch index b84fadf6ce..959635340f 100644 --- a/projects/RPi2/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi2/patches/kodi/kodi-001-backport.patch @@ -1,39 +1,7 @@ -From 78147d45acfa1e8416b3c86888aaf68d64bb584e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 11 Nov 2016 14:03:29 +0000 -Subject: [PATCH 01/63] cec: fixup strings after PR 10775 - ---- - system/peripherals.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index ed707b6767f6fc9184adf2090810b5b1ad89d10d..d5704b249c3065b2980dc92c7c81dc7b384187bc 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -16,7 +16,7 @@ - - - -- -+ - - - -@@ -24,7 +24,7 @@ - - - -- -+ - - - - -From 1febcd53bb19499e0820cb7bcaaf39619d8a3666 Mon Sep 17 00:00:00 2001 +From 6100acd857e81c9b9bf070ea6ffdbf3b19ff4be3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Oct 2014 00:19:40 +0000 -Subject: [PATCH 02/63] [cec] Add settings for configuring button repeats +Subject: [PATCH 01/63] [cec] Add settings for configuring button repeats --- addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ @@ -114,10 +82,10 @@ index d032ffd707fee5eec035e90bdf618530f7215c37..30367a3fde956090afdca9930fa52e82 if (GetSettingBool("pause_playback_on_deactivate")) { -From b713d931abc454fd9248650c21b93820688e8f5b Mon Sep 17 00:00:00 2001 +From d21b9db3a87136ff290fc377ab8e412efa76a085 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Apr 2014 17:27:52 +0100 -Subject: [PATCH 03/63] [cec] Don't suspend pi on tv switch off - it can't wake +Subject: [PATCH 02/63] [cec] Don't suspend pi on tv switch off - it can't wake up --- @@ -138,10 +106,10 @@ index 02b1a9ed6fce1986bd864bba09a9df0621f9e041..54f9b70cfd5c8c82ceb99932e1b3e325 -From 2971cf8df975ab6fc221bf1d5342d3371ce5b41e Mon Sep 17 00:00:00 2001 +From eac4b3bc8918309f1593491fa1285c95fdacf918 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 21 Apr 2016 16:49:02 +0100 -Subject: [PATCH 04/63] Revert "[settings] remove show EXIF picture information +Subject: [PATCH 03/63] Revert "[settings] remove show EXIF picture information setting" This reverts commit e7d90188436b6966eff23fd695e1a9d18f4af1b4. @@ -264,10 +232,10 @@ index 482f61db8aab70aff4013fee2f1c73a5b5a9b4a9..269a3a741340d60354037166c3b03ddf static const std::string SETTING_PICTURES_SHOWVIDEOS; static const std::string SETTING_PICTURES_DISPLAYRESOLUTION; -From 1a444eea815b96b8d61c847161d08452022c2192 Mon Sep 17 00:00:00 2001 +From ffcec98caeb49b2e639fd505dd5df3e11b595597 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 -Subject: [PATCH 05/63] [rbp/omxplayer] When opening a stream don't try to +Subject: [PATCH 04/63] [rbp/omxplayer] When opening a stream don't try to update gui so often --- @@ -291,10 +259,10 @@ index c8fe0706d128b3c67a4000894129ae0fa08bb223..8a5916299575661743131b921a27a76f dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 68f330731015a5b4abbacbd458c8309e9729fd76 Mon Sep 17 00:00:00 2001 +From 3c7342f8e036cc94a1e0e9ccc40e19eff1651c1a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 -Subject: [PATCH 06/63] [hifiberry] Hack: force it to be recognised as IEC958 +Subject: [PATCH 05/63] [hifiberry] Hack: force it to be recognised as IEC958 capable to enable passthrough options --- @@ -317,10 +285,10 @@ index d66993a09583d8f9f54f5f97c18fbba45dddee9b..3c0b691860ace57e0a25f01013df01a5 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From 76cd8f440e9203cc4ba28a0bbeede281dc391559 Mon Sep 17 00:00:00 2001 +From 3385f3da75439f79d3de874ad5f6b4fdbcc7645d Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 -Subject: [PATCH 07/63] Improved file buffering in CArchive +Subject: [PATCH 06/63] 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 @@ -380,10 +348,10 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 46eb2adb4e1c586c374f9bedeac9fef6f2dca4f0 Mon Sep 17 00:00:00 2001 +From b98d7ff674f63e984d28446de3fdd882517a79d6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 -Subject: [PATCH 08/63] filesystem: Make support of browsing into archives +Subject: [PATCH 07/63] 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. @@ -493,10 +461,10 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From 5a6fdf25a8adde963039cf03732fda057bca72a5 Mon Sep 17 00:00:00 2001 +From 92e911331efde359883afd9681398a70a62e843c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 -Subject: [PATCH 09/63] [rbp] Make cachemembuffersize default depend on memory +Subject: [PATCH 08/63] [rbp] Make cachemembuffersize default depend on memory size --- @@ -598,10 +566,10 @@ index cc37998f0c9edfb38cf609666374cfa96530bf8f..3891a7ed34acb3489a860678d56a8ec0 } -From 366c33404013529d89c2442e09dbfdba3d6e7c34 Mon Sep 17 00:00:00 2001 +From 394fc81b6d005a775235f8d611a550f957017077 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 -Subject: [PATCH 10/63] [settings] Experiment: Report DESKTOP resolution in +Subject: [PATCH 09/63] [settings] Experiment: Report DESKTOP resolution in video settings --- @@ -623,10 +591,10 @@ index ef95bc286fa982790248bad26da3c3e00c1da002..da69c6960867621d4ebe9267929664d9 StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From de4036d5f101d94439763545120b52bb346f4875 Mon Sep 17 00:00:00 2001 +From 259d52ab15a53aa587770f3378bf969c257f2604 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 -Subject: [PATCH 11/63] [audio] Add settings option to boost centre channel +Subject: [PATCH 10/63] [audio] Add settings option to boost centre channel when downmixing This allows a dB volume increase to be added to centre channel. @@ -752,10 +720,10 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From abc2a09d9cb7b423a37f1dfae6f198dfa361f1af Mon Sep 17 00:00:00 2001 +From ae94a4eb877dd5b1f9db1ead2ed0b4f4ea6391a0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 -Subject: [PATCH 12/63] [rbp] Default extract thumbnails to false +Subject: [PATCH 11/63] [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 @@ -781,10 +749,10 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From 747d6a7aa129348078f5b4e36d47bbc1307806a8 Mon Sep 17 00:00:00 2001 +From 1e96dc54fc2957b799f73866b2bd50dfd9464b5b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 -Subject: [PATCH 13/63] [languageinvoker] Reduce priority of python threads +Subject: [PATCH 12/63] [languageinvoker] Reduce priority of python threads --- xbmc/interfaces/generic/LanguageInvokerThread.cpp | 5 +++++ @@ -807,10 +775,10 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From 0732dc96e4f4e84c14eebc953e3cf571363afb34 Mon Sep 17 00:00:00 2001 +From ce1cb36c6ef3bf2ef267b6169b57dc41cac2a6c2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 -Subject: [PATCH 14/63] [rbp] hack: wait for splash to complete before changing +Subject: [PATCH 13/63] [rbp] hack: wait for splash to complete before changing hdmi mode --- @@ -894,10 +862,10 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From e182b3ca45dd427c939d6c39366664e9afb382a8 Mon Sep 17 00:00:00 2001 +From 884539fb7d73eb73519a3f5b6577f9bda428fb26 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 -Subject: [PATCH 15/63] Fix for UI not showing both extractflags and +Subject: [PATCH 14/63] Fix for UI not showing both extractflags and extractthumb --- @@ -960,10 +928,10 @@ index 9ce9e725aec4d8ed000200342a2a99f3bc34a749..326ffbd0f08428c3b4a95208134253fe -From 31ef126da025be5761a86664e2c9428f5208f2ae Mon Sep 17 00:00:00 2001 +From 94e0f0e873c766e5462e40529ba06c21793d9be4 Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 -Subject: [PATCH 16/63] Disable autoscrolling while on screensaver and while +Subject: [PATCH 15/63] Disable autoscrolling while on screensaver and while opening streams. --- @@ -976,10 +944,10 @@ Subject: [PATCH 16/63] Disable autoscrolling while on screensaver and while 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 100a2f2cd2a097ec275751a75e82500324166757..6e5c33c1118cbda79a614d90c6ca4b610f338c87 100644 +index 2dbe4c1728636ea269ab6c770d37433fa720ecb1..a4eac32be2091e4b5d432d2c32266a7348eab0ee 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -5240,3 +5240,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const +@@ -5233,3 +5233,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const return false; } @@ -1094,10 +1062,10 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From 485dc3edb739f64c1816177cc34305c9a45931df Mon Sep 17 00:00:00 2001 +From e2bab5041c584b9807532acd1b4d390e48f75a70 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 -Subject: [PATCH 17/63] [demuxer] Avoid memcpy on every demuxer packet +Subject: [PATCH 16/63] [demuxer] Avoid memcpy on every demuxer packet Avoids an unnecessary memcpy on every demuxer packet which for high bitrate videos can be significant. @@ -1108,7 +1076,7 @@ high bitrate videos can be significant. 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3540a8f0c89e4f82b5ae3c40fe58ca8bfffd2360..fedbff21018d352d88a820c6354aa7d7d4623e79 100644 +index 33d1e5ab627d8099018190699f3b532c2b1f3b08..e015e65dea43e7b682b704edb7f468b63b8c2ac5 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -921,7 +921,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() @@ -1197,10 +1165,10 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 6f64ae9541cbeebd2d0169efea2e19639604d019 Mon Sep 17 00:00:00 2001 +From 8f8e1f256c747bdc7cd0953ba2f99ec3d22eda88 Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 -Subject: [PATCH 18/63] Load OSD dialogs on startup. +Subject: [PATCH 17/63] 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. @@ -1254,7 +1222,7 @@ index eb67552344f59b8857b16c882c29e3fa62bed75c..f31572b34d376e70a35003a8c2e175b4 CGUIDialogAudioSubtitleSettings::~CGUIDialogAudioSubtitleSettings() { } diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp -index 29c2917aa5aaaf4160c8f6fafadda45a71c54835..84204c1b1a058377d9d0d03d8af7d97f35ba119f 100644 +index 398558e4d5d0cae30ee1c73e2b70e3b2f787e8fc..4e8a9b1e307a89d3a7b68402e2ff11b57e7dccd4 100644 --- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp +++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp @@ -103,7 +103,7 @@ CGUIDialogSubtitles::CGUIDialogSubtitles(void) @@ -1295,10 +1263,10 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 381a8656cb8bbd3a32edd2b9e7f717e3fc195ec3 Mon Sep 17 00:00:00 2001 +From 320d1c9bddbd0e838385aaecc2e87edb5fdd15aa Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 -Subject: [PATCH 19/63] [gui] Also limit GUI updates when in non full-screen +Subject: [PATCH 18/63] [gui] Also limit GUI updates when in non full-screen video mode --- @@ -1306,10 +1274,10 @@ Subject: [PATCH 19/63] [gui] Also limit GUI updates when in non full-screen 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e55c48277 100644 +index a4eac32be2091e4b5d432d2c32266a7348eab0ee..d3e82c733998247ab0c20ed3b660dc4e70c9a542 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2780,7 +2780,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2779,7 +2779,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) #if defined(TARGET_RASPBERRY_PI) || defined(HAS_IMXVPU) // This code reduces rendering fps of the GUI layer when playing videos in fullscreen mode // it makes only sense on architectures with multiple layers @@ -1318,7 +1286,7 @@ index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e fps = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); #endif -@@ -2793,6 +2793,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2792,6 +2792,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) { if (!m_skipGuiRender) g_windowManager.Process(CTimeUtils::GetFrameTime()); @@ -1328,10 +1296,10 @@ index 6e5c33c1118cbda79a614d90c6ca4b610f338c87..283f300d89cbfd95cc160b19c24f1a5e g_windowManager.FrameMove(); } -From d60d5b5d2c0fe031a50e595888a5b704e33c39b6 Mon Sep 17 00:00:00 2001 +From ba8f27ffe6778166947de1a7f7ee8de96adf3262 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 -Subject: [PATCH 20/63] [screensaver] Leave GUI contents available for +Subject: [PATCH 19/63] [screensaver] Leave GUI contents available for screensaver --- @@ -1361,10 +1329,10 @@ index 5808f7ed1e94d68ead7305ba6d284edd4df12bdd..2a3b7f16531c9822e79c77efabdd30ac // Add window to the history list (we must do this before we activate it, -From 052ea3734af13684c6b187e4eb61d93216b50d30 Mon Sep 17 00:00:00 2001 +From 592b18d996b3bfb1ccaf26089646925d618d01b2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 -Subject: [PATCH 21/63] ffmpeg: Automatic switch to software decode for GMC +Subject: [PATCH 20/63] ffmpeg: Automatic switch to software decode for GMC with more than one warp point --- @@ -1469,7 +1437,7 @@ index 5c2976278eb5ec5b8b4a4f9f9c7174b164ab5201..dde29adf425e54f54e4104b3370352db ./configure --prefix=$FFMPEG_PREFIX \ --extra-version="kodi-${VERSION}" \ diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 8997e3c8dfb9d37cc6c1b0706366d0b193201dd9..1884c27272ad98ba5f8cbc7f275a7d9850cfab1d 100644 +index ff3729bde30c0e46de67c4df9b01ee5846c181ee..822b7bf75f2e732b5eed8687403d0eda503fa641 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -47,6 +47,10 @@ @@ -1513,10 +1481,10 @@ index 3bb003b634c83d2c1b0ecd12b53027950e58be99..24341dc23e97e86e1b20b255548573c8 class CDemuxStreamAudio : public CDemuxStream diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fedbff21018d352d88a820c6354aa7d7d4623e79..b3bdc5a75b77af7dff90ded100a97b848db358da 100644 +index e015e65dea43e7b682b704edb7f468b63b8c2ac5..54a18c669a058b705e0276cb7e14522ae6cd04ae 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1415,7 +1415,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1416,7 +1416,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -1592,10 +1560,10 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From f972d5b044f4cee30fcfe87371751f35b2f56d51 Mon Sep 17 00:00:00 2001 +From 4eef9dc16f10ca8224b50c34991e3b8ce2af44db Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 -Subject: [PATCH 22/63] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer +Subject: [PATCH 21/63] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer - fixes #15794 --- @@ -1787,10 +1755,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 96c9a7bcce868adebd570d86fd3411d83c8aed9f Mon Sep 17 00:00:00 2001 +From 4eee4e41c65df8442d80d8e0e47d88f0cd720ba2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 -Subject: [PATCH 23/63] codecoverlay: Include codec name in overlay +Subject: [PATCH 22/63] codecoverlay: Include codec name in overlay --- xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp | 4 ++++ @@ -1884,10 +1852,10 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From d3b64baa508e43fc2e1d108653754b3abcb3ab56 Mon Sep 17 00:00:00 2001 +From 601a1842b957786b2131a91739a008b1dfa01d9b Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 -Subject: [PATCH 24/63] [DebugInfo] Add cpu usage info. +Subject: [PATCH 23/63] [DebugInfo] Add cpu usage info. --- .../VideoPlayer/VideoRenderers/DebugRenderer.cpp | 56 ++++++++-------------- @@ -2057,10 +2025,10 @@ index 482142e46a714d1821d0bb25a552b043d6dcce66..54cf477648bba4583904cf122b4e66f6 m_debugTimer.Set(1000); -From eb2da354526d4f0dedd27542d28f358bafddf868 Mon Sep 17 00:00:00 2001 +From 1b441d8f8efe27734c66e6f3e7ba8d21c48708eb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 -Subject: [PATCH 25/63] ffmpeg: Allow neon to be enabled in unified builds +Subject: [PATCH 24/63] ffmpeg: Allow neon to be enabled in unified builds --- tools/depends/target/ffmpeg/Makefile | 4 ++++ @@ -2083,10 +2051,10 @@ index 8dd14cdfd053f142f386b6dee1fc0b21bb1f8d93..b5f38a458dfb341c43089e07afded153 ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From f3d6aa22f4d91deedc2b54096b762a7a8d99c440 Mon Sep 17 00:00:00 2001 +From 701d02ab8b924bfab0d61bf7ceb098222e0bd074 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 -Subject: [PATCH 26/63] ffmpeg: Add some upstream HEVC optimisations +Subject: [PATCH 25/63] ffmpeg: Add some upstream HEVC optimisations --- tools/depends/target/ffmpeg/Makefile | 6 +- @@ -5884,10 +5852,10 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From 86764acae60faf07ae737a25e5232fa32b69f584 Mon Sep 17 00:00:00 2001 +From 3f2249b51917db197cac915107dc8db71159f0b7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 -Subject: [PATCH 27/63] [ffmpeg] Add GPU acceleration to hevc +Subject: [PATCH 26/63] [ffmpeg] Add GPU acceleration to hevc --- tools/depends/target/ffmpeg/Makefile | 4 +- @@ -44073,10 +44041,10 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 6a887bec79c0c9c51ecfdf826d9d9673bcc9f288 Mon Sep 17 00:00:00 2001 +From dc6aec941ca8f460216ca8bf66b46656715a2bfb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 -Subject: [PATCH 28/63] ffmpeg: Add cabac opimisations for hevc +Subject: [PATCH 27/63] ffmpeg: Add cabac opimisations for hevc --- .../0001-Squashed-commit-of-the-following.patch | 2179 ++++++++++++++++++++ @@ -46321,10 +46289,10 @@ index d6856dbd4fb4957ace700cbc08332223c01938f6..a61357f14cb2139e8125ae04684bed1b make -j ${BUILDTHREADS} -From 55692ec5212ee1967dceb12271886d4438845257 Mon Sep 17 00:00:00 2001 +From 36a6ba5f840732df28e390357ba46b449b2c41be Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 -Subject: [PATCH 29/63] [3d] Make MVC a valid 3D filename tag +Subject: [PATCH 28/63] [3d] Make MVC a valid 3D filename tag --- xbmc/guilib/StereoscopicsManager.cpp | 9 +++++++++ @@ -46385,10 +46353,10 @@ index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eef bool m_useDisplayControlHWStereo; -From 317d4c5e46f0530b27f5ba01179e34175d8e9a03 Mon Sep 17 00:00:00 2001 +From 65a8984dee8017c5d4caa905c3b5a7bb93b6b71f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 -Subject: [PATCH 30/63] [3d] Swap top/bottom sides of GUI +Subject: [PATCH 29/63] [3d] Swap top/bottom sides of GUI --- xbmc/guilib/GraphicContext.cpp | 2 +- @@ -46408,10 +46376,10 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 1a9778af9ccb8c27a58a82907b6f1d18ac84a2a7 Mon Sep 17 00:00:00 2001 +From c6d749fbe5a53a5f46bdf2f7892d83d660b1a142 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 -Subject: [PATCH 31/63] Revert "Revert "Disable extra logging by default"" +Subject: [PATCH 30/63] Revert "Revert "Disable extra logging by default"" This reverts commit a880554325be187b877cd8f0e2b338e7267da636. --- @@ -46438,10 +46406,10 @@ index 326ffbd0f08428c3b4a95208134253feeabf1b1f..22dcff1c06577055f84c3d2c2fda73cf loggingcomponents , -From 4800a5c41c44a33c3bccb52716474ed77309e21e Mon Sep 17 00:00:00 2001 +From e9bcaf32252f8ae5577656784089ac72a36dfca0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 -Subject: [PATCH 32/63] [omximage] Fall back to arm jpeg encode/decode when gpu +Subject: [PATCH 31/63] [omximage] Fall back to arm jpeg encode/decode when gpu is busy --- @@ -46684,10 +46652,10 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 3834081dfbf66a8faa92a5f514c86de0b6c09179 Mon Sep 17 00:00:00 2001 +From 8494d6d8a306a9120de78d405a26bb2aa02a60e0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 -Subject: [PATCH 33/63] [mmalcodec] Fail to open when width is invalid. Can +Subject: [PATCH 32/63] [mmalcodec] Fail to open when width is invalid. Can happen with mpegts files --- @@ -46695,7 +46663,7 @@ Subject: [PATCH 33/63] [mmalcodec] Fail to open when width is invalid. Can 1 file changed, 3 insertions(+) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 1884c27272ad98ba5f8cbc7f275a7d9850cfab1d..e757ca64c1caf5c43988c2cb77da159b8f8eee93 100644 +index 822b7bf75f2e732b5eed8687403d0eda503fa641..c43952d4d29b42f3a5c7605573294568f79ca010 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -368,6 +368,9 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) @@ -46709,10 +46677,10 @@ index 1884c27272ad98ba5f8cbc7f275a7d9850cfab1d..e757ca64c1caf5c43988c2cb77da159b if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From c8985bee54655c26528c3b8ed5101d8f669f17f6 Mon Sep 17 00:00:00 2001 +From 56341aeab6129a9f1703e775106942990dba356f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 -Subject: [PATCH 34/63] [videoplayer/rbp] Add pi specific option to maintain +Subject: [PATCH 33/63] [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". @@ -47153,10 +47121,10 @@ index fffa5182126159f6dfcf750b21fa0464e229e545..815d758e7086d73b4d4eb16849fdbb50 extern CRBP g_RBP; -From 044a640b88cd4a02095731737711d011577bf809 Mon Sep 17 00:00:00 2001 +From 8f4047df28e4d97bd557c25c48a28f84f8137c9e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 -Subject: [PATCH 35/63] rbp: Support zero copy interface with hevc acceleration +Subject: [PATCH 34/63] rbp: Support zero copy interface with hevc acceleration --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 9 +++++++++ @@ -47184,10 +47152,10 @@ index 4129d3d6a77ce1a3f15bad045746970f6e640ea6..619515c9411172261d8f0bef24c5d679 else { diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index e0ba70f31e3972f23e0231a16b9ba84f4b511d2c..d42e3090c9b38a43ee72fdc3780a244317ece11a 100644 +index 77ae3273bc8e224fe6c193300ccef32fb7fbafe1..c0b3f19f2ef9cdef9adf00cf81154803b12feb4f 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -294,8 +294,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture +@@ -296,8 +296,9 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; picture->MMALBuffer->m_stills = m_hints.stills; @@ -47200,10 +47168,10 @@ index e0ba70f31e3972f23e0231a16b9ba84f4b511d2c..d42e3090c9b38a43ee72fdc3780a2443 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 534cd8664f784d6ce1dd59484f5cacafe90c9f9a Mon Sep 17 00:00:00 2001 +From 7cfd53ad93c69bc2bc352edd85f5bf6b1b1485a7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 -Subject: [PATCH 36/63] ffmpeg: use upstream mvc patches +Subject: [PATCH 35/63] ffmpeg: use upstream mvc patches --- ...vcodec-add-h264_mvc-codec-id-and-profiles.patch | 68 ++++++++++++ @@ -47513,10 +47481,10 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From 42c3af7c453ee02e0c83a267c150938389df0e4a Mon Sep 17 00:00:00 2001 +From 9e9ac546116d114bb9bab6a82251454aee6400a6 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 29 Jan 2016 17:18:50 +0300 -Subject: [PATCH 37/63] [win32] Settings: Added setting to enable/disable MVC +Subject: [PATCH 36/63] [win32] Settings: Added setting to enable/disable MVC decoder. --- @@ -47546,10 +47514,10 @@ index a017d30c24232fb01220b87b29398403b8ed9662..2fcee72a64e8b701c8e895143410bbe9 -From e717a6b60088a6c405c17503e3ab5ad1d1d67ecc Mon Sep 17 00:00:00 2001 +From 0e84b075e51f1457c98b7d38c7ba2fc4d0e12ad0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 -Subject: [PATCH 38/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc +Subject: [PATCH 37/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc streams. --- @@ -47557,7 +47525,7 @@ Subject: [PATCH 38/63] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a7e85f08d 100644 +index 54a18c669a058b705e0276cb7e14522ae6cd04ae..55431978dcfabee8da95e2e76292ff815cc74433 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -25,6 +25,7 @@ @@ -47568,7 +47536,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a #include "DVDClock.h" // for DVD_TIME_BASE #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" -@@ -1354,6 +1355,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1355,6 +1356,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) } case AVMEDIA_TYPE_VIDEO: { @@ -47584,7 +47552,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); stream = st; if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1362,7 +1372,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1363,7 +1373,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) st->bVFR = false; // never trust pts in avi files with h264. @@ -47593,7 +47561,7 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a st->bPTSInvalid = true; #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1433,6 +1443,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1434,6 +1444,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (av_dict_get(pStream->metadata, "title", NULL, 0)) st->m_description = av_dict_get(pStream->metadata, "title", NULL, 0)->value; @@ -47612,10 +47580,10 @@ index b3bdc5a75b77af7dff90ded100a97b848db358da..62e110e816f21e60c1564029fe646a0a } case AVMEDIA_TYPE_DATA: -From 9a4d3b6f6b304d51aa12d734e023059926ef34c4 Mon Sep 17 00:00:00 2001 +From e584658e6fd01160f6929b8b27ba60018dcbc3d4 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 -Subject: [PATCH 39/63] [Stereo3D] Added block_lr and block_rl to supported +Subject: [PATCH 38/63] [Stereo3D] Added block_lr and block_rl to supported modes. --- @@ -47665,10 +47633,10 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6aaa82f4d883b8cae0ccdedf6c5a6814 i++; } -From 0d7219d8c5e63b80cf07e4d2e45d7af5d225cc16 Mon Sep 17 00:00:00 2001 +From 2a63f273c86b704f4440180dad180aa0b6baa249 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 -Subject: [PATCH 40/63] [VideoPlayer] Fix possible wrong aspect. +Subject: [PATCH 39/63] [VideoPlayer] Fix possible wrong aspect. --- xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 2 +- @@ -47688,10 +47656,10 @@ index 903f0d83527d9088ff1bf0ba056f357f6abfda81..a5a33d34c70892cde77ad4d8f3cb65fd else m_fForcedAspectRatio = 0.0; -From 9f3dabbe75b336823dfe5ec3a453f9d48c4ee769 Mon Sep 17 00:00:00 2001 +From cad8678e8e0c8e5f6df1784e39b09d0b50e46ea0 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 -Subject: [PATCH 41/63] [VideoPlayer] DemuxFFmpeg: ssif remux +Subject: [PATCH 40/63] [VideoPlayer] DemuxFFmpeg: ssif remux --- xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt | 2 + @@ -47726,7 +47694,7 @@ index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..156ec2021002d9d7a355db2f0dcf099a DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc77b3d7ef 100644 +index 55431978dcfabee8da95e2e76292ff815cc74433..6df586ac1f2d00e55307358228a4be89278ce67e 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -166,6 +166,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() @@ -47824,7 +47792,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc return (ret >= 0); } -@@ -1357,11 +1385,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1358,11 +1386,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) { @@ -47840,7 +47808,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc break; } CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1447,7 +1476,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1448,7 +1477,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) { @@ -47853,7 +47821,7 @@ index 62e110e816f21e60c1564029fe646a0a7e85f08d..fb5dabe8558570bd2e48450b18778bfc } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) { -@@ -1559,7 +1592,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1560,7 +1593,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (langTag) strncpy(stream->language, langTag->value, 3); @@ -48125,10 +48093,10 @@ index 974305ff329eb6999c908d5e05d723f93137ae33..985ecf9722141d78471c00e90da15bfa m_discStubExtensions = ".disc"; // internal music extensions -From 7d58e1dbdf0a13bbb9e7264c6a7a500ddfd29c8b Mon Sep 17 00:00:00 2001 +From cc733938cde1d42634d7d8e42257fc6e083be8e8 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 -Subject: [PATCH 42/63] [3DBD] Added support of 3D-BluRay playback. +Subject: [PATCH 41/63] [3DBD] Added support of 3D-BluRay playback. --- lib/DllLibbluray.h | 8 + @@ -48206,7 +48174,7 @@ index 156ec2021002d9d7a355db2f0dcf099aabb1db48..87d27b666f703743bb0170252cf1190d DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65fbafa4326 100644 +index 6df586ac1f2d00e55307358228a4be89278ce67e..b7e5081bc0fc32eaaae42d894a288e7971139356 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -27,6 +27,7 @@ @@ -48267,7 +48235,7 @@ index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65f if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) stream = GetStream(pPacket->iStreamId); } -@@ -1480,6 +1485,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1481,6 +1486,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { m_pSSIF->SetH264StreamId(streamIdx); pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); @@ -48297,7 +48265,7 @@ index fb5dabe8558570bd2e48450b18778bfc77b3d7ef..3d4d22930da1ac1e090ba95ef0faa65f } } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1803,6 +1831,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) +@@ -1804,6 +1832,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) bool CDVDDemuxFFmpeg::IsProgramChange() { @@ -49118,10 +49086,10 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 3de6eb54b199d8c1bfe75061558d176de257be55 Mon Sep 17 00:00:00 2001 +From 3080245f6674405c3b0b707822c25e4b79e13161 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 11 Mar 2016 16:58:53 +0300 -Subject: [PATCH 43/63] [VideoPlayer] HasVideo returns true if video stream +Subject: [PATCH 42/63] [VideoPlayer] HasVideo returns true if video stream exists. This don't allow start visualization if audio is opened before video. --- @@ -49142,10 +49110,10 @@ index bb80b836b9c7528def9b623966d8b66aca9bcc92..d2482bcfb036cd5705afc3bae9bf759b bool CVideoPlayer::HasAudio() const -From 5a0375aa55d9fcc679382b12482cc66861df7ff5 Mon Sep 17 00:00:00 2001 +From a47ca13d3fd16c4b6f290d27e0f8de096efe2267 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 44/63] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 43/63] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -49182,10 +49150,10 @@ index 3a080d06c90b0762482816928642e6de7810b539..a8323f419e404037c4e5fb4d78fa1b45 CDVDOverlayImage* overlay = new CDVDOverlayImage(); -From e2498d26f1b7928017f856108aa8263e6c73194d Mon Sep 17 00:00:00 2001 +From 46403fe47fb6d6031ff14b7b87f617c62a1ffac6 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 7 Apr 2016 17:28:50 +0300 -Subject: [PATCH 45/63] [VideoPlayer] Disable reading extension stream from +Subject: [PATCH 44/63] [VideoPlayer] Disable reading extension stream from input stream if decoder doesn't support it. --- @@ -49218,7 +49186,7 @@ index a2da9de4375939f3711c594dc854b9a533c755b4..8101b6eeff0341a94736df7ee815dd4c CProcessInfo &m_processInfo; }; diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3d4d22930da1ac1e090ba95ef0faa65fbafa4326..0282b3e0c70c023c412128acae508d7ece3f294b 100644 +index b7e5081bc0fc32eaaae42d894a288e7971139356..6ea1a19173e36d49f7391b6f350c8ae3173db7ff 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -504,14 +504,14 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein @@ -49240,7 +49208,7 @@ index 3d4d22930da1ac1e090ba95ef0faa65fbafa4326..0282b3e0c70c023c412128acae508d7e } } // in case of mpegts and we have not seen pat/pmt, defer creation of streams -@@ -1487,13 +1487,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1488,13 +1488,13 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); AVStream* mvcStream = nullptr; @@ -49442,10 +49410,10 @@ index 0d4100e58e9db7e5035bcf9ae23b0147f80cec8f..69570153f0810a5840f3780c7a6681a1 // classes CDVDOverlayContainer* m_pOverlayContainer; -From 9352e854adf22fa92a355da385cf0b9930ab9821 Mon Sep 17 00:00:00 2001 +From b476191f4025c1df738647da0d6c5d0668245f2c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 16 Sep 2016 11:37:48 +0300 -Subject: [PATCH 46/63] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from +Subject: [PATCH 45/63] [Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from platform settings to common settings. --- @@ -49541,10 +49509,10 @@ index 6b1f2b6d757354d6065c2862b44dfb47184a1dcc..9163ec85bd0feb48a698a025d9870bf4 m_simpleConditions.insert("have_lcms2"); #endif -From 0bc38979bbe7ace03e826101248397b845581a7f Mon Sep 17 00:00:00 2001 +From bd777e3c8abfadd62da4d49ca716ff78ecd5874a Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 4 Nov 2016 22:56:56 +0300 -Subject: [PATCH 47/63] [VideoPlayer] SSIF: fix for corner case when mvc stream +Subject: [PATCH 46/63] [VideoPlayer] SSIF: fix for corner case when mvc stream is switched before the last packet is read from previous stream. --- @@ -49556,7 +49524,7 @@ Subject: [PATCH 47/63] [VideoPlayer] SSIF: fix for corner case when mvc stream 5 files changed, 45 insertions(+), 10 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 0282b3e0c70c023c412128acae508d7ece3f294b..c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e 100644 +index 6ea1a19173e36d49f7391b6f350c8ae3173db7ff..9149698884c8ae6a23649abbaa0e659587dfe982 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -1120,9 +1120,6 @@ bool CDVDDemuxFFmpeg::SeekTime(double time, bool backwards, double *startpts) @@ -49733,10 +49701,10 @@ index f70657c9e31fb2460d12910c635dba5163282e74..a11ec77903d2a9b2c68106a8e2301af9 typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From ed5005bc45795b939aeff91bed0f117c16b4dc2c Mon Sep 17 00:00:00 2001 +From a96b994955207e0c7ff733bc2b31d8b8a7605c48 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 -Subject: [PATCH 48/63] [libbluray] bump libbluray to 0.9.2-mvc. +Subject: [PATCH 47/63] [libbluray] bump libbluray to 0.9.2-mvc. --- project/BuildDependencies/scripts/0_package.list | 2 +- @@ -49756,10 +49724,10 @@ index e6c608023a46d377ef520bf23e9863ee0350d980..f8db70ab3861835f33f0e4be79cf3d19 libcec-4.0.0-win32-vc140-2.7z libfribidi-0.19.2-win32.7z -From c0fee4b9928898a5d274afb281bcb47914858ebb Mon Sep 17 00:00:00 2001 +From 88dcdffc2fe7eace35620fde0315a82b252f8d9f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 -Subject: [PATCH 49/63] libbluray: Bump to Nevcairie's v0.9.2 +Subject: [PATCH 48/63] libbluray: Bump to Nevcairie's v0.9.2 This includes 3D support --- @@ -51416,10 +51384,10 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From a8036877d09fcadda752e2ef27141713d375db8e Mon Sep 17 00:00:00 2001 +From e5d32f65e3ee192a733c4b00d20f378268a79023 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 -Subject: [PATCH 50/63] mvc: Automatically enable stereo mode +Subject: [PATCH 49/63] mvc: Automatically enable stereo mode --- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 6 +++++- @@ -51427,7 +51395,7 @@ Subject: [PATCH 50/63] mvc: Automatically enable stereo mode 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index e757ca64c1caf5c43988c2cb77da159b8f8eee93..368a26d9d7f1f3ca8b1666cb188446b120b934c2 100644 +index c43952d4d29b42f3a5c7605573294568f79ca010..68459e35bc2cda048c150c7079fb30eb0ffb823c 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -403,13 +403,17 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) @@ -51477,10 +51445,10 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 16bdfb5fba5132fc097c56c116a4628cf8ba05aa Mon Sep 17 00:00:00 2001 +From 2ed9e6c6d5c849ea462f639c1a17839c6e6b43de Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 -Subject: [PATCH 51/63] ffmpeg: mvc: fix for pixelation from packets with no +Subject: [PATCH 50/63] ffmpeg: mvc: fix for pixelation from packets with no pts/dts --- @@ -51542,10 +51510,10 @@ index 7e97e4d91a443d46d933df528763422ff5e8f4fa..d4f279fd4f2ceb260698cd6fedb124ba cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 47c649a1866f8897059db26a63e43e3666223b95 Mon Sep 17 00:00:00 2001 +From 1639d699062f89bc1d7e5138f5545b91f24050d0 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 11 Nov 2016 15:53:53 +0000 -Subject: [PATCH 52/63] stereoscopicmanager: fixups for rbp +Subject: [PATCH 51/63] stereoscopicmanager: fixups for rbp --- xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp | 61 ++++++++++++++++++++++ @@ -51668,7 +51636,7 @@ index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bf static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); }; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 368a26d9d7f1f3ca8b1666cb188446b120b934c2..2257c94a6b095d9b0926c418c1faaf2ebfadf088 100644 +index 68459e35bc2cda048c150c7079fb30eb0ffb823c..dca872373080156100618d58d9782e2461fa2648 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -362,6 +362,11 @@ bool CMMALVideo::SendCodecConfigData() @@ -51783,10 +51751,10 @@ index 6aaa82f4d883b8cae0ccdedf6c5a6814e7aaa720..cc929b599125a44ac128713fd4331782 }; -From 89abe07219f314eb147833325a41323ca13932bc Mon Sep 17 00:00:00 2001 +From a9e35159a5ba7e50e4236943baf842488748d316 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 -Subject: [PATCH 53/63] fixup! Revert supporting crappy tab/sbs subtitles. this +Subject: [PATCH 52/63] fixup! Revert supporting crappy tab/sbs subtitles. this fixes regular subtitles. --- @@ -51806,10 +51774,10 @@ index a8323f419e404037c4e5fb4d78fa1b45409337a7..7c0b70777556ac7694e7fc511cd4bb18 } -From 6c4da5b733b9fd7092ad84c0213f99c9f917b1b5 Mon Sep 17 00:00:00 2001 +From 062eb2cc1e8a906151c391b924626cd0b0b67cf2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 26 Nov 2016 18:24:18 +0000 -Subject: [PATCH 54/63] DemuxMVC: fixup after SeekTime API change +Subject: [PATCH 53/63] DemuxMVC: fixup after SeekTime API change --- xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMVC.cpp | 2 +- @@ -51843,10 +51811,10 @@ index bbb836a61344689a83af68c821c05c212a86b097..54f91a02391368fbfbb4d669c003f425 virtual int GetStreamLength() { return 0; }; virtual CDemuxStream* GetStream(int iStreamId) const override { return nullptr; }; -From 08f34e983316fb995d27145fe023c5dbf7316df9 Mon Sep 17 00:00:00 2001 +From ab0855cffe8439245a78bb782a87403c9a648fa6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Nov 2014 23:17:46 +0000 -Subject: [PATCH 55/63] [cec] Don't discard buttons when repeat mode is enabled +Subject: [PATCH 54/63] [cec] Don't discard buttons when repeat mode is enabled --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 5 ++++- @@ -51869,10 +51837,10 @@ index 30367a3fde956090afdca9930fa52e829f35046f..febacb3b7964eab3b8615a6a807e0f27 if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) { -From fc196a50f90057e3eb1b6553347a9d400c717db8 Mon Sep 17 00:00:00 2001 +From 01134bb4ce99d42b301cb59a056f8b3a4a950691 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 -Subject: [PATCH 56/63] [cec] Temp - more logging +Subject: [PATCH 55/63] [cec] Temp - more logging --- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 8 +++++++- @@ -51924,37 +51892,10 @@ index febacb3b7964eab3b8615a6a807e0f27d911b4da..52d6e6a7ab68ce91faf5a3881b23ea7a } -From dd28ae7d01450884dca135169ca72a6ac6344117 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 22 Mar 2016 09:51:52 +0100 -Subject: [PATCH 57/63] python: use kodi provided cert if available - ---- - xbmc/interfaces/python/XBPython.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp -index bc84af9411ef55eaf5ba71a320b5cbfec5f49548..ff4ed7db26845905108ea0ae504e4f589f9c7d0f 100644 ---- a/xbmc/interfaces/python/XBPython.cpp -+++ b/xbmc/interfaces/python/XBPython.cpp -@@ -595,6 +595,12 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker) - CEnvironment::putenv(buf); - #endif - -+#if !defined(TARGET_WINDOWS) -+ // use Kodi provided cert if available -+ if (XFILE::CFile::Exists("special://xbmc/system/certs/cacert.pem")) -+ setenv("SSL_CERT_FILE", CSpecialProtocol::TranslatePath("special://xbmc/system/certs/cacert.pem").c_str(), 1); -+#endif -+ - if (PyEval_ThreadsInitialized()) - PyEval_AcquireLock(); - else - -From 2ed41ab819cb7060380c1f7cba57edbd0ad0fba8 Mon Sep 17 00:00:00 2001 +From dd34508720f1d953309dae3d5c60b1b7dde6f0fb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 -Subject: [PATCH 58/63] rbp: Hard code the number of buffers to improve audio +Subject: [PATCH 56/63] rbp: Hard code the number of buffers to improve audio sync --- @@ -51996,10 +51937,10 @@ index 54cf477648bba4583904cf122b4e66f6bbdd9469..908d73b151845c2f85a897ca5714fa1f } -From 82f3257a709241542444806947dc2b573715e399 Mon Sep 17 00:00:00 2001 +From b7162b31cca37bb6132f1d8c41e3706d1542e74f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 -Subject: [PATCH 59/63] rbp: Update the GL libs to new naming scheme +Subject: [PATCH 57/63] 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. @@ -52013,7 +51954,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 87bfbbfe8b833cec9cdef6b16d311471b162d564..dd67c5e53183b5c2c19de44bb246ed7b86372453 100644 +index 9b8b8892651d6f343346657469159a0d9789a147..d55d3596deec47bf71f400af4ea936ab4ea9063a 100644 --- a/configure.ac +++ b/configure.ac @@ -949,7 +949,7 @@ if test "$use_gles" = "yes"; then @@ -52064,20 +52005,20 @@ index 3626ea5204eb561dc1ae0b64c6bb7253d2ec59ec..100ff3178bafe7434bd5456100b5bb71 fi -From 364926a71cd3cf33b948a2e1ef1fd13881a0a95e Mon Sep 17 00:00:00 2001 +From e7066cc50413ee4ed047c6a4ed559b64ef189d08 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 -Subject: [PATCH 60/63] ffmpeg: hacky fix for files with GMC +Subject: [PATCH 58/63] ffmpeg: hacky fix for files with GMC --- xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e..0a46eef4d265f1d0bca9215fd92a355af7d242ca 100644 +index 9149698884c8ae6a23649abbaa0e659587dfe982..84d515e9e2df6a4c1c448a52a42f4675deab7991 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1457,8 +1457,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1458,8 +1458,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -52089,10 +52030,10 @@ index c3e8a84ed2cdb148717f05ca85aebb21bb2dab6e..0a46eef4d265f1d0bca9215fd92a355a { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From 2a1502990a40ce020d6f51681e6adffdea9a0bc8 Mon Sep 17 00:00:00 2001 +From 8300544c9c4a4de028efc0b19873b6f1907100c8 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 -Subject: [PATCH 61/63] mmalrender: Add sharpness control +Subject: [PATCH 59/63] mmalrender: Add sharpness control --- addons/resource.language.en_gb/resources/strings.po | 2 +- @@ -52114,7 +52055,7 @@ index 7c7969d381bf15ac1ba2fd8f16e463f6b12fe4c3..45cf0830ea6079a0f2ad22792f2497c5 #empty string with id 16314 diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf80ac527c 100644 +index 84953d116610e9fd262de968ffe26d6063a9193b..f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp @@ -411,6 +411,7 @@ CMMALRenderer::CMMALRenderer() : CThread("MMALRenderer"), m_processThread(this, @@ -52125,7 +52066,7 @@ index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf m_vout_width = 0; m_vout_height = 0; m_vout_aligned_width = 0; -@@ -845,6 +846,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) +@@ -847,6 +848,15 @@ void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha) goto exit; } @@ -52141,7 +52082,7 @@ index d0b88727674b67b851a7b74cb946cafe64e3ff6e..0b73b7700ce8a63932d3fa3b90dda8cf if (m_format != RENDER_FMT_MMAL) { if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -@@ -1021,7 +1031,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) +@@ -1023,7 +1033,8 @@ bool CMMALRenderer::Supports(ERENDERFEATURE feature) feature == RENDERFEATURE_ZOOM || feature == RENDERFEATURE_ROTATION || feature == RENDERFEATURE_VERTICAL_SHIFT || @@ -52164,10 +52105,10 @@ index e0e6f7c0e0546013ca74265aef54704fd332f8e4..69eae6cbef0131d20dc979dcb35915cd CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From 60198462cb88a0e0bcee714c4d3d0b418b01af76 Mon Sep 17 00:00:00 2001 +From 3e41494ac12f46aa414ff58d218644a2041d8690 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 14 Oct 2016 15:37:53 +0100 -Subject: [PATCH 62/63] MMALFFMpeg: Report as SW decode in codec overlay info +Subject: [PATCH 60/63] MMALFFMpeg: Report as SW decode in codec overlay info --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- @@ -52187,98 +52128,186 @@ index 619515c9411172261d8f0bef24c5d679c35e5d7d..b31c984c0a507891f2754146a4c62802 CLog::Log(LOGDEBUG, "CDVDVideoCodecFFmpeg - Updated codec: %s", m_name.c_str()); } -From 7d4c324285dbe6d3a90c6f379178388841395f66 Mon Sep 17 00:00:00 2001 +From 6d6039a219811d116427ed7419b6cd815d5980c5 Mon Sep 17 00:00:00 2001 From: popcornmix -Date: Tue, 8 Nov 2016 17:29:02 +0000 -Subject: [PATCH 63/63] MMALRender: Reduce log spam +Date: Mon, 7 Nov 2016 18:28:01 +0000 +Subject: [PATCH 61/63] advancedsettings: Add option to set cache size on + libass + +E.g to set total cache size in libass to 32M + + + 32 + + +When unset it defaults to 192M +--- + xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp | 3 +++ + xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h | 3 +++ + xbmc/settings/AdvancedSettings.cpp | 5 +++++ + xbmc/settings/AdvancedSettings.h | 2 ++ + 4 files changed, 13 insertions(+) + +diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp +index 0f5e1ace4c85f65a0ab5dbd8e6f1c2715d60467d..7a236080bc96466d34e14b9b0d82ba4084276abd 100644 +--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp ++++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp +@@ -28,6 +28,7 @@ + #include "utils/StringUtils.h" + #include "threads/SingleLock.h" + #include "guilib/GraphicContext.h" ++#include "settings/AdvancedSettings.h" + + static void libass_log(int level, const char *fmt, va_list args, void *data) + { +@@ -75,6 +76,8 @@ CDVDSubtitlesLibass::CDVDSubtitlesLibass() + if(!m_renderer) + return; + ++ m_dll.ass_set_cache_limits(m_renderer, 0, g_advancedSettings.m_libAssCache); ++ + //Setting default font to the Arial in \media\fonts (used if FontConfig fails) + strPath = URIUtils::AddFileToFolder("special://home/media/Fonts/", CSettings::GetInstance().GetString(CSettings::SETTING_SUBTITLES_FONT)); + if (!XFILE::CFile::Exists(strPath)) +diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h +index f9de4f15e7c612d69ef46e7cad870ecb61afaec3..b5303fd100f1a930eb5c010a951932064d5190c4 100644 +--- a/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h ++++ b/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h +@@ -64,6 +64,7 @@ public: + virtual void ass_set_message_cb(ASS_Library *priv + , void (*msg_cb)(int level, const char *fmt, va_list args, void *data) + , void *data)=0; ++ virtual void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, int bitmap_max)=0; + }; + + class DllLibass : public DllDynamic, DllLibassInterface +@@ -91,6 +92,7 @@ class DllLibass : public DllDynamic, DllLibassInterface + DEFINE_METHOD5(void, ass_process_chunk, (ASS_Track* p1, char* p2, int p3, long long p4, long long p5)) + DEFINE_METHOD3(void, ass_process_codec_private, (ASS_Track* p1, char* p2, int p3)) + DEFINE_METHOD3(void, ass_set_message_cb, (ASS_Library* p1, void (*p2)(int level, const char *fmt, va_list args, void *data), void* p3)) ++ DEFINE_METHOD3(void, ass_set_cache_limits, (ASS_Renderer *p1, int p2, int p3)) + BEGIN_METHOD_RESOLVE() + RESOLVE_METHOD(ass_set_extract_fonts) + RESOLVE_METHOD(ass_set_fonts_dir) +@@ -114,5 +116,6 @@ class DllLibass : public DllDynamic, DllLibassInterface + RESOLVE_METHOD(ass_process_chunk) + RESOLVE_METHOD(ass_process_codec_private) + RESOLVE_METHOD(ass_set_message_cb) ++ RESOLVE_METHOD(ass_set_cache_limits) + END_METHOD_RESOLVE() + }; +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index 985ecf9722141d78471c00e90da15bfad931462a..a33581ba02a26110105a2d0ae810d96c410efbf1 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -364,6 +364,8 @@ void CAdvancedSettings::Initialize() + #else + m_cacheMemSize = 1024 * 1024 * 20; + #endif ++ m_libAssCache = 0; ++ + m_cacheBufferMode = CACHE_BUFFER_MODE_INTERNET; // Default (buffer all internet streams/filesystems) + // the following setting determines the readRate of a player data + // as multiply of the default data read rate +@@ -1026,6 +1028,9 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) + XMLUtils::GetFloat(pRootElement, "controllerdeadzone", m_controllerDeadzone, 0.0f, 1.0f); + XMLUtils::GetUInt(pRootElement, "fanartres", m_fanartRes, 0, 1080); + XMLUtils::GetUInt(pRootElement, "imageres", m_imageRes, 0, 1080); ++ ++ XMLUtils::GetUInt(pRootElement, "libasscache", m_libAssCache, 0, 1024); ++ + if (XMLUtils::GetString(pRootElement, "imagescalingalgorithm", tmp)) + m_imageScalingAlgorithm = CPictureScalingAlgorithm::FromString(tmp); + XMLUtils::GetBoolean(pRootElement, "playlistasfolders", m_playlistAsFolders); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index 6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c..35bf38719f0eaaa5ac29e9495480ae97f6aceca7 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -345,6 +345,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler + unsigned int m_cacheBufferMode; + float m_cacheReadFactor; + ++ unsigned int m_libAssCache; ++ + bool m_jsonOutputCompact; + unsigned int m_jsonTcpPort; + + +From 697282f92f3ed14814f1db2d6948f49213bdd8c0 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Sun, 13 Nov 2016 20:30:15 +0000 +Subject: [PATCH 62/63] [rbp] Experimental limit libass cache size depending on + arm memory size --- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 4 ++-- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 6 ++++-- - .../cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 8 +++++--- - 3 files changed, 11 insertions(+), 7 deletions(-) + xbmc/linux/RBP.cpp | 4 +++- + xbmc/settings/AdvancedSettings.cpp | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 2257c94a6b095d9b0926c418c1faaf2ebfadf088..dca872373080156100618d58d9782e2461fa2648 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -224,7 +224,7 @@ static void dec_input_port_cb_static(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *bu - void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) +diff --git a/xbmc/linux/RBP.cpp b/xbmc/linux/RBP.cpp +index 6e8529001b1a464b4547a846f553d98f5bc0b6c0..238eba372af2cbab11d7543c857ee47640901d13 100644 +--- a/xbmc/linux/RBP.cpp ++++ b/xbmc/linux/RBP.cpp +@@ -65,6 +65,8 @@ void CRBP::InitializeSettings() { - if (!(buffer->cmd == 0 && buffer->length > 0)) -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s port:%p buffer %p, len %d cmd:%x flags:%x", CLASSNAME, __func__, port, buffer, buffer->length, buffer->cmd, buffer->flags); - - bool kept = false; -@@ -617,7 +617,7 @@ void CMMALVideo::Dispose() - - void CMMALVideo::SetDropState(bool bDrop) - { -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (bDrop != m_dropState) - CLog::Log(LOGDEBUG, "%s::%s - bDrop(%d)", CLASSNAME, __func__, bDrop); - m_dropState = bDrop; - } -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index d42e3090c9b38a43ee72fdc3780a244317ece11a..c0b3f19f2ef9cdef9adf00cf81154803b12feb4f 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -42,6 +42,8 @@ using namespace MMAL; - - #define CLASSNAME "CMMALYUVBuffer" - -+#define VERBOSE 0 -+ - CMMALYUVBuffer::CMMALYUVBuffer(CDecoder *omv, std::shared_ptr pool, uint32_t mmal_encoding, uint32_t width, uint32_t height, uint32_t aligned_width, uint32_t aligned_height, uint32_t size) - : CMMALBuffer(pool), m_omv(omv) - { -@@ -72,13 +74,13 @@ CMMALYUVBuffer::CMMALYUVBuffer(CDecoder *omv, std::shared_ptr pool, u - gmem = m_pool->AllocateBuffer(size_pic); - if (gmem) - gmem->m_opaque = (void *)this; -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p mmal:%p %dx%d (%dx%d) size:%d %.4s", CLASSNAME, __FUNCTION__, this, gmem, mmal_buffer, m_width, m_height, m_aligned_width, m_aligned_height, gmem->m_numbytes, (char *)&m_encoding); + if (m_initialized && g_advancedSettings.m_cacheMemSize == ~0U) + g_advancedSettings.m_cacheMemSize = m_arm_mem < 256 ? 1024 * 1024 * 2 : 1024 * 1024 * 20; ++ if (m_initialized && g_advancedSettings.m_libAssCache == ~0U) ++ g_advancedSettings.m_libAssCache = m_arm_mem < 256 ? 21 : m_arm_mem < 512 ? 42 : 96; } - CMMALYUVBuffer::~CMMALYUVBuffer() - { -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p mmal:%p %dx%d (%dx%d) size:%d %.4s", CLASSNAME, __FUNCTION__, this, gmem, mmal_buffer, m_width, m_height, m_aligned_width, m_aligned_height, gmem->m_numbytes, (char *)&m_encoding); - if (gmem) - m_pool->ReleaseBuffer(gmem); -diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -index 0b73b7700ce8a63932d3fa3b90dda8cf80ac527c..f5f0f0d01227b3b4dcebb4a22a54dbcaac2d5ee9 100644 ---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp -@@ -638,7 +638,8 @@ void CMMALRenderer::Run() - if (m_queue_render) - { - mmal_queue_put(m_queue_render, buffer); -- CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, omvb); -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, omvb); - kept = true; - } - else -@@ -646,7 +647,8 @@ void CMMALRenderer::Run() - CheckConfigurationVout(omvb->m_width, omvb->m_height, omvb->m_aligned_width, omvb->m_aligned_height, omvb->m_encoding); - if (m_vout_input) - { -- CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, omvb); -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, omvb); - MMAL_STATUS_T status = mmal_port_send_buffer(m_vout_input, buffer); - if (status != MMAL_SUCCESS) - CLog::Log(LOGERROR, "%s::%s - Failed to send buffer %p to %s (status=0%x %s)", CLASSNAME, __func__, buffer, m_vout_input->name, status, mmal_status_to_string(status)); -@@ -765,7 +767,7 @@ int CMMALRenderer::GetImage(YV12Image *image, int source, bool readonly) - CLog::Log(LOGDEBUG, "%s::%s - invalid: format:%d image:%p source:%d ro:%d", CLASSNAME, __func__, m_format, image, source, readonly); - return -1; - } -- if (g_advancedSettings.CanLogComponent(LOGVIDEO)) -+ if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO)) - CLog::Log(LOGDEBUG, "%s::%s - MMAL: image:%p source:%d ro:%d", CLASSNAME, __func__, image, source, readonly); - return source; - } + bool CRBP::Initialize() +@@ -120,7 +122,7 @@ void CRBP::LogFirmwareVerison() + response[sizeof(response) - 1] = '\0'; + CLog::Log(LOGNOTICE, "Raspberry PI firmware version: %s", response); + CLog::Log(LOGNOTICE, "ARM mem: %dMB GPU mem: %dMB MPG2:%d WVC1:%d", m_arm_mem, m_gpu_mem, m_codec_mpg2_enabled, m_codec_wvc1_enabled); +- CLog::Log(LOGNOTICE, "cache.memorysize: %dMB", g_advancedSettings.m_cacheMemSize >> 20); ++ CLog::Log(LOGNOTICE, "cache.memorysize: %dMB libass.cache: %dMB", g_advancedSettings.m_cacheMemSize >> 20, g_advancedSettings.m_libAssCache); + m_DllBcmHost->vc_gencmd(response, sizeof response, "get_config int"); + 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 a33581ba02a26110105a2d0ae810d96c410efbf1..d70e2cf3113bbe0dad60dfc7accc8d77f7f30c30 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -361,8 +361,10 @@ void CAdvancedSettings::Initialize() + #ifdef TARGET_RASPBERRY_PI + // want default to be memory dependent, but interface to gpu not available yet, so set in RBP.cpp + m_cacheMemSize = ~0; ++ m_libAssCache = ~0; + #else + m_cacheMemSize = 1024 * 1024 * 20; ++ m_libAssCache = 0; + #endif + m_libAssCache = 0; + + +From 8023a6f6c50211f85546ec1fb32237b9bcc119b0 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Wed, 14 Dec 2016 21:50:33 +0000 +Subject: [PATCH 63/63] VideoPlayer: Don't add timestamp offsets to + DVD_NOPTS_VALUE + +I have a dvd menu that results in a renderer configure timeout. +The dts and pts timestamps are wild. +I've traced it back to pts=DVD_NOPTS_VALUE being adjusted and so no longer being treated as invalid +--- + xbmc/cores/VideoPlayer/VideoPlayer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp +index eda74e7b74452c7e8dfc18571ebcd355bd12a247..60900cac14932061eedc317e2efd2f0d8ae4a029 100644 +--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp ++++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp +@@ -1610,9 +1610,9 @@ void CVideoPlayer::Process() + if (CDVDInputStream::IMenus* menu = dynamic_cast(m_pInputStream)) + { + double correction = menu->GetTimeStampCorrection(); +- if (pPacket->dts > correction) ++ if (pPacket->dts != DVD_NOPTS_VALUE && pPacket->dts > correction) + pPacket->dts -= correction; +- if (pPacket->pts > correction) ++ if (pPacket->pts != DVD_NOPTS_VALUE && pPacket->pts > correction) + pPacket->pts -= correction; + } + if (m_dvd.syncClock)