From 703f765ff9a7b52438ae9ea698a1fe78ad5e8f6a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 5 Oct 2016 06:12:18 +0100 Subject: [PATCH] RPi/RPi2: Update kodi support patches --- .../RPi/patches/kodi/kodi-001-backport.patch | 412 +++++++++--------- .../RPi2/patches/kodi/kodi-001-backport.patch | 412 +++++++++--------- 2 files changed, 416 insertions(+), 408 deletions(-) diff --git a/projects/RPi/patches/kodi/kodi-001-backport.patch b/projects/RPi/patches/kodi/kodi-001-backport.patch index 522fa768ba..b7ee1682e9 100644 --- a/projects/RPi/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi/patches/kodi/kodi-001-backport.patch @@ -1,4 +1,4 @@ -From e0fbc9049e9671c4ec071b21a44b3ee2ec631246 Mon Sep 17 00:00:00 2001 +From 202e6e44d01a65054e0609f659cb3a3244012fc6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 17:27:39 +0100 Subject: [PATCH 01/71] build: Allow installed links to be overwritten @@ -9,10 +9,10 @@ Subject: [PATCH 01/71] build: Allow installed links to be overwritten 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile -index 16c82d3cb06e20adf27e7f429eebda6b7efbdf8c..8dcfe26cbc29ebe47cdb212712ae64745f8a009e 100644 +index c35e4849aa2651868e06046d397e0c3126b6b829..9bca1889b127a690082c2fb55625fc9a385a97d1 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile -@@ -129,41 +129,41 @@ distclean:: +@@ -130,41 +130,41 @@ distclean:: for d in $(DEPENDS); do $(MAKE) -C $$d distclean; done linux-system-libs-egl: @@ -91,7 +91,7 @@ index 16c82d3cb06e20adf27e7f429eebda6b7efbdf8c..8dcfe26cbc29ebe47cdb212712ae6474 + [ -f $(PREFIX)/lib/pkgconfig/xmu.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/xmu.pc $(PREFIX)/lib/pkgconfig/xmu.pc + [ -f $(PREFIX)/lib/pkgconfig/libdrm.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/libdrm.pc $(PREFIX)/lib/pkgconfig/libdrm.pc diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include -index 42c58313b0bdab7113955ff00d594014758e148e..433b609aee40f8804380c9b71eb4ffb310b0a985 100644 +index 5eb06d2001cfd049fce02b9dacf20f4fc76252d6..499d41f3c4c2307c3275dc3562d37def8ea9eb16 100644 --- a/tools/depends/xbmc-addons.include +++ b/tools/depends/xbmc-addons.include @@ -77,23 +77,23 @@ $(TOOLCHAIN_FILE): $(abs_top_srcdir)/target/Toolchain_binaddons.cmake @@ -137,7 +137,7 @@ index 42c58313b0bdab7113955ff00d594014758e148e..433b609aee40f8804380c9b71eb4ffb3 + [ -f $(ADDON_DEPS_DIR)/lib/libm.so ] || ln -sf /usr/lib/$(HOST)/libm.so $(ADDON_DEPS_DIR)/lib/ -From 7f1c046ecb10fe915d3593fdd4d3a5e5ae255948 Mon Sep 17 00:00:00 2001 +From 1329a7396dd89969d74e7de39afd19d1a7222301 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 Subject: [PATCH 02/71] [rbp/omxplayer] When opening a stream don't try to @@ -164,7 +164,7 @@ index 8ea5161637b4e66ddd222859f058521dbc8922b9..811019a39a10acc21b83f0b0c70d5500 dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 834675ae156d1a4293e18e2bd34a1ebce2b9ec59 Mon Sep 17 00:00:00 2001 +From 0314e11a8feb42ae384949cd37f51b2896415bda Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 Subject: [PATCH 03/71] [hifiberry] Hack: force it to be recognised as IEC958 @@ -190,7 +190,7 @@ index 6a9066b2dbe8d505d636b3638c1d35c7c8a698ed..9c6ac5d4cc9bf21b2d48619cc6fb5d27 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From 515de482dd2a995fd5b64c3be4153d4bb9a2d9a2 Mon Sep 17 00:00:00 2001 +From a78b4e9bbfc81096248953941c45fd01c86bcbda Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 Subject: [PATCH 04/71] Improved file buffering in CArchive @@ -253,7 +253,7 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 273657ebc526f42bda4fa39469601e505f73aad7 Mon Sep 17 00:00:00 2001 +From 0a3b521962f2aaa2e0d30ab608dc53e01926a8c3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 Subject: [PATCH 05/71] filesystem: Make support of browsing into archives @@ -275,10 +275,10 @@ We'll let people who don't use archives disable it manually 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 691130c0639919069cc0a5a2ad3b96d5aeabfc51..f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70 100644 +index 7d8a53cadd599d0ff415f80c497f63e577b58334..d86a219b8f5a586c237494656ba77ea204aa41aa 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19296,6 +19296,15 @@ msgstr "" +@@ -19309,6 +19309,15 @@ msgstr "" #: system/settings/rbp.xml msgctxt "#38010" msgid "GPU accelerated" @@ -315,10 +315,10 @@ index 62e9c8ed2199f8c57a640b06b0216ee4c8f0ca1e..e8b0d3d472b02fd161a4b51e957b9129 + diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp -index 9fb278691ebb07df53f3c0fe35930124e1468546..3bc1660cc74aa2fef41a4cedc2a0acf1d65f7d9a 100644 +index 161304a597b4c8fb859d5951d3037e33cfeadf5c..e7e13cae766c00133b67c2a9a6962a9a451a1d64 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp -@@ -1860,7 +1860,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, +@@ -1886,7 +1886,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, URIUtils::RemoveExtension(strCandidate); if (StringUtils::StartsWithNoCase(strCandidate, videoName)) { @@ -327,7 +327,7 @@ index 9fb278691ebb07df53f3c0fe35930124e1468546..3bc1660cc74aa2fef41a4cedc2a0acf1 CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), "", item_exts, associatedFiles); else { -@@ -1870,7 +1870,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, +@@ -1896,7 +1896,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, } else { @@ -366,7 +366,7 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From 5688f7e0f6512c7461246bd6922b78d3320d5d9f Mon Sep 17 00:00:00 2001 +From b80c2a021a60985149d421825e49fcf6fc766d4c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 Subject: [PATCH 06/71] [rbp] Make cachemembuffersize default depend on memory @@ -471,7 +471,7 @@ index 6beebe0c9c11b0bab63e5abbd4aea2d62bb05f0c..03f566d3ee4eab690d2236b773908026 } -From 3e385816aea376672ca01125699ffa91459402dc Mon Sep 17 00:00:00 2001 +From 116128e0f9fcc11c5f7b373a30afb4c4facacfcb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 Subject: [PATCH 07/71] [settings] Experiment: Report DESKTOP resolution in @@ -496,7 +496,7 @@ index c1cca7efdd5d119b07308b947c569911f2a9bdc9..e03f3c8ef21ba824c0d707042e5a735a StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From 06b1a288a2b0c0b2a0b7fcbadd96d6b17ce1f97b Mon Sep 17 00:00:00 2001 +From bee429c529aae1f826d6c3d8417a3bb3e4c02abc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 Subject: [PATCH 08/71] [audio] Add settings option to boost centre channel @@ -517,12 +517,12 @@ Should work with Pi Sink (dvdplayer/paplayer) and omxplayer 5 files changed, 46 insertions(+) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70..2b107342c18c9a2e750bf68db262f2eedbd4ade7 100644 +index d86a219b8f5a586c237494656ba77ea204aa41aa..4e4dd800fd0ad8f4b4bb2956d99f881b018b1022 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19470,6 +19470,21 @@ msgstr "" +@@ -19507,6 +19507,21 @@ msgstr "" - #empty strings from id 38043 to 38099 + #empty strings from id 38047 to 38099 +#: system/settings/settings.xml +msgctxt "#38007" @@ -543,7 +543,7 @@ index f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70..2b107342c18c9a2e750bf68db262f2ee #: system/settings/settings.xml msgctxt "#38100" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 0551388f478210c3be778a1a2997d8c01c7e79ee..4c0da310a630190e2adabe5ddab9ce46f9401a45 100644 +index 1ec0aa46101746ca21909c5effb36a74811b0d1e..7f43d130c47edcaf22f33ef547124134d30e7cbb 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2361,6 +2361,18 @@ @@ -625,7 +625,7 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From 8fa800bce04b64021f1623112f4015d973affb78 Mon Sep 17 00:00:00 2001 +From f7e5a05d6fbdb4cbd467d5ffa6bd809c5bd2ab33 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 Subject: [PATCH 09/71] [rbp] Default extract thumbnails to false @@ -654,7 +654,7 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From ee959b77b717002e7c7beff9119413902b710b96 Mon Sep 17 00:00:00 2001 +From 603a4b2646b57853646a661c23862bab8db4583a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 Subject: [PATCH 10/71] [languageinvoker] Reduce priority of python threads @@ -680,7 +680,7 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From e81b98b935889eef655745c3fbe8e43faab90af9 Mon Sep 17 00:00:00 2001 +From 4a5f93e97a2b82b0c7f6894da3936440e714aa63 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 14 Dec 2013 16:55:05 +0000 Subject: [PATCH 11/71] logging: Add microsecond timer to log messages @@ -734,7 +734,7 @@ index 3443f1293d86018830269ed992c90a4e69c0430c..d330320842243df6f5ff256e608dddfa levelNames[logLevel]) + strData; -From b9b964f7aa9c2a94c725401dea4732eb103dcc8f Mon Sep 17 00:00:00 2001 +From dc92e0e62f88c0828188701c5cfa5d0819949159 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 Subject: [PATCH 12/71] [rbp] hack: wait for splash to complete before changing @@ -821,7 +821,7 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From 0506ace2f698f48bcda87b67f472f38177ecdcf9 Mon Sep 17 00:00:00 2001 +From 1777c5c26c2fb2173d61ab50334d14f533aa5b45 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 Subject: [PATCH 13/71] Fix for UI not showing both extractflags and @@ -833,10 +833,10 @@ Subject: [PATCH 13/71] Fix for UI not showing both extractflags and 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77ee30cc5a0 100644 +index 4e4dd800fd0ad8f4b4bb2956d99f881b018b1022..2d352a3a844ec7888f982dc2330f2a1635d2c43c 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -12442,7 +12442,7 @@ msgstr "" +@@ -12443,7 +12443,7 @@ msgstr "" #: system/settings/settings.xml msgctxt "#20433" @@ -845,7 +845,7 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp -@@ -16932,7 +16932,7 @@ msgstr "" +@@ -16945,7 +16945,7 @@ msgstr "" #. Description of setting with label #20433 "Extract thumbnails and video information" #: system/settings/settings.xml msgctxt "#36178" @@ -854,7 +854,7 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #. Description of setting with label #20419 "Replace file names with library titles" -@@ -16944,7 +16944,7 @@ msgstr "" +@@ -16957,7 +16957,7 @@ msgstr "" #. Description of setting with label #20433 "Extract thumbnails and video information" #: system/settings/settings.xml msgctxt "#36180" @@ -863,16 +863,16 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #: system/settings/settings.xml -@@ -19612,3 +19612,7 @@ msgstr "" - msgctxt "#39009" - msgid "Zoom - 110% width" +@@ -19654,3 +19654,7 @@ msgstr "" + msgctxt "#39010" + msgid "Select sort method" msgstr "" + +msgctxt "#38190" +msgid "Extract thumbnails from video files" +msgstr "" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4c0da310a630190e2adabe5ddab9ce46f9401a45..4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e 100644 +index 7f43d130c47edcaf22f33ef547124134d30e7cbb..f2cf001e5ef8cfd881617b8f9887d054a0902176 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -977,8 +977,8 @@ @@ -887,7 +887,7 @@ index 4c0da310a630190e2adabe5ddab9ce46f9401a45..4bc6b6f4a57bbd3b2e4e3eebbda3b7dc -From a9e6422c823eaed9629c161fc5b758b7ba5ae9bb Mon Sep 17 00:00:00 2001 +From bc596cd94ede919c2b31f4fbf448a3a4f1638bc6 Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 Subject: [PATCH 14/71] Disable autoscrolling while on screensaver and while @@ -903,10 +903,10 @@ Subject: [PATCH 14/71] 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 3e6c25ac7e2c4e7d8da17eb2e6f38666eae48da4..58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702 100644 +index c780168e0fc2a0ffcbbaf4a8a0a7886210fbf57d..ad529fdb715d97497f9b851343e2aafc927b7d71 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -5227,3 +5227,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const +@@ -5213,3 +5213,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const return false; } @@ -921,7 +921,7 @@ index 3e6c25ac7e2c4e7d8da17eb2e6f38666eae48da4..58aa2bf7da09e6469c8c7a44ad9cc578 + return onBlackDimScreenSaver || openingStreams; +} diff --git a/xbmc/Application.h b/xbmc/Application.h -index 39b59fa9bab72a7471785c8c4d44b8af4437c580..4b4d3acf98abf4485782c54e6026792d4e4ef097 100644 +index 22aca8173d0a452dc3d18ee559613ceb59f31b41..0f570f108436c168b3af746f5c005ae9dadf68b5 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -395,6 +395,8 @@ public: @@ -1021,7 +1021,7 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From bbff608e360bea6f65d1cda665dd8e73a2b65957 Mon Sep 17 00:00:00 2001 +From 47998740e492c134e0b176de38dc008cd2344f0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 Subject: [PATCH 15/71] [demuxer] Avoid memcpy on every demuxer packet @@ -1035,10 +1035,10 @@ 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 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14dcb569af 100644 +index 926cc744ee8171f45a2764e170420a0df514c245..090af6fd3d16b5d723ed665cac9889ddb0e5ef81 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -894,7 +894,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -895,7 +895,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { if(m_pkt.pkt.stream_index == (int)m_pFormatContext->programs[m_program]->stream_index[i]) { @@ -1047,7 +1047,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 break; } } -@@ -903,7 +903,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -904,7 +904,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() bReturnEmpty = true; } else @@ -1056,7 +1056,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 } else bReturnEmpty = true; -@@ -933,9 +933,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -934,9 +934,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() // copy contents into our own packet pPacket->iSize = m_pkt.pkt.size; @@ -1072,7 +1072,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 pPacket->pts = ConvertTimestamp(m_pkt.pkt.pts, stream->time_base.den, stream->time_base.num); pPacket->dts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num); -@@ -989,7 +993,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -990,7 +994,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() pPacket->iStreamId = m_pkt.pkt.stream_index; } m_pkt.result = -1; @@ -1124,7 +1124,7 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 1d44b7c50279a59137a1bb2231fe05b2ccbe284e Mon Sep 17 00:00:00 2001 +From 7144fb5b424a40bbf5ec226dc8976959f9b0c17b Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 Subject: [PATCH 16/71] Load OSD dialogs on startup. @@ -1222,7 +1222,7 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 027b3a234cc9fbccbe95962b2462d89e2344b5ef Mon Sep 17 00:00:00 2001 +From 852d35cfa51340faf7ae9015bf19c63639d9fdef Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 Subject: [PATCH 17/71] [gui] Also limit GUI updates when in non full-screen @@ -1233,10 +1233,10 @@ Subject: [PATCH 17/71] [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 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a65da7cb85 100644 +index ad529fdb715d97497f9b851343e2aafc927b7d71..c311fb5f06e0f1e7e887b79ec811941f17ffc34d 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2773,7 +2773,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2759,7 +2759,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 @@ -1245,7 +1245,7 @@ index 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a6 fps = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); #endif -@@ -2786,6 +2786,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2772,6 +2772,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) { if (!m_skipGuiRender) g_windowManager.Process(CTimeUtils::GetFrameTime()); @@ -1255,7 +1255,7 @@ index 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a6 g_windowManager.FrameMove(); } -From 836f001711a2e8d430806c9f1d88db285d8e4806 Mon Sep 17 00:00:00 2001 +From 0c05fc9d4dfa04af6fd1def2c427385b6c0cc64a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for @@ -1266,10 +1266,10 @@ Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 227f323083b0fb9cee3b576bfcc7b51d5e27ac10..6994f16290ca3ec9da124fbf1cfa21716333855d 100644 +index f6f64414831232558751c9f35f5c1d61eacd4fd6..9350bfd4ed53954fc500ff813da3cc9d5f3b99c7 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp -@@ -795,7 +795,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector +@@ -794,7 +794,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector int currentWindow = GetActiveWindow(); CGUIWindow *pWindow = GetWindow(currentWindow); if (pWindow) @@ -1288,7 +1288,7 @@ index 227f323083b0fb9cee3b576bfcc7b51d5e27ac10..6994f16290ca3ec9da124fbf1cfa2171 // Add window to the history list (we must do this before we activate it, -From 22653aaa9fe86fe53508242fa150a2109476b4ae Mon Sep 17 00:00:00 2001 +From 96fb9251dc5c13fb7b19ea7851b5cb01b00421cf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 Subject: [PATCH 19/71] ffmpeg: Automatic switch to software decode for GMC @@ -1440,10 +1440,10 @@ index 03fdf6efa072219d55cac21b7f7923ffc6c00e17..e3a32aebfe59016b43cd7c2b304921b5 class CDemuxStreamAudio : public CDemuxStream diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 748508c8d2d5d0a8650f5a949d8f4d14dcb569af..a992c9253911d53c0648a9dceff37054fb2c91d0 100644 +index 090af6fd3d16b5d723ed665cac9889ddb0e5ef81..b2f2268c6e92b38f2e17f4d1e99b4681413a27b4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1366,7 +1366,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1367,7 +1367,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -1519,7 +1519,7 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From 775e6fccf8309276444522325cbab291b189e511 Mon Sep 17 00:00:00 2001 +From 928f3f8d99122a98d873b94cf306963a7538c935 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 10 Mar 2016 17:56:11 +0000 Subject: [PATCH 20/71] [rbp] HW mouse pointer @@ -1537,7 +1537,7 @@ Render the mouse with an overlay to avoid redrawing the normal gui. 5 files changed, 282 insertions(+) diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 6994f16290ca3ec9da124fbf1cfa21716333855d..97a693ad29a54a53acbdc9abe7f83c103e5e1dac 100644 +index 9350bfd4ed53954fc500ff813da3cc9d5f3b99c7..cd45a5961d4ffafbc8e62a3874dd626af5ccb7e2 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -199,7 +199,9 @@ void CGUIWindowManager::CreateWindows() @@ -1955,7 +1955,7 @@ index 1b1d2f2e60334ed0f3a9964d106957f58e69f1b3..c82ba84625fe3556ff49764d40ceb3ec #endif -From 3a99189fb7502f4b2f81be61f86a338a8406b63c Mon Sep 17 00:00:00 2001 +From c5a3be140b5890f3dc1e0ba682c3a676519eb0c0 Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 Subject: [PATCH 21/71] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer @@ -2150,7 +2150,7 @@ 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 b4661d1c55cb278ce2f8980d53876c3d1c40b22c Mon Sep 17 00:00:00 2001 +From 0d7f8d31adf8109c545a6ef2ca272bd944eb819d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 Subject: [PATCH 22/71] codecoverlay: Include codec name in overlay @@ -2179,10 +2179,10 @@ index 5da89e55c83568513cbf829679b60780572d5b49..27d7065a61b495b36abcfb96bc751317 //print the inverse of the resample ratio, since that makes more sense //if the resample ratio is 0.5, then we're playing twice as fast diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index c6d100b58c9bab185e747d14ee33cebce5c7cced..585b812a04d928ef493eb3cb3f8943fb33328a0e 100644 +index 86513278362e65c3fb01d6c27662bbc9099fa68a..f80c62ef56303bac91c4813f854c60985d3f812f 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -922,10 +922,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) +@@ -921,10 +921,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) std::string CVideoPlayerVideo::GetPlayerInfo() { @@ -2247,7 +2247,7 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From a51091d35bd02cde9ad4b579ca166c37a5d4332b Mon Sep 17 00:00:00 2001 +From 9c4175da7381fcb59d4bebfd60d02b23e3b1cfeb Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 Subject: [PATCH 23/71] [DebugInfo] Add cpu usage info. @@ -2387,7 +2387,7 @@ index 85aefaace73994730f7d2bdff9de85c79e99b2a2..8005a13bc220be0c5c596d276197c11e }; \ No newline at end of file diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index eab9c0f470c3d22cc8f5efc42cdcc7e2280c6fef..4784843a2aa247a94fb6e9e1463c000ff178a3e9 100644 +index b2d3a388d48ed61d978c85faffc04c0e1385a6dc..9160a9b90319d64f102aa869f2d9065362c240f9 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -24,6 +24,7 @@ @@ -2420,7 +2420,7 @@ index eab9c0f470c3d22cc8f5efc42cdcc7e2280c6fef..4784843a2aa247a94fb6e9e1463c000f m_debugTimer.Set(1000); -From af65dd5f3ac73c2a4c20c23e7e9ca6e09c5ac061 Mon Sep 17 00:00:00 2001 +From 0804e3b54d11c2d9af6de2f81b00e12416dccf0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 Subject: [PATCH 24/71] ffmpeg: Allow neon to be enabled in unified builds @@ -2446,7 +2446,7 @@ index 9b763bc30aaf473d656f53c140ead8f948eff812..4e3cbf75331240ef33deb8f99ae9c57a ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From 45a10b59e677bc5afe68df28ea9711cd901e2ddf Mon Sep 17 00:00:00 2001 +From 65d542b66ad63df25cae7cc0bdc8b1b2bb829f89 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 Subject: [PATCH 25/71] ffmpeg: Add some upstream HEVC optimisations @@ -6247,7 +6247,7 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From 14052af2fcc2e3004d25683d608d0ca8a4142d18 Mon Sep 17 00:00:00 2001 +From 44f8a8562b7a72443c5830b09905bf6d145f5930 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 Subject: [PATCH 26/71] [ffmpeg] Add GPU acceleration to hevc @@ -44436,7 +44436,7 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 4578c89ff9fa89e0d685f1831d35134bfdf53c33 Mon Sep 17 00:00:00 2001 +From 79f478c571cf8a51531b236a4bbac30d116b4569 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 22 Aug 2015 23:06:56 +0100 Subject: [PATCH 27/71] [dvdmessage] Increase timeout on @@ -44460,7 +44460,7 @@ index 0dcc664fd862706c60659f3664c7d964597c94d5..7614c831af9dfc821121a4111546fd4d long CDVDMsgGeneralSynchronize::Release() -From 9e03a7e826b678dc23168f8ebcc9cfc4a7eebb87 Mon Sep 17 00:00:00 2001 +From d8b0fda81af7df889d223337496fea088f5dcdd7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 Subject: [PATCH 28/71] [3d] Make MVC a valid 3D filename tag @@ -44512,10 +44512,10 @@ index 03f566d3ee4eab690d2236b7739080269d552511..60e5652f69e96a559d8080e01dc214a5 XMLUtils::GetFloat(pElement, "audiodelayrange", m_videoAudioDelayRange, 10, 600); XMLUtils::GetString(pElement, "defaultplayer", m_videoDefaultPlayer); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 1727580c0c8de2b6fda19a741f90721a570b96b8..4fa973515df6e677418a6bf7f9d0b4a31c022c0a 100644 +index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h -@@ -371,6 +371,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -372,6 +372,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler std::string m_stereoscopicregex_3d; std::string m_stereoscopicregex_sbs; std::string m_stereoscopicregex_tab; @@ -44524,7 +44524,7 @@ index 1727580c0c8de2b6fda19a741f90721a570b96b8..4fa973515df6e677418a6bf7f9d0b4a3 bool m_useDisplayControlHWStereo; -From cc04777d5d90d440e90c05f5bb7d97a800241286 Mon Sep 17 00:00:00 2001 +From 2b49536142534a8197b3ef2800c8ec4fe9d49dca Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 Subject: [PATCH 29/71] [3d] Swap top/bottom sides of GUI @@ -44547,7 +44547,7 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 026be8150438a79f3f36a9fa18ec5be344fb52a2 Mon Sep 17 00:00:00 2001 +From b3e6758fc9ff329c26c2867e01eca7b9b60cc15a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 Subject: [PATCH 30/71] Revert "Revert "Disable extra logging by default"" @@ -44558,7 +44558,7 @@ This reverts commit a880554325be187b877cd8f0e2b338e7267da636. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e..1860d972c0afd541337b3e1e0c3e2d006d67a44c 100644 +index f2cf001e5ef8cfd881617b8f9887d054a0902176..52dfd4e3e261388a5fe0f6997e62b906ccfa007a 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2815,12 +2815,12 @@ @@ -44577,7 +44577,7 @@ index 4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e..1860d972c0afd541337b3e1e0c3e2d00 loggingcomponents , -From 341618c4c2fb98d4e7824f0566ac0981d5e71b56 Mon Sep 17 00:00:00 2001 +From 360f50196733d6e07328b62b6326076654af7e74 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 26 Nov 2015 17:14:49 +0000 Subject: [PATCH 31/71] [ae] Add debug logging showing resamplerate @@ -44599,7 +44599,7 @@ index 5b2243f3094403ce485006333fd000342f0e58b2..799dc57a130d15a025a7c525ddac8e17 } else if (stream->m_processingBuffers) -From c08cfb0d49bd33844ab2c3578982cc86abbd7b50 Mon Sep 17 00:00:00 2001 +From 8e6ec4f5a9713fbdfa7a0690ca92f9efe1d943bf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 Subject: [PATCH 32/71] [omximage] Fall back to arm jpeg encode/decode when gpu @@ -44845,7 +44845,7 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 2dcd51678f6f670da1830d764625f87e6f8e7245 Mon Sep 17 00:00:00 2001 +From 643886cf5e2dd5c6ea75c8798eeb02332e18767a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 Subject: [PATCH 33/71] [mmalcodec] Fail to open when width is invalid. Can @@ -44870,7 +44870,7 @@ index aa20f18cbea80ed68c1307470289525bd5db29e3..cead68bd79d388f0eda0f8a79f17d296 if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From 64c3300e8523a51c23b30443dcc63fcc8599e0ec Mon Sep 17 00:00:00 2001 +From 6c3e8391b719b76353055162c73a3375e958f87e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 Subject: [PATCH 34/71] ffmpeg: Add cabac opimisations for hevc @@ -47110,7 +47110,7 @@ index e2641093d15e5b465fae7e5f87c3ea18573dd6ee..7022b5fadef58ad27b61725d77131bd7 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ ./configure --prefix=$FFMPEG_PREFIX \ -From 23a20bff0647e62a82e6006ad9de82ff3f7ac1df Mon Sep 17 00:00:00 2001 +From f951553df2c7891607ca73715009627f6066766c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 Subject: [PATCH 35/71] [videoplayer/rbp] Add pi specific option to maintain @@ -47135,10 +47135,10 @@ or drop/dupe audio packets which is normally required. 12 files changed, 122 insertions(+), 19 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index d631c235a0765913a79fc7db9726d77ee30cc5a0..06957078b9e69c6f05f31b6414aec04f420745b8 100644 +index 2d352a3a844ec7888f982dc2330f2a1635d2c43c..45ee30ba64153eb4287e7cf0f2af6dd6553e9d26 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19616,3 +19616,35 @@ msgstr "" +@@ -19658,3 +19658,35 @@ msgstr "" msgctxt "#38190" msgid "Extract thumbnails from video files" msgstr "" @@ -47509,7 +47509,7 @@ index 90b04db5405058be2ff20aeaa6af2d2ac651586f..084fba87f49f4c3b33a8dd4a20a626a3 void init_cursor(); void set_cursor(const void *pixels, int width, int height, int hotspot_x, int hotspot_y); -From b9702220fd04c99d46abc1eb169bf9286a846d44 Mon Sep 17 00:00:00 2001 +From ecf6ace9d336fb53689481288783edd2a35db890 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 Subject: [PATCH 36/71] rbp: Support zero copy interface with hevc acceleration @@ -47556,7 +47556,7 @@ index 29c4e6d15dd838cf845c301ea1a1f4c05db29871..864650d488d0f5b3dc9f89f01aa5c3b8 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 230f09818d9da2431dbe78d871cd399d3fc076d3 Mon Sep 17 00:00:00 2001 +From 7c8d2db0bc531fd6e3b3788abc451b54dc58ca59 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 Subject: [PATCH 37/71] ffmpeg: use upstream mvc patches @@ -47869,7 +47869,7 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From 291ded31180aebdc4d6f06eab0ca1e0689b93dd5 Mon Sep 17 00:00:00 2001 +From ec064d0dd35e383c434da78be6e7e2dd701b5b01 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 Subject: [PATCH 38/71] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc @@ -47880,7 +47880,7 @@ Subject: [PATCH 38/71] [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 a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429753f4292 100644 +index b2f2268c6e92b38f2e17f4d1e99b4681413a27b4..d648bb31faace595818a7e5b507372e3bdf14eeb 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -25,6 +25,7 @@ @@ -47891,7 +47891,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 #include "DVDClock.h" // for DVD_TIME_BASE #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" -@@ -1305,6 +1306,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1306,6 +1307,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) } case AVMEDIA_TYPE_VIDEO: { @@ -47907,7 +47907,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); stream = st; if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1313,7 +1323,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1314,7 +1324,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) st->bVFR = false; // never trust pts in avi files with h264. @@ -47916,7 +47916,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 st->bPTSInvalid = true; #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1384,6 +1394,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1385,6 +1395,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; @@ -47935,7 +47935,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 } case AVMEDIA_TYPE_DATA: -From 8ea1fecf640ed032d5a52287166f6aa3a2992681 Mon Sep 17 00:00:00 2001 +From 558263b03a7fb773002a9b979f871acff4670063 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 Subject: [PATCH 39/71] [Stereo3D] Added mvc modes. @@ -47992,7 +47992,7 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6eb0752994bc5f8c47efbbf211120af0 i++; } -From 4d3632e962c4444295fa7b4588b275785d7150dd Mon Sep 17 00:00:00 2001 +From 40af2076a7c8a476d48eb5fc6ee9b346b585e106 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 Subject: [PATCH 40/71] [VideoPlayer] Fix possible wrong aspect. @@ -48002,7 +48002,7 @@ Subject: [PATCH 40/71] [VideoPlayer] Fix possible wrong aspect. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index 585b812a04d928ef493eb3cb3f8943fb33328a0e..064b3fffaa416786f1bac34d827af60ceceaa105 100644 +index f80c62ef56303bac91c4813f854c60985d3f812f..946518c7da7a7980052f98469c5726e8e7d55501 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp @@ -182,7 +182,7 @@ void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec) @@ -48015,7 +48015,7 @@ index 585b812a04d928ef493eb3cb3f8943fb33328a0e..064b3fffaa416786f1bac34d827af60c else m_fForcedAspectRatio = 0.0; -From b6d1233dc2b1f894a5a6a8f84378f93fe44674d0 Mon Sep 17 00:00:00 2001 +From 96a5c710aae0495f75aef9a760353060e096a69c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 Subject: [PATCH 41/71] [VideoPlayer] DemuxFFmpeg: ssif remux @@ -48053,7 +48053,7 @@ index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..0da129ff99f57dc38ca8a854854d9fe6 DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b67c563c61 100644 +index d648bb31faace595818a7e5b507372e3bdf14eeb..ac2c9124426d5427e1103757ba9a755d6b2fd624 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -164,6 +164,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() @@ -48064,7 +48064,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 m_speed = DVD_PLAYSPEED_NORMAL; m_program = UINT_MAX; m_pkt.result = -1; -@@ -534,6 +535,8 @@ void CDVDDemuxFFmpeg::Dispose() +@@ -535,6 +536,8 @@ void CDVDDemuxFFmpeg::Dispose() m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48073,7 +48073,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 if (m_pFormatContext) { for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) -@@ -584,6 +587,9 @@ void CDVDDemuxFFmpeg::Flush() +@@ -585,6 +588,9 @@ void CDVDDemuxFFmpeg::Flush() m_displayTime = 0; m_dtsAtDisplayTime = DVD_NOPTS_VALUE; @@ -48083,7 +48083,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } void CDVDDemuxFFmpeg::Abort() -@@ -851,7 +857,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -852,7 +858,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { Flush(); } @@ -48094,7 +48094,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 { // update streams CreateStreams(m_program); -@@ -879,6 +887,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -880,6 +888,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48104,7 +48104,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } else { -@@ -888,7 +899,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -889,7 +900,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() if (IsVideoReady()) { @@ -48115,7 +48115,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 { /* check so packet belongs to selected program */ for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1037,6 +1050,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -1038,6 +1051,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() stream = AddStream(pPacket->iStreamId); } } @@ -48131,7 +48131,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 if (!stream) { CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::AddStream - internal error, stream is null"); -@@ -1066,6 +1088,9 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -1067,6 +1089,9 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48141,7 +48141,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); if (ist) { -@@ -1141,6 +1166,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) +@@ -1142,6 +1167,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48151,7 +48151,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 return (ret >= 0); } -@@ -1308,11 +1336,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1309,11 +1337,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) { @@ -48167,7 +48167,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 break; } CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1398,7 +1427,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1399,7 +1428,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) { @@ -48180,7 +48180,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) { -@@ -1491,7 +1524,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1492,7 +1525,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (langTag) strncpy(stream->language, langTag->value, 3); @@ -48452,7 +48452,7 @@ index 60e5652f69e96a559d8080e01dc214a56fb19343..cdaf53585a89a0da3a4038178806ee93 m_discStubExtensions = ".disc"; // internal music extensions -From 69a2451ec3a2b0962872adbc9738f5437800a677 Mon Sep 17 00:00:00 2001 +From c5d9b2d4efd4c615a4572749e85727b344acde75 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 Subject: [PATCH 42/71] [libbluray] bump libbluray to 0.9.2-mvc. @@ -48475,7 +48475,7 @@ index 4d1be9c2cb2bb0c9531413c7300342444df023e1..bc4913a3d0c1fcb7e27106a2ddd6988f libcec-3.1.0-win32-vc140.7z libfribidi-0.19.2-win32.7z -From 7287a367e7666c243fa603dd7e2001acffca171b Mon Sep 17 00:00:00 2001 +From c5a9af6e17d4bcfb07df6f99523a9331fc707b74 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 Subject: [PATCH 43/71] [3DBD] Added support of 3D-BluRay playback. @@ -48556,7 +48556,7 @@ index 0da129ff99f57dc38ca8a854854d9fe658651e1f..82d4b499245afda1a51ca281584cc47f DVDDemuxPacket.h DVDDemuxUtils.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35ef0157b7 100644 +index ac2c9124426d5427e1103757ba9a755d6b2fd624..511b44b4682d204c43aa051ba62f7ea10a58b472 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -27,6 +27,7 @@ @@ -48567,7 +48567,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" #include "DVDInputStreams/DVDInputStreamFFmpeg.h" -@@ -494,6 +495,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein +@@ -495,6 +496,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein UpdateCurrentPTS(); @@ -48584,7 +48584,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 // in case of mpegts and we have not seen pat/pmt, defer creation of streams if (!skipCreateStreams || m_pFormatContext->nb_programs > 0) { -@@ -857,9 +868,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -858,9 +869,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { Flush(); } @@ -48595,7 +48595,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 { // update streams CreateStreams(m_program); -@@ -900,8 +909,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -901,8 +910,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() if (IsVideoReady()) { // libavformat is confused by the interleaved SSIF. @@ -48605,7 +48605,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 { /* check so packet belongs to selected program */ for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1052,10 +1060,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -1053,10 +1061,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() } if (stream && m_pSSIF) { @@ -48617,7 +48617,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) stream = GetStream(pPacket->iStreamId); } -@@ -1431,6 +1436,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1432,6 +1437,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { m_pSSIF->SetH264StreamId(streamIdx); pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); @@ -48647,7 +48647,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 } } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1691,6 +1719,12 @@ bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts) +@@ -1692,6 +1720,12 @@ bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts) } Flush(); @@ -48660,7 +48660,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 return true; } -@@ -1760,6 +1794,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) +@@ -1736,6 +1770,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) bool CDVDDemuxFFmpeg::IsProgramChange() { @@ -49477,7 +49477,7 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 2b0355209b7c2215fb6e012e27fcd4e9e8605de8 Mon Sep 17 00:00:00 2001 +From 26a07cfcbdd19e30743c04ee30b08e2f6219261d Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 2 Mar 2016 23:31:50 +0300 Subject: [PATCH 44/71] [BaseRenderer] Fix aspect for TAB/SBS (need more @@ -49524,7 +49524,7 @@ index f9b3bfb4eb35eff3ef7af370136882bc733461e6..ab804ab0259992e4700e0ba99759c3f7 void CBaseRenderer::ManageRenderArea() -From a226f164edaaa8418574e47463b2701f4bb6392e Mon Sep 17 00:00:00 2001 +From 7cbfc3e33e6ea0513ad1321b80bbade1760df6b4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 Subject: [PATCH 45/71] libbluray: Bump to Nevcairie's v0.9.2 @@ -51184,7 +51184,7 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From 6b8871642bc9b2efb81da42210120afb10fd8dc4 Mon Sep 17 00:00:00 2001 +From 6a6e521b5a8c0ba87b9704dd9aa10ae3896b69a2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 2 Mar 2016 19:40:47 +0000 Subject: [PATCH 46/71] [VideoPlayer] Added new msdk-mvc decoder. @@ -51303,7 +51303,7 @@ index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bf static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); }; -From 856ea7cb4308e345aa6dc666980fb06d049dbd8a Mon Sep 17 00:00:00 2001 +From 25f77b57fba31fff99ecd9af8e0943d74ba83389 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 Subject: [PATCH 47/71] mvc: Automatically enable stereo mode @@ -51364,7 +51364,7 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 591cd62dbfbdba89ae1f5a7e391a2f34d74e3c8a Mon Sep 17 00:00:00 2001 +From 3937828729ed7d4f48c3b8fa6b54d00299e32aa2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 Subject: [PATCH 48/71] ffmpeg: mvc: fix for pixelation from packets with no @@ -51429,7 +51429,7 @@ index 46e7138e6906dc99d03c09b0f94340e23794be3a..d90cc23cfc391f2d289c7da6c69c6381 cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 48406bdf3d2057116fd9a391486d970d92f9b4d4 Mon Sep 17 00:00:00 2001 +From 1d276f429465651312f03e96fc1d16c292a21318 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Mar 2016 13:08:44 +0000 Subject: [PATCH 49/71] stereoscopicmanager: remove hardwarebased for rbp @@ -51454,7 +51454,7 @@ index 6eb0752994bc5f8c47efbbf211120af0a0720d0c..9426604f6460651f54cc035476e69530 { "mvc_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback {} -From ef32201c7a49beedcca2a1fd02d3f893074a9193 Mon Sep 17 00:00:00 2001 +From 6a6175b80008d559b965ab8e31c2ced4f9c43203 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 17 May 2016 19:24:08 +0100 Subject: [PATCH 50/71] stereoscopics: Switch to using block_lr for mvc to @@ -51483,10 +51483,10 @@ index 38e7d44b7968039120b9821fd5b6b2d552edf3c1..654a927a0d4cbf877a3bb2616d62f46a break; case AV_CODEC_ID_H263: diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fe13ef199ed85fca52d2499beb9adb35ef0157b7..69d0280960422f8fc02440af56a1479c637a20d6 100644 +index 511b44b4682d204c43aa051ba62f7ea10a58b472..ba7371221f06aeecacc5a68ed059b55276d752e4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1443,7 +1443,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1444,7 +1444,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) CDVDInputStreamBluray *bluRay = static_cast(m_pInput); if (bluRay->HasMVC()) { @@ -51563,7 +51563,7 @@ index 9426604f6460651f54cc035476e69530b2ea8493..cc929b599125a44ac128713fd4331782 }; -From e58325d83422539ecb03019101041a5d3c28380d Mon Sep 17 00:00:00 2001 +From 3683605496df55d79f763aa98ce6201b05b66f46 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 Subject: [PATCH 51/71] fixup! Revert supporting crappy tab/sbs subtitles. this @@ -51611,7 +51611,7 @@ index 3a080d06c90b0762482816928642e6de7810b539..7c0b70777556ac7694e7fc511cd4bb18 } -From c8c19254f80896ac722ee9db4ae193c087de28d7 Mon Sep 17 00:00:00 2001 +From d17055c05d41949c917e969aa4876a49cbed4bcc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Feb 2015 15:29:16 +0000 Subject: [PATCH 52/71] [libcec] Add repeating keypress patch from popcornmix' @@ -52501,7 +52501,7 @@ index 0000000000000000000000000000000000000000..8366a696562a934144cc9a21ea6f2cab +1.9.1 + -From f3f2a28705d3b1a49854484c33bae514bcd3285a Mon Sep 17 00:00:00 2001 +From 3e32144c1bbd9aabfe39e87a743971959954ff12 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 19 Mar 2016 17:15:29 +0000 Subject: [PATCH 53/71] cec: hack: pretend bump to 3.1.0 @@ -52552,25 +52552,26 @@ index 0000000000000000000000000000000000000000..9e55e51068e7befd9d4ff003156ce1ff + # cec-client + add_subdirectory(src/cec-client) -From 62a0036d62dc44945175e248d1e9dd32d68fe2a9 Mon Sep 17 00:00:00 2001 +From 08abeee53082011303685263203843929e364f61 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Oct 2014 00:19:40 +0000 Subject: [PATCH 54/71] [cec] Add settings for configuring button repeats --- - addons/resource.language.en_gb/resources/strings.po | 16 ++++++++++++++++ + addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ system/peripherals.xml | 4 +++- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 16 ++++++++++++++++ - 3 files changed, 35 insertions(+), 1 deletion(-) + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 06957078b9e69c6f05f31b6414aec04f420745b8..cccff927711eacdc01d5da065b03366627aac72f 100644 +index 45ee30ba64153eb4287e7cf0f2af6dd6553e9d26..c66858390045d010ab5d22bea362be03a8f48292 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19613,6 +19613,22 @@ msgctxt "#39009" - msgid "Zoom - 110% width" +@@ -19690,3 +19690,18 @@ msgstr "" + msgctxt "#38206" + msgid "Max" msgstr "" - ++ +#: system/peripherals.xml +msgctxt "#38050" +msgid "Remote button press delay before repeating (ms)" @@ -52584,12 +52585,7 @@ index 06957078b9e69c6f05f31b6414aec04f420745b8..cccff927711eacdc01d5da065b033666 +#: system/peripherals.xml +msgctxt "#38052" +msgid "Remote button press release time (ms)" -+>>>>>>> [cec] Add settings for configuring button repeats +msgstr "" -+ - msgctxt "#38190" - msgid "Extract thumbnails from video files" - msgstr "" diff --git a/system/peripherals.xml b/system/peripherals.xml index f939c0b685d96d022856544e7eb31a71338d9ba4..a4b8f7add4d915c1749628d62a9cbe9afe97d063 100644 --- a/system/peripherals.xml @@ -52640,7 +52636,7 @@ index e6bcbce6911a1714e129ecd5aceead94769231f4..19b3c37bc18fcab30920b12902e8c339 if (GetSettingBool("pause_playback_on_deactivate")) { -From db144767d69fa200c8e356176fc0422676548b21 Mon Sep 17 00:00:00 2001 +From 6e00438089530706a2707ce168d95d95bf319f7d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Nov 2014 23:17:46 +0000 Subject: [PATCH 55/71] [cec] Don't discard buttons when repeat mode is enabled @@ -52666,7 +52662,7 @@ index 19b3c37bc18fcab30920b12902e8c3397a69dccc..f859f44f6d5379154317b5760d7df720 if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) { -From faf68aec33ecc06ab9c9bfef0fc2999bab7e3355 Mon Sep 17 00:00:00 2001 +From 3ead9831955410d3d750a70457802e8bd33d73d9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 Subject: [PATCH 56/71] [cec] Temp - more logging @@ -52721,7 +52717,7 @@ index f859f44f6d5379154317b5760d7df720f0894e0d..f1c3a6d242183507c4ce9ebf4651b0c0 } -From e88a50bca552f15ac191b469ed00d83091d24dcf Mon Sep 17 00:00:00 2001 +From 4420f962ccbef459efc7adbabbc6b940d04c1fd2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 Jan 2016 12:29:41 +0000 Subject: [PATCH 57/71] [cec] Update for libcec 3.1.0 @@ -52732,7 +52728,7 @@ Subject: [PATCH 57/71] [cec] Update for libcec 3.1.0 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index acf4ce64745096e92106c814b15d35ecd82f7d7e..b5a8f8c9154f52842b9bdea3d492217e31921009 100644 +index 6a8b4a26a5d150e2965441798b178644cdfabba4..e99d80720f6c74346b77fcca1da017635bfb25c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1447,9 +1447,9 @@ if test "x$use_libcec" != "xno"; then @@ -52770,7 +52766,7 @@ index f1c3a6d242183507c4ce9ebf4651b0c0f7e9c5c9..28a6a8148810da940f977976a627018c // device name 'XBMC' snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); -From d6b3fe6d908bca5886a02c4e77ca6aa76f3bf833 Mon Sep 17 00:00:00 2001 +From ea618c200f3b79644bb630ad9228bea0df3be14d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 19 Mar 2016 14:46:41 +0000 Subject: [PATCH 58/71] libcec: use system audio mode request instead of power @@ -52839,7 +52835,7 @@ index 39ba882d0c7e270b4d1d1d566027cbaffb76b587..4565dc9f6fc0b3e6b49133443c19e107 $(LIBDYLIB): $(PLATFORM) -From b13389f100d417c231773a23bbcd7c9b7d4d573c Mon Sep 17 00:00:00 2001 +From 7e25a34208ce3e6d8f27a2bce29c1fa49e9d387a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 22 Mar 2016 09:51:52 +0100 Subject: [PATCH 59/71] python: use kodi provided cert if available @@ -52866,7 +52862,7 @@ index bc84af9411ef55eaf5ba71a320b5cbfec5f49548..ff4ed7db26845905108ea0ae504e4f58 PyEval_AcquireLock(); else -From adfe64cdeb57a473da590679102875dc6135e678 Mon Sep 17 00:00:00 2001 +From 5e2703cf3297145ce88ece33c54de5f9c337ec51 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 Subject: [PATCH 60/71] rbp: Hard code the number of buffers to improve audio @@ -52895,7 +52891,7 @@ index 2572e25753712186f69390965ee1448bff3fadd5..5d9f716bac49f9850f1062a4d5ac8517 diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 4784843a2aa247a94fb6e9e1463c000ff178a3e9..4736ca7555bf7c539b0140ddba52c8e3e77f5993 100644 +index 9160a9b90319d64f102aa869f2d9065362c240f9..e03af0cd4dfbcf67b728b5ad26d912e4c098b109 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -1047,7 +1047,11 @@ void CRenderManager::UpdateDisplayLatency() @@ -52911,7 +52907,7 @@ index 4784843a2aa247a94fb6e9e1463c000ff178a3e9..4736ca7555bf7c539b0140ddba52c8e3 } -From 123628fd61cead13de60aa1c1a97a31bd3f208ea Mon Sep 17 00:00:00 2001 +From da39a1c8163325532ac99e3630244e0220145216 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 Subject: [PATCH 61/71] rbp: Update the GL libs to new naming scheme @@ -52928,7 +52924,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index b5a8f8c9154f52842b9bdea3d492217e31921009..6bc106af98901b145223614586e35dd6d453fe58 100644 +index e99d80720f6c74346b77fcca1da017635bfb25c8..4f5486fb33f95338bc668437a605d552df3c8054 100644 --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ if test "$use_gles" = "yes"; then @@ -52966,10 +52962,10 @@ index ab06f968b3e314fca1ae001139f687dce9a5098b..87f1faa248b91a2e50758b23c0b9e5b0 else() find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac -index fb0bd6dad18199e8893c38644f93659bf0a3f61b..010288dc5de74380fc3795d00dbd99847cf2ed3e 100644 +index 9c8ddade7b7a20e072ddd41a3465ab6e1678b20d..4d728508ce5c18789c50a60dd302deb8c1b8f99d 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac -@@ -390,7 +390,7 @@ if test "$target_platform" = "raspberry-pi" ; then +@@ -391,7 +391,7 @@ if test "$target_platform" = "raspberry-pi" ; then -isystem${use_firmware}/opt/vc/include \ -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \ -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux" @@ -52979,7 +52975,7 @@ index fb0bd6dad18199e8893c38644f93659bf0a3f61b..010288dc5de74380fc3795d00dbd9984 fi -From 9cf271e1c31a1167adad27c81728ce55d36ae2e1 Mon Sep 17 00:00:00 2001 +From 0063738ac14e696f44c0709a608ef6555fed0b47 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 21 Apr 2016 16:49:02 +0100 Subject: [PATCH 62/71] Revert "[settings] remove show EXIF picture information @@ -52987,50 +52983,42 @@ Subject: [PATCH 62/71] Revert "[settings] remove show EXIF picture information This reverts commit e7d90188436b6966eff23fd695e1a9d18f4af1b4. --- - addons/resource.language.en_gb/resources/strings.po | 11 ++++++++++- + addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++ system/settings/settings.xml | 5 +++++ xbmc/pictures/GUIWindowPictures.cpp | 2 +- xbmc/pictures/PictureInfoLoader.cpp | 8 ++++++-- xbmc/pictures/PictureInfoLoader.h | 1 + xbmc/settings/Settings.cpp | 1 + xbmc/settings/Settings.h | 1 + - 7 files changed, 25 insertions(+), 4 deletions(-) + 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index cccff927711eacdc01d5da065b03366627aac72f..4afeb2bd7d575849a92177d7d08ba7e3dd44893c 100644 +index c66858390045d010ab5d22bea362be03a8f48292..622b491a999a84c90420ceb974cb8db238d14a7d 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -17576,7 +17576,11 @@ msgctxt "#36305" - msgid "This category contains the settings for how picture file lists are handled." - msgstr "" - --#empty string with id 36306 -+#. Description of setting "Pictures -> Show EXIF picture information" with label #38207 -+#: system/settings/settings.xml -+msgctxt "#36306" -+msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed." -+msgstr "" - - #. Description of setting with label #13360 "Automatically generate thumbnails" - #: system/settings/settings.xml -@@ -19664,3 +19668,8 @@ msgstr "" - msgctxt "#38206" - msgid "Max" +@@ -19705,3 +19705,13 @@ msgstr "" + msgctxt "#38052" + msgid "Remote button press release time (ms)" msgstr "" + ++#. Description of setting "Pictures -> Show EXIF picture information" with label #38207 +#: system/settings/settings.xml +msgctxt "#38207" +msgid "Show EXIF picture information" +msgstr "" ++ ++msgctxt "#38208" ++msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed." ++msgstr "" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 1860d972c0afd541337b3e1e0c3e2d006d67a44c..aa252f074cfae2ef06dbb3cf539c68a8ab7dfacc 100644 +index 52dfd4e3e261388a5fe0f6997e62b906ccfa007a..c02b2d727283cdfbc6d64124404f93c21f7f3b3d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1180,6 +1180,11 @@ -+ ++ + 0 + true + @@ -53039,15 +53027,15 @@ index 1860d972c0afd541337b3e1e0c3e2d006d67a44c..aa252f074cfae2ef06dbb3cf539c68a8 0 true diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp -index 2197079c0d02dc80bd87ccff4c1f0f14f1ed89ef..d798bc0c774bf8e6b54f694356d9afbe32719875 100644 +index c68371900dd42a154220e440266a45a7b2ab3118..653942232843ed0fc6c54c8bc405852797da6605 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp -@@ -208,7 +208,7 @@ void CGUIWindowPictures::OnPrepareFileItems(CFileItemList& items) +@@ -203,7 +203,7 @@ void CGUIWindowPictures::OnPrepareFileItems(CFileItemList& items) if (StringUtils::EqualsNoCase(items[i]->GetLabel(), "folder.jpg")) items.Remove(i); - if (items.GetFolderCount() == items.Size()) -+ if (items.GetFolderCount()==items.Size() || !CSettings::GetInstance().GetBool(CSettings::SETTING_PICTURES_USETAGS)) ++ if (items.GetFolderCount() == items.Size() || !CSettings::GetInstance().GetBool(CSettings::SETTING_PICTURES_USETAGS)) return; // Start the music info loader thread @@ -53113,7 +53101,7 @@ index 0829f6b15207bf0b8f2e4a699600b46427fe6267..432a23ce6b501fa4f3fad1f4ecff9f19 static const std::string SETTING_PICTURES_SHOWVIDEOS; static const std::string SETTING_PICTURES_DISPLAYRESOLUTION; -From 71d1cd85857b6ceea80b091925eba6c88aedc44c Mon Sep 17 00:00:00 2001 +From 44c44f0491ac34ac0d7212162175bfd09b69c09d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 Subject: [PATCH 63/71] ffmpeg: hacky fix for files with GMC @@ -53123,10 +53111,10 @@ Subject: [PATCH 63/71] ffmpeg: hacky fix for files with GMC 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 69d0280960422f8fc02440af56a1479c637a20d6..ea549e9532d79e8d8dab6eb4bda40c01a7314c74 100644 +index ba7371221f06aeecacc5a68ed059b55276d752e4..952498322e789364462f68f168ac9ac197f3dd8c 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1409,8 +1409,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1410,8 +1410,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -53138,7 +53126,7 @@ index 69d0280960422f8fc02440af56a1479c637a20d6..ea549e9532d79e8d8dab6eb4bda40c01 { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From af4a5c7ed6c85edbbe657a54b9b3072654db9a06 Mon Sep 17 00:00:00 2001 +From d1c4f771b5608a853d5f1b96da0ee095c7425148 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 Subject: [PATCH 64/71] mmalrender: Add sharpness control @@ -53150,7 +53138,7 @@ Subject: [PATCH 64/71] mmalrender: Add sharpness control 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 4afeb2bd7d575849a92177d7d08ba7e3dd44893c..aeec35199ce0177aab1f9e14adf0efd58674edca 100644 +index 622b491a999a84c90420ceb974cb8db238d14a7d..d88ae3626dca2f86e7aa28ed62ae319aa3e0148a 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -8691,7 +8691,7 @@ msgstr "" @@ -53213,7 +53201,7 @@ index a056a25f4f74fc6be023404286e044dac9d8ca7c..5d3baa6534a2fe449990402ab805d844 CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From a834ab29c450ede991a7e9b5d5052caa4ed521cf Mon Sep 17 00:00:00 2001 +From cc99de7db0c2b2a9c48a923d3dea91194e68f30f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Jul 2016 19:00:03 +0100 Subject: [PATCH 65/71] rbp: Ensure processinfo values are initialised @@ -53260,7 +53248,7 @@ index f54f53a3b18fd2baf9c696b76f6ff0a6c1a9da5c..e653f1a37a275f61698969bb2f79f6e4 CLog::Log(LOGDEBUG,"%s - change configuration. video:%dx%d. framerate: %4.2f. %dx%d format: BYPASS", __FUNCTION__, video_width, video_height, m_fFrameRate, iDisplayWidth, iDisplayHeight); -From 2f68203988b0e977a9d6e269c22d7b6103845164 Mon Sep 17 00:00:00 2001 +From c6d8d9bf6467a2730a4c02b408a4c5921924a3b1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 16 Sep 2016 15:37:07 +0100 Subject: [PATCH 66/71] MMAL: Indicate when picture came from still frame so @@ -53274,12 +53262,12 @@ linked list pointers), so the simple solution is to switch to the simpler deinterlace that does not require context for stills. --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 3 +-- + xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 4 ++-- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h | 1 + - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 3 ++- + xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 4 +++- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h | 3 ++- .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 10 ++++++++++ - 6 files changed, 17 insertions(+), 5 deletions(-) + 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 63df72700298c881107a3992c0eef893ae85f512..539882db7694e653df1d2caa5eaa955add0d7b71 100644 @@ -53295,10 +53283,18 @@ index 63df72700298c881107a3992c0eef893ae85f512..539882db7694e653df1d2caa5eaa955a { ctx->m_processInfo.SetVideoPixelFormat(pixFmtName ? pixFmtName : ""); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..52ffb18370e590a73b9e484ae1d6dd35106e1785 100644 +index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..1cb76f65a24bf46fe4e3fc1f54e99f284672d80b 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -258,8 +258,6 @@ void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf +@@ -71,6 +71,7 @@ CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr p + m_encoding = MMAL_ENCODING_UNKNOWN; + m_aspect_ratio = 0.0f; + m_rendered = false; ++ m_stills = false; + } + + CMMALVideoBuffer::~CMMALVideoBuffer() +@@ -258,8 +259,6 @@ void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf omvb->m_aligned_width = m_decoded_aligned_width; omvb->m_aligned_height = m_decoded_aligned_height; omvb->m_aspect_ratio = m_aspect_ratio; @@ -53307,7 +53303,7 @@ index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..52ffb18370e590a73b9e484ae1d6dd35 omvb->m_encoding = m_dec_output->format->encoding; { CSingleLock lock(m_output_mutex); -@@ -841,6 +839,7 @@ bool CMMALVideo::GetPicture(DVDVideoPicture* pDvdVideoPicture) +@@ -841,6 +840,7 @@ bool CMMALVideo::GetPicture(DVDVideoPicture* pDvdVideoPicture) pDvdVideoPicture->iFlags, buffer->mmal_buffer->flags, pDvdVideoPicture->MMALBuffer, pDvdVideoPicture->MMALBuffer->mmal_buffer); assert(!(buffer->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_DECODEONLY)); buffer->mmal_buffer->flags &= ~MMAL_BUFFER_HEADER_FLAG_USER3; @@ -53328,10 +53324,18 @@ index d39dc1ded1511e08556ed1129f58b23df9b1dbdd..1b21fe1a8a26c80dfb83a0af5a6ebd5c static const char *names[] = { "MMALStateNone", "MMALStateHWDec", "MMALStateFFDec", "MMALStateDeint", }; if ((size_t)m_state < vcos_countof(names)) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..2bbcd549d4713b9594209c2fd9071767a9df1c88 100644 +index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..244dced9d7d5c4a9006a2e5a6d27f80fdf0f497a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -93,7 +93,7 @@ CMMALYUVBuffer::~CMMALYUVBuffer() +@@ -54,6 +54,7 @@ CMMALYUVBuffer::CMMALYUVBuffer(std::shared_ptr pool, uint32_t mmal_en + m_aspect_ratio = 0.0f; + mmal_buffer = nullptr; + m_rendered = false; ++ m_stills = false; + if (m_encoding == MMAL_ENCODING_I420) + size_pic = (m_aligned_width * m_aligned_height * 3) >> 1; + else if (m_encoding == MMAL_ENCODING_YUVUV128) +@@ -93,7 +94,7 @@ CMMALYUVBuffer::~CMMALYUVBuffer() #undef CLASSNAME #define CLASSNAME "CDecoder" @@ -53340,7 +53344,7 @@ index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..2bbcd549d4713b9594209c2fd9071767 { if (g_advancedSettings.CanLogComponent(LOGVIDEO)) CLog::Log(LOGDEBUG, "%s::%s - create %p", CLASSNAME, __FUNCTION__, this); -@@ -289,6 +289,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture +@@ -289,6 +290,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture assert(picture->MMALBuffer->mmal_buffer); picture->MMALBuffer->mmal_buffer->data = (uint8_t *)gmem->m_vc_handle; picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; @@ -53391,7 +53395,7 @@ index a0104d9ff67402e74ea8076dd47e9e9bd11a74f1..2f9af729c26f81327a666a59a90f707e if (!g_graphicsContext.IsFullScreenVideo()) { -From 17b44c9a40d8ed81fc9dd7ba3914d5a6488fa8b6 Mon Sep 17 00:00:00 2001 +From 5030873f7ff40eaf7bddd1948cf9b832d1881438 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 15:19:02 +0100 Subject: [PATCH 67/71] MMAL: Move pool into base class @@ -53404,7 +53408,7 @@ Subject: [PATCH 67/71] MMAL: Move pool into base class 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 52ffb18370e590a73b9e484ae1d6dd35106e1785..120618a873965186817c726c8e67403e30e5b7fe 100644 +index 1cb76f65a24bf46fe4e3fc1f54e99f284672d80b..d62539aed69306a682d8dc68e410cf7b4a1d6594 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -59,7 +59,7 @@ using namespace KODI::MESSAGING; @@ -53464,7 +53468,7 @@ index 1b21fe1a8a26c80dfb83a0af5a6ebd5c9cae42ca..5c741d340d19b3765f96434ceb54745e class CMMALVideo : public CDVDVideoCodec diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 2bbcd549d4713b9594209c2fd9071767a9df1c88..3e3adbba41e43b2b63bb2765cb4ec2a49cebab92 100644 +index 244dced9d7d5c4a9006a2e5a6d27f80fdf0f497a..b0db2746b6eb51b2222e8f2813b1eb14ff120a2e 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp @@ -43,7 +43,7 @@ using namespace MMAL; @@ -53489,7 +53493,7 @@ index 60aff83a3e55f11313d0d9186212e9badbb6d52e..20eab3bed39fa11bd1454f6c6decd4ec class CDecoder -From 6665c4c5ebf015ac7a90c2759175bb746607b23a Mon Sep 17 00:00:00 2001 +From 6297a1f607bfcb2fae0e05af8c8b2b7b91ec9b3b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 16:20:30 +0100 Subject: [PATCH 68/71] MMAL: Make setting the decoder more consistent between @@ -53503,7 +53507,7 @@ Subject: [PATCH 68/71] MMAL: Make setting the decoder more consistent between 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 3e3adbba41e43b2b63bb2765cb4ec2a49cebab92..dc7d97505e95dff2071c5fc85f6004690b3aac00 100644 +index b0db2746b6eb51b2222e8f2813b1eb14ff120a2e..f20305acaf0ca73a928bc0927129f384c642474a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp @@ -42,8 +42,8 @@ using namespace MMAL; @@ -53517,7 +53521,7 @@ index 3e3adbba41e43b2b63bb2765cb4ec2a49cebab92..dc7d97505e95dff2071c5fc85f600469 { uint32_t size_pic = 0; m_width = width; -@@ -243,6 +243,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel +@@ -244,6 +244,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel CLog::Log(LOGERROR, "%s::%s Failed to create pool for decoder output", CLASSNAME, __func__); return false; } @@ -53603,7 +53607,7 @@ index 5d3baa6534a2fe449990402ab805d84423fbc636..b7a61eab678f8aedeff96795c9ba3a06 class CMMALRenderer : public CBaseRenderer, public CThread, public IRunnable -From 7f02d82595b80eed6c9c32f3dba6672e65b1513a Mon Sep 17 00:00:00 2001 +From e7eaba9534259eb067272938f849be91cbded991 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 16:32:45 +0100 Subject: [PATCH 69/71] MMAL: Set processInfo in pool @@ -53616,10 +53620,10 @@ Subject: [PATCH 69/71] MMAL: Set processInfo in pool 4 files changed, 5 insertions(+) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 120618a873965186817c726c8e67403e30e5b7fe..422b709a4929d119a2d550433221867149306c0d 100644 +index d62539aed69306a682d8dc68e410cf7b4a1d6594..c65fc524273f2b6cc40cf6ff8e8beb8d0bc38440 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -480,6 +480,7 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) +@@ -481,6 +481,7 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) return false; } m_pool->SetDecoder(this); @@ -53628,10 +53632,10 @@ index 120618a873965186817c726c8e67403e30e5b7fe..422b709a4929d119a2d5504332218671 m_dec->control->userdata = (struct MMAL_PORT_USERDATA_T *)this; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index dc7d97505e95dff2071c5fc85f6004690b3aac00..2fb4921c5c9ac726f60db5bd575ad5a402267e92 100644 +index f20305acaf0ca73a928bc0927129f384c642474a..d42e3090c9b38a43ee72fdc3780a244317ece11a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -244,6 +244,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel +@@ -245,6 +245,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel return false; } m_pool->SetDecoder(this); @@ -53672,7 +53676,7 @@ index b7a61eab678f8aedeff96795c9ba3a06157bb88d..b7621a8cf37907d544987b06dd4528ee class CMMALRenderer : public CBaseRenderer, public CThread, public IRunnable -From 322a328c70be40d7efc0b95fdca816a94a765cb9 Mon Sep 17 00:00:00 2001 +From 7201b3b43f2c3468bd8c158289611bc546264534 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 18:35:55 +0100 Subject: [PATCH 70/71] MMAL: Report deinterlace method to processinfo overlay @@ -53685,7 +53689,7 @@ Subject: [PATCH 70/71] MMAL: Report deinterlace method to processinfo overlay 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 422b709a4929d119a2d550433221867149306c0d..900f74b78c0d5fe45f7ebf338a854c48085573ea 100644 +index c65fc524273f2b6cc40cf6ff8e8beb8d0bc38440..1aca23f755ce273ca1e5e4ffdd8be02897e2304a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -57,6 +57,7 @@ using namespace KODI::MESSAGING; @@ -53696,7 +53700,7 @@ index 422b709a4929d119a2d550433221867149306c0d..900f74b78c0d5fe45f7ebf338a854c48 CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr pool) : CMMALBuffer(pool), m_omv(omv) -@@ -375,8 +376,6 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) +@@ -376,8 +377,6 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) if (hints.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) return false; @@ -53774,7 +53778,7 @@ index b7621a8cf37907d544987b06dd4528eed468abc0..5758deba4d5d30662507968ac7af0fb0 uint32_t m_mmal_format, m_width, m_height, m_aligned_width, m_aligned_height, m_size; AVCodecContext *m_avctx; -From 74733937597c92d832b8088a377d719d6643d749 Mon Sep 17 00:00:00 2001 +From 204ea8e03c62d18ba2c9793c63d289346678a082 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 19 Sep 2016 19:56:07 +0100 Subject: [PATCH 71/71] MMALRenderer: Ensure updated aspect ratio is seen in diff --git a/projects/RPi2/patches/kodi/kodi-001-backport.patch b/projects/RPi2/patches/kodi/kodi-001-backport.patch index 522fa768ba..b7ee1682e9 100644 --- a/projects/RPi2/patches/kodi/kodi-001-backport.patch +++ b/projects/RPi2/patches/kodi/kodi-001-backport.patch @@ -1,4 +1,4 @@ -From e0fbc9049e9671c4ec071b21a44b3ee2ec631246 Mon Sep 17 00:00:00 2001 +From 202e6e44d01a65054e0609f659cb3a3244012fc6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 17:27:39 +0100 Subject: [PATCH 01/71] build: Allow installed links to be overwritten @@ -9,10 +9,10 @@ Subject: [PATCH 01/71] build: Allow installed links to be overwritten 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile -index 16c82d3cb06e20adf27e7f429eebda6b7efbdf8c..8dcfe26cbc29ebe47cdb212712ae64745f8a009e 100644 +index c35e4849aa2651868e06046d397e0c3126b6b829..9bca1889b127a690082c2fb55625fc9a385a97d1 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile -@@ -129,41 +129,41 @@ distclean:: +@@ -130,41 +130,41 @@ distclean:: for d in $(DEPENDS); do $(MAKE) -C $$d distclean; done linux-system-libs-egl: @@ -91,7 +91,7 @@ index 16c82d3cb06e20adf27e7f429eebda6b7efbdf8c..8dcfe26cbc29ebe47cdb212712ae6474 + [ -f $(PREFIX)/lib/pkgconfig/xmu.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/xmu.pc $(PREFIX)/lib/pkgconfig/xmu.pc + [ -f $(PREFIX)/lib/pkgconfig/libdrm.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/libdrm.pc $(PREFIX)/lib/pkgconfig/libdrm.pc diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include -index 42c58313b0bdab7113955ff00d594014758e148e..433b609aee40f8804380c9b71eb4ffb310b0a985 100644 +index 5eb06d2001cfd049fce02b9dacf20f4fc76252d6..499d41f3c4c2307c3275dc3562d37def8ea9eb16 100644 --- a/tools/depends/xbmc-addons.include +++ b/tools/depends/xbmc-addons.include @@ -77,23 +77,23 @@ $(TOOLCHAIN_FILE): $(abs_top_srcdir)/target/Toolchain_binaddons.cmake @@ -137,7 +137,7 @@ index 42c58313b0bdab7113955ff00d594014758e148e..433b609aee40f8804380c9b71eb4ffb3 + [ -f $(ADDON_DEPS_DIR)/lib/libm.so ] || ln -sf /usr/lib/$(HOST)/libm.so $(ADDON_DEPS_DIR)/lib/ -From 7f1c046ecb10fe915d3593fdd4d3a5e5ae255948 Mon Sep 17 00:00:00 2001 +From 1329a7396dd89969d74e7de39afd19d1a7222301 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 7 Apr 2014 18:19:32 +0100 Subject: [PATCH 02/71] [rbp/omxplayer] When opening a stream don't try to @@ -164,7 +164,7 @@ index 8ea5161637b4e66ddd222859f058521dbc8922b9..811019a39a10acc21b83f0b0c70d5500 dialog->ProcessRenderLoop(false); if (allowCancel && dialog->IsCanceled()) -From 834675ae156d1a4293e18e2bd34a1ebce2b9ec59 Mon Sep 17 00:00:00 2001 +From 0314e11a8feb42ae384949cd37f51b2896415bda Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 8 Mar 2014 15:36:06 +0000 Subject: [PATCH 03/71] [hifiberry] Hack: force it to be recognised as IEC958 @@ -190,7 +190,7 @@ index 6a9066b2dbe8d505d636b3638c1d35c7c8a698ed..9c6ac5d4cc9bf21b2d48619cc6fb5d27 info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { -From 515de482dd2a995fd5b64c3be4153d4bb9a2d9a2 Mon Sep 17 00:00:00 2001 +From a78b4e9bbfc81096248953941c45fd01c86bcbda Mon Sep 17 00:00:00 2001 From: Ben Avison Date: Thu, 1 May 2014 16:28:39 +0100 Subject: [PATCH 04/71] Improved file buffering in CArchive @@ -253,7 +253,7 @@ index 23cac2759fb10d532da56fa75c5528c5589e9010..89d31d4db1afa7340ed8cd51a7a9fa7a } -From 273657ebc526f42bda4fa39469601e505f73aad7 Mon Sep 17 00:00:00 2001 +From 0a3b521962f2aaa2e0d30ab608dc53e01926a8c3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 16:45:16 +0100 Subject: [PATCH 05/71] filesystem: Make support of browsing into archives @@ -275,10 +275,10 @@ We'll let people who don't use archives disable it manually 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 691130c0639919069cc0a5a2ad3b96d5aeabfc51..f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70 100644 +index 7d8a53cadd599d0ff415f80c497f63e577b58334..d86a219b8f5a586c237494656ba77ea204aa41aa 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19296,6 +19296,15 @@ msgstr "" +@@ -19309,6 +19309,15 @@ msgstr "" #: system/settings/rbp.xml msgctxt "#38010" msgid "GPU accelerated" @@ -315,10 +315,10 @@ index 62e9c8ed2199f8c57a640b06b0216ee4c8f0ca1e..e8b0d3d472b02fd161a4b51e957b9129 + diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp -index 9fb278691ebb07df53f3c0fe35930124e1468546..3bc1660cc74aa2fef41a4cedc2a0acf1d65f7d9a 100644 +index 161304a597b4c8fb859d5951d3037e33cfeadf5c..e7e13cae766c00133b67c2a9a6962a9a451a1d64 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp -@@ -1860,7 +1860,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, +@@ -1886,7 +1886,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, URIUtils::RemoveExtension(strCandidate); if (StringUtils::StartsWithNoCase(strCandidate, videoName)) { @@ -327,7 +327,7 @@ index 9fb278691ebb07df53f3c0fe35930124e1468546..3bc1660cc74aa2fef41a4cedc2a0acf1 CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), "", item_exts, associatedFiles); else { -@@ -1870,7 +1870,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, +@@ -1896,7 +1896,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName, } else { @@ -366,7 +366,7 @@ index a0fd0a9011e71f4af1535110c696b6ea5c4b37db..688b71a297c7c617c6764bfe6be157d7 { CURL xbtUrl = URIUtils::CreateArchivePath("xbt", url); -From 5688f7e0f6512c7461246bd6922b78d3320d5d9f Mon Sep 17 00:00:00 2001 +From b80c2a021a60985149d421825e49fcf6fc766d4c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 13:06:57 +0000 Subject: [PATCH 06/71] [rbp] Make cachemembuffersize default depend on memory @@ -471,7 +471,7 @@ index 6beebe0c9c11b0bab63e5abbd4aea2d62bb05f0c..03f566d3ee4eab690d2236b773908026 } -From 3e385816aea376672ca01125699ffa91459402dc Mon Sep 17 00:00:00 2001 +From 116128e0f9fcc11c5f7b373a30afb4c4facacfcb Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 30 May 2014 14:58:43 +0100 Subject: [PATCH 07/71] [settings] Experiment: Report DESKTOP resolution in @@ -496,7 +496,7 @@ index c1cca7efdd5d119b07308b947c569911f2a9bdc9..e03f3c8ef21ba824c0d707042e5a735a StringUtils::Format("%dx%d%s", resolution->width, resolution->height, ModeFlagsToString(resolution->flags, false).c_str()), -From 06b1a288a2b0c0b2a0b7fcbadd96d6b17ce1f97b Mon Sep 17 00:00:00 2001 +From bee429c529aae1f826d6c3d8417a3bb3e4c02abc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 24 Sep 2014 23:13:52 +0100 Subject: [PATCH 08/71] [audio] Add settings option to boost centre channel @@ -517,12 +517,12 @@ Should work with Pi Sink (dvdplayer/paplayer) and omxplayer 5 files changed, 46 insertions(+) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70..2b107342c18c9a2e750bf68db262f2eedbd4ade7 100644 +index d86a219b8f5a586c237494656ba77ea204aa41aa..4e4dd800fd0ad8f4b4bb2956d99f881b018b1022 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19470,6 +19470,21 @@ msgstr "" +@@ -19507,6 +19507,21 @@ msgstr "" - #empty strings from id 38043 to 38099 + #empty strings from id 38047 to 38099 +#: system/settings/settings.xml +msgctxt "#38007" @@ -543,7 +543,7 @@ index f4f4ebafcd3aa8c70714f8fb8433b1955cb54d70..2b107342c18c9a2e750bf68db262f2ee #: system/settings/settings.xml msgctxt "#38100" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 0551388f478210c3be778a1a2997d8c01c7e79ee..4c0da310a630190e2adabe5ddab9ce46f9401a45 100644 +index 1ec0aa46101746ca21909c5effb36a74811b0d1e..7f43d130c47edcaf22f33ef547124134d30e7cbb 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2361,6 +2361,18 @@ @@ -625,7 +625,7 @@ index f16b822ed7b4aebe18b5d339b3f71ee66e97c23f..993d4b33a294e88c2c004b7943895ba5 // stereo upmix if (upmix && m_src_channels == 2 && m_dst_channels > 2) -From 8fa800bce04b64021f1623112f4015d973affb78 Mon Sep 17 00:00:00 2001 +From f7e5a05d6fbdb4cbd467d5ffa6bd809c5bd2ab33 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 27 Oct 2014 15:23:51 +0000 Subject: [PATCH 09/71] [rbp] Default extract thumbnails to false @@ -654,7 +654,7 @@ index e8b0d3d472b02fd161a4b51e957b9129e3cb9792..289dc55ec41aa44848519a05f8ee1ccc -From ee959b77b717002e7c7beff9119413902b710b96 Mon Sep 17 00:00:00 2001 +From 603a4b2646b57853646a661c23862bab8db4583a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 27 Nov 2014 16:31:56 +0000 Subject: [PATCH 10/71] [languageinvoker] Reduce priority of python threads @@ -680,7 +680,7 @@ index fcdd0633f30cd9595ae6cc4ed293677cdcb1f422..16f0c8916b5e0a9e90973d194cf2ebd1 } -From e81b98b935889eef655745c3fbe8e43faab90af9 Mon Sep 17 00:00:00 2001 +From 4a5f93e97a2b82b0c7f6894da3936440e714aa63 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 14 Dec 2013 16:55:05 +0000 Subject: [PATCH 11/71] logging: Add microsecond timer to log messages @@ -734,7 +734,7 @@ index 3443f1293d86018830269ed992c90a4e69c0430c..d330320842243df6f5ff256e608dddfa levelNames[logLevel]) + strData; -From b9b964f7aa9c2a94c725401dea4732eb103dcc8f Mon Sep 17 00:00:00 2001 +From dc92e0e62f88c0828188701c5cfa5d0819949159 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 29 Nov 2014 15:25:16 +0000 Subject: [PATCH 12/71] [rbp] hack: wait for splash to complete before changing @@ -821,7 +821,7 @@ index ee297700f8583dbb15cbe53baf8c887b36bd2ea0..bbe501d40c5e101f1d0d64b8b59b1928 RENDER_STEREO_MODE stereo_mode = g_graphicsContext.GetStereoMode(); -From 0506ace2f698f48bcda87b67f472f38177ecdcf9 Mon Sep 17 00:00:00 2001 +From 1777c5c26c2fb2173d61ab50334d14f533aa5b45 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 11 Dec 2014 17:00:57 +0000 Subject: [PATCH 13/71] Fix for UI not showing both extractflags and @@ -833,10 +833,10 @@ Subject: [PATCH 13/71] Fix for UI not showing both extractflags and 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77ee30cc5a0 100644 +index 4e4dd800fd0ad8f4b4bb2956d99f881b018b1022..2d352a3a844ec7888f982dc2330f2a1635d2c43c 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -12442,7 +12442,7 @@ msgstr "" +@@ -12443,7 +12443,7 @@ msgstr "" #: system/settings/settings.xml msgctxt "#20433" @@ -845,7 +845,7 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp -@@ -16932,7 +16932,7 @@ msgstr "" +@@ -16945,7 +16945,7 @@ msgstr "" #. Description of setting with label #20433 "Extract thumbnails and video information" #: system/settings/settings.xml msgctxt "#36178" @@ -854,7 +854,7 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #. Description of setting with label #20419 "Replace file names with library titles" -@@ -16944,7 +16944,7 @@ msgstr "" +@@ -16957,7 +16957,7 @@ msgstr "" #. Description of setting with label #20433 "Extract thumbnails and video information" #: system/settings/settings.xml msgctxt "#36180" @@ -863,16 +863,16 @@ index 2b107342c18c9a2e750bf68db262f2eedbd4ade7..d631c235a0765913a79fc7db9726d77e msgstr "" #: system/settings/settings.xml -@@ -19612,3 +19612,7 @@ msgstr "" - msgctxt "#39009" - msgid "Zoom - 110% width" +@@ -19654,3 +19654,7 @@ msgstr "" + msgctxt "#39010" + msgid "Select sort method" msgstr "" + +msgctxt "#38190" +msgid "Extract thumbnails from video files" +msgstr "" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4c0da310a630190e2adabe5ddab9ce46f9401a45..4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e 100644 +index 7f43d130c47edcaf22f33ef547124134d30e7cbb..f2cf001e5ef8cfd881617b8f9887d054a0902176 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -977,8 +977,8 @@ @@ -887,7 +887,7 @@ index 4c0da310a630190e2adabe5ddab9ce46f9401a45..4bc6b6f4a57bbd3b2e4e3eebbda3b7dc -From a9e6422c823eaed9629c161fc5b758b7ba5ae9bb Mon Sep 17 00:00:00 2001 +From bc596cd94ede919c2b31f4fbf448a3a4f1638bc6 Mon Sep 17 00:00:00 2001 From: anaconda Date: Thu, 11 Sep 2014 21:30:43 +0200 Subject: [PATCH 14/71] Disable autoscrolling while on screensaver and while @@ -903,10 +903,10 @@ Subject: [PATCH 14/71] 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 3e6c25ac7e2c4e7d8da17eb2e6f38666eae48da4..58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702 100644 +index c780168e0fc2a0ffcbbaf4a8a0a7886210fbf57d..ad529fdb715d97497f9b851343e2aafc927b7d71 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -5227,3 +5227,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const +@@ -5213,3 +5213,13 @@ bool CApplication::NotifyActionListeners(const CAction &action) const return false; } @@ -921,7 +921,7 @@ index 3e6c25ac7e2c4e7d8da17eb2e6f38666eae48da4..58aa2bf7da09e6469c8c7a44ad9cc578 + return onBlackDimScreenSaver || openingStreams; +} diff --git a/xbmc/Application.h b/xbmc/Application.h -index 39b59fa9bab72a7471785c8c4d44b8af4437c580..4b4d3acf98abf4485782c54e6026792d4e4ef097 100644 +index 22aca8173d0a452dc3d18ee559613ceb59f31b41..0f570f108436c168b3af746f5c005ae9dadf68b5 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -395,6 +395,8 @@ public: @@ -1021,7 +1021,7 @@ index d7bc1c5ba6067af9a460589920367288c640a915..ac766293f1c47c7f145cb46f6b152144 if (m_lastRenderTime) m_autoScrollDelayTime += currentTime - m_lastRenderTime; -From bbff608e360bea6f65d1cda665dd8e73a2b65957 Mon Sep 17 00:00:00 2001 +From 47998740e492c134e0b176de38dc008cd2344f0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 13 Dec 2014 18:35:20 +0000 Subject: [PATCH 15/71] [demuxer] Avoid memcpy on every demuxer packet @@ -1035,10 +1035,10 @@ 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 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14dcb569af 100644 +index 926cc744ee8171f45a2764e170420a0df514c245..090af6fd3d16b5d723ed665cac9889ddb0e5ef81 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -894,7 +894,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -895,7 +895,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { if(m_pkt.pkt.stream_index == (int)m_pFormatContext->programs[m_program]->stream_index[i]) { @@ -1047,7 +1047,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 break; } } -@@ -903,7 +903,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -904,7 +904,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() bReturnEmpty = true; } else @@ -1056,7 +1056,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 } else bReturnEmpty = true; -@@ -933,9 +933,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -934,9 +934,13 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() // copy contents into our own packet pPacket->iSize = m_pkt.pkt.size; @@ -1072,7 +1072,7 @@ index 8460e27865a47861efa67d577187d5ab9b26431b..748508c8d2d5d0a8650f5a949d8f4d14 pPacket->pts = ConvertTimestamp(m_pkt.pkt.pts, stream->time_base.den, stream->time_base.num); pPacket->dts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num); -@@ -989,7 +993,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -990,7 +994,10 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() pPacket->iStreamId = m_pkt.pkt.stream_index; } m_pkt.result = -1; @@ -1124,7 +1124,7 @@ index df0f35bd49c65b302de4ccd110d859e8b881ea5f..b4b591ae4c4dd4fb0b36d4d00fedca96 } catch(...) { -From 1d44b7c50279a59137a1bb2231fe05b2ccbe284e Mon Sep 17 00:00:00 2001 +From 7144fb5b424a40bbf5ec226dc8976959f9b0c17b Mon Sep 17 00:00:00 2001 From: anaconda Date: Wed, 25 Feb 2015 18:22:21 +0100 Subject: [PATCH 16/71] Load OSD dialogs on startup. @@ -1222,7 +1222,7 @@ index 0534828dd85520134f7a6890e43a873e223062c1..5a86dfc1e2a54c8fe8d82cb75b612d8e CGUIDialogVideoSettings::~CGUIDialogVideoSettings() { } -From 027b3a234cc9fbccbe95962b2462d89e2344b5ef Mon Sep 17 00:00:00 2001 +From 852d35cfa51340faf7ae9015bf19c63639d9fdef Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 14 Apr 2015 20:51:14 +0100 Subject: [PATCH 17/71] [gui] Also limit GUI updates when in non full-screen @@ -1233,10 +1233,10 @@ Subject: [PATCH 17/71] [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 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a65da7cb85 100644 +index ad529fdb715d97497f9b851343e2aafc927b7d71..c311fb5f06e0f1e7e887b79ec811941f17ffc34d 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2773,7 +2773,7 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2759,7 +2759,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 @@ -1245,7 +1245,7 @@ index 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a6 fps = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_LIMITGUIUPDATE); #endif -@@ -2786,6 +2786,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) +@@ -2772,6 +2772,8 @@ void CApplication::FrameMove(bool processEvents, bool processGUI) { if (!m_skipGuiRender) g_windowManager.Process(CTimeUtils::GetFrameTime()); @@ -1255,7 +1255,7 @@ index 58aa2bf7da09e6469c8c7a44ad9cc578e7d5b702..d22f3a35dd1e4a0714715c02de7399a6 g_windowManager.FrameMove(); } -From 836f001711a2e8d430806c9f1d88db285d8e4806 Mon Sep 17 00:00:00 2001 +From 0c05fc9d4dfa04af6fd1def2c427385b6c0cc64a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 5 May 2015 23:58:06 +0100 Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for @@ -1266,10 +1266,10 @@ Subject: [PATCH 18/71] [screensaver] Leave GUI contents available for 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 227f323083b0fb9cee3b576bfcc7b51d5e27ac10..6994f16290ca3ec9da124fbf1cfa21716333855d 100644 +index f6f64414831232558751c9f35f5c1d61eacd4fd6..9350bfd4ed53954fc500ff813da3cc9d5f3b99c7 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp -@@ -795,7 +795,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector +@@ -794,7 +794,16 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const std::vector int currentWindow = GetActiveWindow(); CGUIWindow *pWindow = GetWindow(currentWindow); if (pWindow) @@ -1288,7 +1288,7 @@ index 227f323083b0fb9cee3b576bfcc7b51d5e27ac10..6994f16290ca3ec9da124fbf1cfa2171 // Add window to the history list (we must do this before we activate it, -From 22653aaa9fe86fe53508242fa150a2109476b4ae Mon Sep 17 00:00:00 2001 +From 96fb9251dc5c13fb7b19ea7851b5cb01b00421cf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 6 Jun 2015 18:43:57 +0100 Subject: [PATCH 19/71] ffmpeg: Automatic switch to software decode for GMC @@ -1440,10 +1440,10 @@ index 03fdf6efa072219d55cac21b7f7923ffc6c00e17..e3a32aebfe59016b43cd7c2b304921b5 class CDemuxStreamAudio : public CDemuxStream diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 748508c8d2d5d0a8650f5a949d8f4d14dcb569af..a992c9253911d53c0648a9dceff37054fb2c91d0 100644 +index 090af6fd3d16b5d723ed665cac9889ddb0e5ef81..b2f2268c6e92b38f2e17f4d1e99b4681413a27b4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1366,7 +1366,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1367,7 +1367,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -1519,7 +1519,7 @@ index f135d423c0ca76fd70e79ae5b7d035f0cb79fc75..d9b576bc46055fdab1c134e5f2c63cd4 else if ((hint.codec == AV_CODEC_ID_VC1 || hint.codec == AV_CODEC_ID_WMV3) && g_RBP.GetCodecWvc1()) supported = true; -From 775e6fccf8309276444522325cbab291b189e511 Mon Sep 17 00:00:00 2001 +From 928f3f8d99122a98d873b94cf306963a7538c935 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 10 Mar 2016 17:56:11 +0000 Subject: [PATCH 20/71] [rbp] HW mouse pointer @@ -1537,7 +1537,7 @@ Render the mouse with an overlay to avoid redrawing the normal gui. 5 files changed, 282 insertions(+) diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp -index 6994f16290ca3ec9da124fbf1cfa21716333855d..97a693ad29a54a53acbdc9abe7f83c103e5e1dac 100644 +index 9350bfd4ed53954fc500ff813da3cc9d5f3b99c7..cd45a5961d4ffafbc8e62a3874dd626af5ccb7e2 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -199,7 +199,9 @@ void CGUIWindowManager::CreateWindows() @@ -1955,7 +1955,7 @@ index 1b1d2f2e60334ed0f3a9964d106957f58e69f1b3..c82ba84625fe3556ff49764d40ceb3ec #endif -From 3a99189fb7502f4b2f81be61f86a338a8406b63c Mon Sep 17 00:00:00 2001 +From c5a3be140b5890f3dc1e0ba682c3a676519eb0c0 Mon Sep 17 00:00:00 2001 From: Claudio-Sjo Date: Mon, 16 Feb 2015 14:51:26 +0100 Subject: [PATCH 21/71] - allow reads < CDIO_CD_FRAMESIZE_RAW by using a buffer @@ -2150,7 +2150,7 @@ 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 b4661d1c55cb278ce2f8980d53876c3d1c40b22c Mon Sep 17 00:00:00 2001 +From 0d7f8d31adf8109c545a6ef2ca272bd944eb819d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 24 Jun 2016 19:38:13 +0100 Subject: [PATCH 22/71] codecoverlay: Include codec name in overlay @@ -2179,10 +2179,10 @@ index 5da89e55c83568513cbf829679b60780572d5b49..27d7065a61b495b36abcfb96bc751317 //print the inverse of the resample ratio, since that makes more sense //if the resample ratio is 0.5, then we're playing twice as fast diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index c6d100b58c9bab185e747d14ee33cebce5c7cced..585b812a04d928ef493eb3cb3f8943fb33328a0e 100644 +index 86513278362e65c3fb01d6c27662bbc9099fa68a..f80c62ef56303bac91c4813f854c60985d3f812f 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -922,10 +922,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) +@@ -921,10 +921,13 @@ int CVideoPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) std::string CVideoPlayerVideo::GetPlayerInfo() { @@ -2247,7 +2247,7 @@ index 0df7e72cc9d1947173c2bac5e72eb09976b51aa5..b5050081c360d29b1b478c27e6b88291 double m_iSubtitleDelay; bool m_bRenderSubs; -From a51091d35bd02cde9ad4b579ca166c37a5d4332b Mon Sep 17 00:00:00 2001 +From 9c4175da7381fcb59d4bebfd60d02b23e3b1cfeb Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 8 Mar 2016 21:20:58 +0300 Subject: [PATCH 23/71] [DebugInfo] Add cpu usage info. @@ -2387,7 +2387,7 @@ index 85aefaace73994730f7d2bdff9de85c79e99b2a2..8005a13bc220be0c5c596d276197c11e }; \ No newline at end of file diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index eab9c0f470c3d22cc8f5efc42cdcc7e2280c6fef..4784843a2aa247a94fb6e9e1463c000ff178a3e9 100644 +index b2d3a388d48ed61d978c85faffc04c0e1385a6dc..9160a9b90319d64f102aa869f2d9065362c240f9 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -24,6 +24,7 @@ @@ -2420,7 +2420,7 @@ index eab9c0f470c3d22cc8f5efc42cdcc7e2280c6fef..4784843a2aa247a94fb6e9e1463c000f m_debugTimer.Set(1000); -From af65dd5f3ac73c2a4c20c23e7e9ca6e09c5ac061 Mon Sep 17 00:00:00 2001 +From 0804e3b54d11c2d9af6de2f81b00e12416dccf0d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 May 2015 13:56:29 +0100 Subject: [PATCH 24/71] ffmpeg: Allow neon to be enabled in unified builds @@ -2446,7 +2446,7 @@ index 9b763bc30aaf473d656f53c140ead8f948eff812..4e3cbf75331240ef33deb8f99ae9c57a ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) -From 45a10b59e677bc5afe68df28ea9711cd901e2ddf Mon Sep 17 00:00:00 2001 +From 65d542b66ad63df25cae7cc0bdc8b1b2bb829f89 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Feb 2015 14:37:27 +0000 Subject: [PATCH 25/71] ffmpeg: Add some upstream HEVC optimisations @@ -6247,7 +6247,7 @@ index 0000000000000000000000000000000000000000..5e8e07d407f045fc99554f0f061d1e81 +2.5.0 + -From 14052af2fcc2e3004d25683d608d0ca8a4142d18 Mon Sep 17 00:00:00 2001 +From 44f8a8562b7a72443c5830b09905bf6d145f5930 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 14:04:18 +0100 Subject: [PATCH 26/71] [ffmpeg] Add GPU acceleration to hevc @@ -44436,7 +44436,7 @@ index 0000000000000000000000000000000000000000..e172ebf157aebffe1ae50b4a2b25fd71 +2.7.4 + -From 4578c89ff9fa89e0d685f1831d35134bfdf53c33 Mon Sep 17 00:00:00 2001 +From 79f478c571cf8a51531b236a4bbac30d116b4569 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 22 Aug 2015 23:06:56 +0100 Subject: [PATCH 27/71] [dvdmessage] Increase timeout on @@ -44460,7 +44460,7 @@ index 0dcc664fd862706c60659f3664c7d964597c94d5..7614c831af9dfc821121a4111546fd4d long CDVDMsgGeneralSynchronize::Release() -From 9e03a7e826b678dc23168f8ebcc9cfc4a7eebb87 Mon Sep 17 00:00:00 2001 +From d8b0fda81af7df889d223337496fea088f5dcdd7 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 16 Sep 2015 19:05:12 +0100 Subject: [PATCH 28/71] [3d] Make MVC a valid 3D filename tag @@ -44512,10 +44512,10 @@ index 03f566d3ee4eab690d2236b7739080269d552511..60e5652f69e96a559d8080e01dc214a5 XMLUtils::GetFloat(pElement, "audiodelayrange", m_videoAudioDelayRange, 10, 600); XMLUtils::GetString(pElement, "defaultplayer", m_videoDefaultPlayer); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 1727580c0c8de2b6fda19a741f90721a570b96b8..4fa973515df6e677418a6bf7f9d0b4a31c022c0a 100644 +index fc526d11c3a78bc74125429120e29bf295bd3b16..6b0e3b8cf9e3ff40e6af758c54fe7eefb89a131c 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h -@@ -371,6 +371,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -372,6 +372,7 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler std::string m_stereoscopicregex_3d; std::string m_stereoscopicregex_sbs; std::string m_stereoscopicregex_tab; @@ -44524,7 +44524,7 @@ index 1727580c0c8de2b6fda19a741f90721a570b96b8..4fa973515df6e677418a6bf7f9d0b4a3 bool m_useDisplayControlHWStereo; -From cc04777d5d90d440e90c05f5bb7d97a800241286 Mon Sep 17 00:00:00 2001 +From 2b49536142534a8197b3ef2800c8ec4fe9d49dca Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 5 Oct 2015 14:58:05 +0100 Subject: [PATCH 29/71] [3d] Swap top/bottom sides of GUI @@ -44547,7 +44547,7 @@ index 3706e4d80b3b31da4c5be0a1b21f36e59d2910f2..e170b3fb05279ffa316794dbce1d4f9d } if(m_stereoMode == RENDER_STEREO_MODE_SPLIT_VERTICAL) -From 026be8150438a79f3f36a9fa18ec5be344fb52a2 Mon Sep 17 00:00:00 2001 +From b3e6758fc9ff329c26c2867e01eca7b9b60cc15a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 11 Oct 2015 20:51:37 +0100 Subject: [PATCH 30/71] Revert "Revert "Disable extra logging by default"" @@ -44558,7 +44558,7 @@ This reverts commit a880554325be187b877cd8f0e2b338e7267da636. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e..1860d972c0afd541337b3e1e0c3e2d006d67a44c 100644 +index f2cf001e5ef8cfd881617b8f9887d054a0902176..52dfd4e3e261388a5fe0f6997e62b906ccfa007a 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2815,12 +2815,12 @@ @@ -44577,7 +44577,7 @@ index 4bc6b6f4a57bbd3b2e4e3eebbda3b7dc59c25e5e..1860d972c0afd541337b3e1e0c3e2d00 loggingcomponents , -From 341618c4c2fb98d4e7824f0566ac0981d5e71b56 Mon Sep 17 00:00:00 2001 +From 360f50196733d6e07328b62b6326076654af7e74 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 26 Nov 2015 17:14:49 +0000 Subject: [PATCH 31/71] [ae] Add debug logging showing resamplerate @@ -44599,7 +44599,7 @@ index 5b2243f3094403ce485006333fd000342f0e58b2..799dc57a130d15a025a7c525ddac8e17 } else if (stream->m_processingBuffers) -From c08cfb0d49bd33844ab2c3578982cc86abbd7b50 Mon Sep 17 00:00:00 2001 +From 8e6ec4f5a9713fbdfa7a0690ca92f9efe1d943bf Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 21 Dec 2015 22:17:25 +0000 Subject: [PATCH 32/71] [omximage] Fall back to arm jpeg encode/decode when gpu @@ -44845,7 +44845,7 @@ index a93aa82663903fb1bf712058c2e259290ee742e6..6f38dbc7e5cc721c59a3633935f08218 extern COMXImage g_OMXImage; -From 2dcd51678f6f670da1830d764625f87e6f8e7245 Mon Sep 17 00:00:00 2001 +From 643886cf5e2dd5c6ea75c8798eeb02332e18767a Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Dec 2015 13:31:14 +0000 Subject: [PATCH 33/71] [mmalcodec] Fail to open when width is invalid. Can @@ -44870,7 +44870,7 @@ index aa20f18cbea80ed68c1307470289525bd5db29e3..cead68bd79d388f0eda0f8a79f17d296 if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software) return false; -From 64c3300e8523a51c23b30443dcc63fcc8599e0ec Mon Sep 17 00:00:00 2001 +From 6c3e8391b719b76353055162c73a3375e958f87e Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 12 Jan 2016 16:29:57 +0000 Subject: [PATCH 34/71] ffmpeg: Add cabac opimisations for hevc @@ -47110,7 +47110,7 @@ index e2641093d15e5b465fae7e5f87c3ea18573dd6ee..7022b5fadef58ad27b61725d77131bd7 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ ./configure --prefix=$FFMPEG_PREFIX \ -From 23a20bff0647e62a82e6006ad9de82ff3f7ac1df Mon Sep 17 00:00:00 2001 +From f951553df2c7891607ca73715009627f6066766c Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 19 Sep 2014 11:54:49 +0100 Subject: [PATCH 35/71] [videoplayer/rbp] Add pi specific option to maintain @@ -47135,10 +47135,10 @@ or drop/dupe audio packets which is normally required. 12 files changed, 122 insertions(+), 19 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index d631c235a0765913a79fc7db9726d77ee30cc5a0..06957078b9e69c6f05f31b6414aec04f420745b8 100644 +index 2d352a3a844ec7888f982dc2330f2a1635d2c43c..45ee30ba64153eb4287e7cf0f2af6dd6553e9d26 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19616,3 +19616,35 @@ msgstr "" +@@ -19658,3 +19658,35 @@ msgstr "" msgctxt "#38190" msgid "Extract thumbnails from video files" msgstr "" @@ -47509,7 +47509,7 @@ index 90b04db5405058be2ff20aeaa6af2d2ac651586f..084fba87f49f4c3b33a8dd4a20a626a3 void init_cursor(); void set_cursor(const void *pixels, int width, int height, int hotspot_x, int hotspot_y); -From b9702220fd04c99d46abc1eb169bf9286a846d44 Mon Sep 17 00:00:00 2001 +From ecf6ace9d336fb53689481288783edd2a35db890 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 7 May 2015 15:35:43 +0100 Subject: [PATCH 36/71] rbp: Support zero copy interface with hevc acceleration @@ -47556,7 +47556,7 @@ index 29c4e6d15dd838cf845c301ea1a1f4c05db29871..864650d488d0f5b3dc9f89f01aa5c3b8 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 230f09818d9da2431dbe78d871cd399d3fc076d3 Mon Sep 17 00:00:00 2001 +From 7c8d2db0bc531fd6e3b3788abc451b54dc58ca59 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 16 May 2015 18:26:04 +0100 Subject: [PATCH 37/71] ffmpeg: use upstream mvc patches @@ -47869,7 +47869,7 @@ index 0000000000000000000000000000000000000000..b39480ad098b9cd0882fcf75b96afb1b +2.7.4 + -From 291ded31180aebdc4d6f06eab0ca1e0689b93dd5 Mon Sep 17 00:00:00 2001 +From ec064d0dd35e383c434da78be6e7e2dd701b5b01 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 20 Jan 2016 17:02:16 +0300 Subject: [PATCH 38/71] [VideoPlayer] DemuxFFmpeg: Properly demuxing h264_mvc @@ -47880,7 +47880,7 @@ Subject: [PATCH 38/71] [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 a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429753f4292 100644 +index b2f2268c6e92b38f2e17f4d1e99b4681413a27b4..d648bb31faace595818a7e5b507372e3bdf14eeb 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -25,6 +25,7 @@ @@ -47891,7 +47891,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 #include "DVDClock.h" // for DVD_TIME_BASE #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" -@@ -1305,6 +1306,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1306,6 +1307,15 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) } case AVMEDIA_TYPE_VIDEO: { @@ -47907,7 +47907,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); stream = st; if(strcmp(m_pFormatContext->iformat->name, "flv") == 0) -@@ -1313,7 +1323,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1314,7 +1324,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) st->bVFR = false; // never trust pts in avi files with h264. @@ -47916,7 +47916,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 st->bPTSInvalid = true; #if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE) -@@ -1384,6 +1394,17 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1385,6 +1395,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; @@ -47935,7 +47935,7 @@ index a992c9253911d53c0648a9dceff37054fb2c91d0..13a1576955fc68fbf344383a483f5429 } case AVMEDIA_TYPE_DATA: -From 8ea1fecf640ed032d5a52287166f6aa3a2992681 Mon Sep 17 00:00:00 2001 +From 558263b03a7fb773002a9b979f871acff4670063 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 25 Feb 2016 11:21:25 +0300 Subject: [PATCH 39/71] [Stereo3D] Added mvc modes. @@ -47992,7 +47992,7 @@ index 1443acaf0f25df458ae49766e13dd0323454f2eb..6eb0752994bc5f8c47efbbf211120af0 i++; } -From 4d3632e962c4444295fa7b4588b275785d7150dd Mon Sep 17 00:00:00 2001 +From 40af2076a7c8a476d48eb5fc6ee9b346b585e106 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 23 Jan 2016 10:21:32 +0300 Subject: [PATCH 40/71] [VideoPlayer] Fix possible wrong aspect. @@ -48002,7 +48002,7 @@ Subject: [PATCH 40/71] [VideoPlayer] Fix possible wrong aspect. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index 585b812a04d928ef493eb3cb3f8943fb33328a0e..064b3fffaa416786f1bac34d827af60ceceaa105 100644 +index f80c62ef56303bac91c4813f854c60985d3f812f..946518c7da7a7980052f98469c5726e8e7d55501 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp @@ -182,7 +182,7 @@ void CVideoPlayerVideo::OpenStream(CDVDStreamInfo &hint, CDVDVideoCodec* codec) @@ -48015,7 +48015,7 @@ index 585b812a04d928ef493eb3cb3f8943fb33328a0e..064b3fffaa416786f1bac34d827af60c else m_fForcedAspectRatio = 0.0; -From b6d1233dc2b1f894a5a6a8f84378f93fe44674d0 Mon Sep 17 00:00:00 2001 +From 96a5c710aae0495f75aef9a760353060e096a69c Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Fri, 22 Jan 2016 18:18:33 +0300 Subject: [PATCH 41/71] [VideoPlayer] DemuxFFmpeg: ssif remux @@ -48053,7 +48053,7 @@ index 63776b1333bb66483303e44d6ebe60f3cd7e14d7..0da129ff99f57dc38ca8a854854d9fe6 DVDDemuxUtils.h DVDDemuxVobsub.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b67c563c61 100644 +index d648bb31faace595818a7e5b507372e3bdf14eeb..ac2c9124426d5427e1103757ba9a755d6b2fd624 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -164,6 +164,7 @@ CDVDDemuxFFmpeg::CDVDDemuxFFmpeg() : CDVDDemux() @@ -48064,7 +48064,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 m_speed = DVD_PLAYSPEED_NORMAL; m_program = UINT_MAX; m_pkt.result = -1; -@@ -534,6 +535,8 @@ void CDVDDemuxFFmpeg::Dispose() +@@ -535,6 +536,8 @@ void CDVDDemuxFFmpeg::Dispose() m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48073,7 +48073,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 if (m_pFormatContext) { for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) -@@ -584,6 +587,9 @@ void CDVDDemuxFFmpeg::Flush() +@@ -585,6 +588,9 @@ void CDVDDemuxFFmpeg::Flush() m_displayTime = 0; m_dtsAtDisplayTime = DVD_NOPTS_VALUE; @@ -48083,7 +48083,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } void CDVDDemuxFFmpeg::Abort() -@@ -851,7 +857,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -852,7 +858,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { Flush(); } @@ -48094,7 +48094,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 { // update streams CreateStreams(m_program); -@@ -879,6 +887,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -880,6 +888,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48104,7 +48104,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } else { -@@ -888,7 +899,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -889,7 +900,9 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() if (IsVideoReady()) { @@ -48115,7 +48115,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 { /* check so packet belongs to selected program */ for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1037,6 +1050,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -1038,6 +1051,15 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() stream = AddStream(pPacket->iStreamId); } } @@ -48131,7 +48131,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 if (!stream) { CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::AddStream - internal error, stream is null"); -@@ -1066,6 +1088,9 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -1067,6 +1089,9 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48141,7 +48141,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime(); if (ist) { -@@ -1141,6 +1166,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) +@@ -1142,6 +1167,9 @@ bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) m_pkt.result = -1; av_packet_unref(&m_pkt.pkt); @@ -48151,7 +48151,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 return (ret >= 0); } -@@ -1308,11 +1336,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1309,11 +1337,12 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (pStream->codec->codec_id == AV_CODEC_ID_H264_MVC) { @@ -48167,7 +48167,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 break; } CDemuxStreamVideoFFmpeg* st = new CDemuxStreamVideoFFmpeg(this, pStream); -@@ -1398,7 +1427,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1399,7 +1428,11 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { if (CDVDCodecUtils::IsH264AnnexB(m_pFormatContext->iformat->name, pStream)) { @@ -48180,7 +48180,7 @@ index 13a1576955fc68fbf344383a483f5429753f4292..3e3884f7ce515709b74b687c53d538b6 } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) { -@@ -1491,7 +1524,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1492,7 +1525,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) if (langTag) strncpy(stream->language, langTag->value, 3); @@ -48452,7 +48452,7 @@ index 60e5652f69e96a559d8080e01dc214a56fb19343..cdaf53585a89a0da3a4038178806ee93 m_discStubExtensions = ".disc"; // internal music extensions -From 69a2451ec3a2b0962872adbc9738f5437800a677 Mon Sep 17 00:00:00 2001 +From c5d9b2d4efd4c615a4572749e85727b344acde75 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:01:08 +0300 Subject: [PATCH 42/71] [libbluray] bump libbluray to 0.9.2-mvc. @@ -48475,7 +48475,7 @@ index 4d1be9c2cb2bb0c9531413c7300342444df023e1..bc4913a3d0c1fcb7e27106a2ddd6988f libcec-3.1.0-win32-vc140.7z libfribidi-0.19.2-win32.7z -From 7287a367e7666c243fa603dd7e2001acffca171b Mon Sep 17 00:00:00 2001 +From c5a9af6e17d4bcfb07df6f99523a9331fc707b74 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Tue, 23 Feb 2016 16:02:46 +0300 Subject: [PATCH 43/71] [3DBD] Added support of 3D-BluRay playback. @@ -48556,7 +48556,7 @@ index 0da129ff99f57dc38ca8a854854d9fe658651e1f..82d4b499245afda1a51ca281584cc47f DVDDemuxPacket.h DVDDemuxUtils.h diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35ef0157b7 100644 +index ac2c9124426d5427e1103757ba9a755d6b2fd624..511b44b4682d204c43aa051ba62f7ea10a58b472 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -27,6 +27,7 @@ @@ -48567,7 +48567,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 #include "DVDDemuxUtils.h" #include "DVDInputStreams/DVDInputStream.h" #include "DVDInputStreams/DVDInputStreamFFmpeg.h" -@@ -494,6 +495,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein +@@ -495,6 +496,16 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein UpdateCurrentPTS(); @@ -48584,7 +48584,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 // in case of mpegts and we have not seen pat/pmt, defer creation of streams if (!skipCreateStreams || m_pFormatContext->nb_programs > 0) { -@@ -857,9 +868,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -858,9 +869,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() { Flush(); } @@ -48595,7 +48595,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 { // update streams CreateStreams(m_program); -@@ -900,8 +909,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -901,8 +910,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() if (IsVideoReady()) { // libavformat is confused by the interleaved SSIF. @@ -48605,7 +48605,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 { /* check so packet belongs to selected program */ for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++) -@@ -1052,10 +1060,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -1053,10 +1061,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() } if (stream && m_pSSIF) { @@ -48617,7 +48617,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 if (stream->type == STREAM_DATA && stream->codec == AV_CODEC_ID_H264_MVC && pPacket->iSize) stream = GetStream(pPacket->iStreamId); } -@@ -1431,6 +1436,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1432,6 +1437,29 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) { m_pSSIF->SetH264StreamId(streamIdx); pStream->codec->codec_tag = MKTAG('A', 'M', 'V', 'C'); @@ -48647,7 +48647,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 } } else if (CDVDCodecUtils::ProcessH264MVCExtradata(pStream->codec->extradata, pStream->codec->extradata_size)) -@@ -1691,6 +1719,12 @@ bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts) +@@ -1692,6 +1720,12 @@ bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts) } Flush(); @@ -48660,7 +48660,7 @@ index 3e3884f7ce515709b74b687c53d538b67c563c61..fe13ef199ed85fca52d2499beb9adb35 return true; } -@@ -1760,6 +1794,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) +@@ -1736,6 +1770,11 @@ std::string CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId) bool CDVDDemuxFFmpeg::IsProgramChange() { @@ -49477,7 +49477,7 @@ index b967a85e6557e42a7f1235cdd804d5a0263b866f..561fb5cd4f971bc9ee4f41218a60bb3d typedef std::shared_ptr SOverlay; typedef std::list SOverlays; -From 2b0355209b7c2215fb6e012e27fcd4e9e8605de8 Mon Sep 17 00:00:00 2001 +From 26a07cfcbdd19e30743c04ee30b08e2f6219261d Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Wed, 2 Mar 2016 23:31:50 +0300 Subject: [PATCH 44/71] [BaseRenderer] Fix aspect for TAB/SBS (need more @@ -49524,7 +49524,7 @@ index f9b3bfb4eb35eff3ef7af370136882bc733461e6..ab804ab0259992e4700e0ba99759c3f7 void CBaseRenderer::ManageRenderArea() -From a226f164edaaa8418574e47463b2701f4bb6392e Mon Sep 17 00:00:00 2001 +From 7cbfc3e33e6ea0513ad1321b80bbade1760df6b4 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 29 Feb 2016 17:00:50 +0000 Subject: [PATCH 45/71] libbluray: Bump to Nevcairie's v0.9.2 @@ -51184,7 +51184,7 @@ index 0000000000000000000000000000000000000000..5ef0124e35c9d81143921a328e272220 + + return fp; -From 6b8871642bc9b2efb81da42210120afb10fd8dc4 Mon Sep 17 00:00:00 2001 +From 6a6e521b5a8c0ba87b9704dd9aa10ae3896b69a2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 2 Mar 2016 19:40:47 +0000 Subject: [PATCH 46/71] [VideoPlayer] Added new msdk-mvc decoder. @@ -51303,7 +51303,7 @@ index 361c96623660305fc393273b1eaea4db096c417d..8ec50bbf79e9e163ccae25e30f3a40bf static AVPixelFormat PixfmtFromEFormat(ERenderFormat format); }; -From 856ea7cb4308e345aa6dc666980fb06d049dbd8a Mon Sep 17 00:00:00 2001 +From 25f77b57fba31fff99ecd9af8e0943d74ba83389 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 6 Mar 2016 12:54:59 +0000 Subject: [PATCH 47/71] mvc: Automatically enable stereo mode @@ -51364,7 +51364,7 @@ index 311dd6689236d660919c4c4483c51dca2752514a..536332c43e22ccb229e72b88518e54dd break; case AV_CODEC_ID_MPEG4: -From 591cd62dbfbdba89ae1f5a7e391a2f34d74e3c8a Mon Sep 17 00:00:00 2001 +From 3937828729ed7d4f48c3b8fa6b54d00299e32aa2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 24 Mar 2016 13:02:58 +0000 Subject: [PATCH 48/71] ffmpeg: mvc: fix for pixelation from packets with no @@ -51429,7 +51429,7 @@ index 46e7138e6906dc99d03c09b0f94340e23794be3a..d90cc23cfc391f2d289c7da6c69c6381 cd $(PLATFORM);\ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ -From 48406bdf3d2057116fd9a391486d970d92f9b4d4 Mon Sep 17 00:00:00 2001 +From 1d276f429465651312f03e96fc1d16c292a21318 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 9 Mar 2016 13:08:44 +0000 Subject: [PATCH 49/71] stereoscopicmanager: remove hardwarebased for rbp @@ -51454,7 +51454,7 @@ index 6eb0752994bc5f8c47efbbf211120af0a0720d0c..9426604f6460651f54cc035476e69530 { "mvc_rl", RENDER_STEREO_MODE_SPLIT_HORIZONTAL }, // fallback {} -From ef32201c7a49beedcca2a1fd02d3f893074a9193 Mon Sep 17 00:00:00 2001 +From 6a6175b80008d559b965ab8e31c2ced4f9c43203 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 17 May 2016 19:24:08 +0100 Subject: [PATCH 50/71] stereoscopics: Switch to using block_lr for mvc to @@ -51483,10 +51483,10 @@ index 38e7d44b7968039120b9821fd5b6b2d552edf3c1..654a927a0d4cbf877a3bb2616d62f46a break; case AV_CODEC_ID_H263: diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index fe13ef199ed85fca52d2499beb9adb35ef0157b7..69d0280960422f8fc02440af56a1479c637a20d6 100644 +index 511b44b4682d204c43aa051ba62f7ea10a58b472..ba7371221f06aeecacc5a68ed059b55276d752e4 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1443,7 +1443,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1444,7 +1444,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) CDVDInputStreamBluray *bluRay = static_cast(m_pInput); if (bluRay->HasMVC()) { @@ -51563,7 +51563,7 @@ index 9426604f6460651f54cc035476e69530b2ea8493..cc929b599125a44ac128713fd4331782 }; -From e58325d83422539ecb03019101041a5d3c28380d Mon Sep 17 00:00:00 2001 +From 3683605496df55d79f763aa98ce6201b05b66f46 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Thu, 10 Mar 2016 18:11:33 +0300 Subject: [PATCH 51/71] fixup! Revert supporting crappy tab/sbs subtitles. this @@ -51611,7 +51611,7 @@ index 3a080d06c90b0762482816928642e6de7810b539..7c0b70777556ac7694e7fc511cd4bb18 } -From c8c19254f80896ac722ee9db4ae193c087de28d7 Mon Sep 17 00:00:00 2001 +From d17055c05d41949c917e969aa4876a49cbed4bcc Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 10 Feb 2015 15:29:16 +0000 Subject: [PATCH 52/71] [libcec] Add repeating keypress patch from popcornmix' @@ -52501,7 +52501,7 @@ index 0000000000000000000000000000000000000000..8366a696562a934144cc9a21ea6f2cab +1.9.1 + -From f3f2a28705d3b1a49854484c33bae514bcd3285a Mon Sep 17 00:00:00 2001 +From 3e32144c1bbd9aabfe39e87a743971959954ff12 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 19 Mar 2016 17:15:29 +0000 Subject: [PATCH 53/71] cec: hack: pretend bump to 3.1.0 @@ -52552,25 +52552,26 @@ index 0000000000000000000000000000000000000000..9e55e51068e7befd9d4ff003156ce1ff + # cec-client + add_subdirectory(src/cec-client) -From 62a0036d62dc44945175e248d1e9dd32d68fe2a9 Mon Sep 17 00:00:00 2001 +From 08abeee53082011303685263203843929e364f61 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Oct 2014 00:19:40 +0000 Subject: [PATCH 54/71] [cec] Add settings for configuring button repeats --- - addons/resource.language.en_gb/resources/strings.po | 16 ++++++++++++++++ + addons/resource.language.en_gb/resources/strings.po | 15 +++++++++++++++ system/peripherals.xml | 4 +++- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 16 ++++++++++++++++ - 3 files changed, 35 insertions(+), 1 deletion(-) + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 06957078b9e69c6f05f31b6414aec04f420745b8..cccff927711eacdc01d5da065b03366627aac72f 100644 +index 45ee30ba64153eb4287e7cf0f2af6dd6553e9d26..c66858390045d010ab5d22bea362be03a8f48292 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -19613,6 +19613,22 @@ msgctxt "#39009" - msgid "Zoom - 110% width" +@@ -19690,3 +19690,18 @@ msgstr "" + msgctxt "#38206" + msgid "Max" msgstr "" - ++ +#: system/peripherals.xml +msgctxt "#38050" +msgid "Remote button press delay before repeating (ms)" @@ -52584,12 +52585,7 @@ index 06957078b9e69c6f05f31b6414aec04f420745b8..cccff927711eacdc01d5da065b033666 +#: system/peripherals.xml +msgctxt "#38052" +msgid "Remote button press release time (ms)" -+>>>>>>> [cec] Add settings for configuring button repeats +msgstr "" -+ - msgctxt "#38190" - msgid "Extract thumbnails from video files" - msgstr "" diff --git a/system/peripherals.xml b/system/peripherals.xml index f939c0b685d96d022856544e7eb31a71338d9ba4..a4b8f7add4d915c1749628d62a9cbe9afe97d063 100644 --- a/system/peripherals.xml @@ -52640,7 +52636,7 @@ index e6bcbce6911a1714e129ecd5aceead94769231f4..19b3c37bc18fcab30920b12902e8c339 if (GetSettingBool("pause_playback_on_deactivate")) { -From db144767d69fa200c8e356176fc0422676548b21 Mon Sep 17 00:00:00 2001 +From 6e00438089530706a2707ce168d95d95bf319f7d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 3 Nov 2014 23:17:46 +0000 Subject: [PATCH 55/71] [cec] Don't discard buttons when repeat mode is enabled @@ -52666,7 +52662,7 @@ index 19b3c37bc18fcab30920b12902e8c3397a69dccc..f859f44f6d5379154317b5760d7df720 if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0) { -From faf68aec33ecc06ab9c9bfef0fc2999bab7e3355 Mon Sep 17 00:00:00 2001 +From 3ead9831955410d3d750a70457802e8bd33d73d9 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 4 Nov 2014 18:50:00 +0000 Subject: [PATCH 56/71] [cec] Temp - more logging @@ -52721,7 +52717,7 @@ index f859f44f6d5379154317b5760d7df720f0894e0d..f1c3a6d242183507c4ce9ebf4651b0c0 } -From e88a50bca552f15ac191b469ed00d83091d24dcf Mon Sep 17 00:00:00 2001 +From 4420f962ccbef459efc7adbabbc6b940d04c1fd2 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 22 Jan 2016 12:29:41 +0000 Subject: [PATCH 57/71] [cec] Update for libcec 3.1.0 @@ -52732,7 +52728,7 @@ Subject: [PATCH 57/71] [cec] Update for libcec 3.1.0 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index acf4ce64745096e92106c814b15d35ecd82f7d7e..b5a8f8c9154f52842b9bdea3d492217e31921009 100644 +index 6a8b4a26a5d150e2965441798b178644cdfabba4..e99d80720f6c74346b77fcca1da017635bfb25c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1447,9 +1447,9 @@ if test "x$use_libcec" != "xno"; then @@ -52770,7 +52766,7 @@ index f1c3a6d242183507c4ce9ebf4651b0c0f7e9c5c9..28a6a8148810da940f977976a627018c // device name 'XBMC' snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); -From d6b3fe6d908bca5886a02c4e77ca6aa76f3bf833 Mon Sep 17 00:00:00 2001 +From ea618c200f3b79644bb630ad9228bea0df3be14d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 19 Mar 2016 14:46:41 +0000 Subject: [PATCH 58/71] libcec: use system audio mode request instead of power @@ -52839,7 +52835,7 @@ index 39ba882d0c7e270b4d1d1d566027cbaffb76b587..4565dc9f6fc0b3e6b49133443c19e107 $(LIBDYLIB): $(PLATFORM) -From b13389f100d417c231773a23bbcd7c9b7d4d573c Mon Sep 17 00:00:00 2001 +From 7e25a34208ce3e6d8f27a2bce29c1fa49e9d387a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 22 Mar 2016 09:51:52 +0100 Subject: [PATCH 59/71] python: use kodi provided cert if available @@ -52866,7 +52862,7 @@ index bc84af9411ef55eaf5ba71a320b5cbfec5f49548..ff4ed7db26845905108ea0ae504e4f58 PyEval_AcquireLock(); else -From adfe64cdeb57a473da590679102875dc6135e678 Mon Sep 17 00:00:00 2001 +From 5e2703cf3297145ce88ece33c54de5f9c337ec51 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 25 May 2016 18:31:17 +0100 Subject: [PATCH 60/71] rbp: Hard code the number of buffers to improve audio @@ -52895,7 +52891,7 @@ index 2572e25753712186f69390965ee1448bff3fadd5..5d9f716bac49f9850f1062a4d5ac8517 diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 4784843a2aa247a94fb6e9e1463c000ff178a3e9..4736ca7555bf7c539b0140ddba52c8e3e77f5993 100644 +index 9160a9b90319d64f102aa869f2d9065362c240f9..e03af0cd4dfbcf67b728b5ad26d912e4c098b109 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp @@ -1047,7 +1047,11 @@ void CRenderManager::UpdateDisplayLatency() @@ -52911,7 +52907,7 @@ index 4784843a2aa247a94fb6e9e1463c000ff178a3e9..4736ca7555bf7c539b0140ddba52c8e3 } -From 123628fd61cead13de60aa1c1a97a31bd3f208ea Mon Sep 17 00:00:00 2001 +From da39a1c8163325532ac99e3630244e0220145216 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 4 Jul 2016 18:30:03 +0100 Subject: [PATCH 61/71] rbp: Update the GL libs to new naming scheme @@ -52928,7 +52924,7 @@ will be dropped at some point 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index b5a8f8c9154f52842b9bdea3d492217e31921009..6bc106af98901b145223614586e35dd6d453fe58 100644 +index e99d80720f6c74346b77fcca1da017635bfb25c8..4f5486fb33f95338bc668437a605d552df3c8054 100644 --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ if test "$use_gles" = "yes"; then @@ -52966,10 +52962,10 @@ index ab06f968b3e314fca1ae001139f687dce9a5098b..87f1faa248b91a2e50758b23c0b9e5b0 else() find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac -index fb0bd6dad18199e8893c38644f93659bf0a3f61b..010288dc5de74380fc3795d00dbd99847cf2ed3e 100644 +index 9c8ddade7b7a20e072ddd41a3465ab6e1678b20d..4d728508ce5c18789c50a60dd302deb8c1b8f99d 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac -@@ -390,7 +390,7 @@ if test "$target_platform" = "raspberry-pi" ; then +@@ -391,7 +391,7 @@ if test "$target_platform" = "raspberry-pi" ; then -isystem${use_firmware}/opt/vc/include \ -isystem${use_firmware}/opt/vc/include/interface/vcos/pthreads \ -isystem${use_firmware}/opt/vc/include/interface/vmcs_host/linux" @@ -52979,7 +52975,7 @@ index fb0bd6dad18199e8893c38644f93659bf0a3f61b..010288dc5de74380fc3795d00dbd9984 fi -From 9cf271e1c31a1167adad27c81728ce55d36ae2e1 Mon Sep 17 00:00:00 2001 +From 0063738ac14e696f44c0709a608ef6555fed0b47 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Thu, 21 Apr 2016 16:49:02 +0100 Subject: [PATCH 62/71] Revert "[settings] remove show EXIF picture information @@ -52987,50 +52983,42 @@ Subject: [PATCH 62/71] Revert "[settings] remove show EXIF picture information This reverts commit e7d90188436b6966eff23fd695e1a9d18f4af1b4. --- - addons/resource.language.en_gb/resources/strings.po | 11 ++++++++++- + addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++ system/settings/settings.xml | 5 +++++ xbmc/pictures/GUIWindowPictures.cpp | 2 +- xbmc/pictures/PictureInfoLoader.cpp | 8 ++++++-- xbmc/pictures/PictureInfoLoader.h | 1 + xbmc/settings/Settings.cpp | 1 + xbmc/settings/Settings.h | 1 + - 7 files changed, 25 insertions(+), 4 deletions(-) + 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index cccff927711eacdc01d5da065b03366627aac72f..4afeb2bd7d575849a92177d7d08ba7e3dd44893c 100644 +index c66858390045d010ab5d22bea362be03a8f48292..622b491a999a84c90420ceb974cb8db238d14a7d 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po -@@ -17576,7 +17576,11 @@ msgctxt "#36305" - msgid "This category contains the settings for how picture file lists are handled." - msgstr "" - --#empty string with id 36306 -+#. Description of setting "Pictures -> Show EXIF picture information" with label #38207 -+#: system/settings/settings.xml -+msgctxt "#36306" -+msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed." -+msgstr "" - - #. Description of setting with label #13360 "Automatically generate thumbnails" - #: system/settings/settings.xml -@@ -19664,3 +19668,8 @@ msgstr "" - msgctxt "#38206" - msgid "Max" +@@ -19705,3 +19705,13 @@ msgstr "" + msgctxt "#38052" + msgid "Remote button press release time (ms)" msgstr "" + ++#. Description of setting "Pictures -> Show EXIF picture information" with label #38207 +#: system/settings/settings.xml +msgctxt "#38207" +msgid "Show EXIF picture information" +msgstr "" ++ ++msgctxt "#38208" ++msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed." ++msgstr "" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 1860d972c0afd541337b3e1e0c3e2d006d67a44c..aa252f074cfae2ef06dbb3cf539c68a8ab7dfacc 100644 +index 52dfd4e3e261388a5fe0f6997e62b906ccfa007a..c02b2d727283cdfbc6d64124404f93c21f7f3b3d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1180,6 +1180,11 @@ -+ ++ + 0 + true + @@ -53039,15 +53027,15 @@ index 1860d972c0afd541337b3e1e0c3e2d006d67a44c..aa252f074cfae2ef06dbb3cf539c68a8 0 true diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp -index 2197079c0d02dc80bd87ccff4c1f0f14f1ed89ef..d798bc0c774bf8e6b54f694356d9afbe32719875 100644 +index c68371900dd42a154220e440266a45a7b2ab3118..653942232843ed0fc6c54c8bc405852797da6605 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp -@@ -208,7 +208,7 @@ void CGUIWindowPictures::OnPrepareFileItems(CFileItemList& items) +@@ -203,7 +203,7 @@ void CGUIWindowPictures::OnPrepareFileItems(CFileItemList& items) if (StringUtils::EqualsNoCase(items[i]->GetLabel(), "folder.jpg")) items.Remove(i); - if (items.GetFolderCount() == items.Size()) -+ if (items.GetFolderCount()==items.Size() || !CSettings::GetInstance().GetBool(CSettings::SETTING_PICTURES_USETAGS)) ++ if (items.GetFolderCount() == items.Size() || !CSettings::GetInstance().GetBool(CSettings::SETTING_PICTURES_USETAGS)) return; // Start the music info loader thread @@ -53113,7 +53101,7 @@ index 0829f6b15207bf0b8f2e4a699600b46427fe6267..432a23ce6b501fa4f3fad1f4ecff9f19 static const std::string SETTING_PICTURES_SHOWVIDEOS; static const std::string SETTING_PICTURES_DISPLAYRESOLUTION; -From 71d1cd85857b6ceea80b091925eba6c88aedc44c Mon Sep 17 00:00:00 2001 +From 44c44f0491ac34ac0d7212162175bfd09b69c09d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 28 Jun 2016 14:46:01 +0100 Subject: [PATCH 63/71] ffmpeg: hacky fix for files with GMC @@ -53123,10 +53111,10 @@ Subject: [PATCH 63/71] ffmpeg: hacky fix for files with GMC 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 69d0280960422f8fc02440af56a1479c637a20d6..ea549e9532d79e8d8dab6eb4bda40c01a7314c74 100644 +index ba7371221f06aeecacc5a68ed059b55276d752e4..952498322e789364462f68f168ac9ac197f3dd8c 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1409,8 +1409,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) +@@ -1410,8 +1410,8 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx) stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata); if (!stereoMode.empty()) st->stereo_mode = stereoMode; @@ -53138,7 +53126,7 @@ index 69d0280960422f8fc02440af56a1479c637a20d6..ea549e9532d79e8d8dab6eb4bda40c01 { if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) -From af4a5c7ed6c85edbbe657a54b9b3072654db9a06 Mon Sep 17 00:00:00 2001 +From d1c4f771b5608a853d5f1b96da0ee095c7425148 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 19 Jul 2016 20:39:18 +0100 Subject: [PATCH 64/71] mmalrender: Add sharpness control @@ -53150,7 +53138,7 @@ Subject: [PATCH 64/71] mmalrender: Add sharpness control 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 4afeb2bd7d575849a92177d7d08ba7e3dd44893c..aeec35199ce0177aab1f9e14adf0efd58674edca 100644 +index 622b491a999a84c90420ceb974cb8db238d14a7d..d88ae3626dca2f86e7aa28ed62ae319aa3e0148a 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -8691,7 +8691,7 @@ msgstr "" @@ -53213,7 +53201,7 @@ index a056a25f4f74fc6be023404286e044dac9d8ca7c..5d3baa6534a2fe449990402ab805d844 CCriticalSection m_sharedSection; MMAL_COMPONENT_T *m_vout; -From a834ab29c450ede991a7e9b5d5052caa4ed521cf Mon Sep 17 00:00:00 2001 +From cc99de7db0c2b2a9c48a923d3dea91194e68f30f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 26 Jul 2016 19:00:03 +0100 Subject: [PATCH 65/71] rbp: Ensure processinfo values are initialised @@ -53260,7 +53248,7 @@ index f54f53a3b18fd2baf9c696b76f6ff0a6c1a9da5c..e653f1a37a275f61698969bb2f79f6e4 CLog::Log(LOGDEBUG,"%s - change configuration. video:%dx%d. framerate: %4.2f. %dx%d format: BYPASS", __FUNCTION__, video_width, video_height, m_fFrameRate, iDisplayWidth, iDisplayHeight); -From 2f68203988b0e977a9d6e269c22d7b6103845164 Mon Sep 17 00:00:00 2001 +From c6d8d9bf6467a2730a4c02b408a4c5921924a3b1 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 16 Sep 2016 15:37:07 +0100 Subject: [PATCH 66/71] MMAL: Indicate when picture came from still frame so @@ -53274,12 +53262,12 @@ linked list pointers), so the simple solution is to switch to the simpler deinterlace that does not require context for stills. --- xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 3 +-- + xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp | 4 ++-- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h | 1 + - xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 3 ++- + xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp | 4 +++- xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h | 3 ++- .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp | 10 ++++++++++ - 6 files changed, 17 insertions(+), 5 deletions(-) + 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 63df72700298c881107a3992c0eef893ae85f512..539882db7694e653df1d2caa5eaa955add0d7b71 100644 @@ -53295,10 +53283,18 @@ index 63df72700298c881107a3992c0eef893ae85f512..539882db7694e653df1d2caa5eaa955a { ctx->m_processInfo.SetVideoPixelFormat(pixFmtName ? pixFmtName : ""); diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..52ffb18370e590a73b9e484ae1d6dd35106e1785 100644 +index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..1cb76f65a24bf46fe4e3fc1f54e99f284672d80b 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -258,8 +258,6 @@ void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf +@@ -71,6 +71,7 @@ CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr p + m_encoding = MMAL_ENCODING_UNKNOWN; + m_aspect_ratio = 0.0f; + m_rendered = false; ++ m_stills = false; + } + + CMMALVideoBuffer::~CMMALVideoBuffer() +@@ -258,8 +259,6 @@ void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf omvb->m_aligned_width = m_decoded_aligned_width; omvb->m_aligned_height = m_decoded_aligned_height; omvb->m_aspect_ratio = m_aspect_ratio; @@ -53307,7 +53303,7 @@ index 2c5144c44403de9d8ddea7cfbb0c7f8356b81784..52ffb18370e590a73b9e484ae1d6dd35 omvb->m_encoding = m_dec_output->format->encoding; { CSingleLock lock(m_output_mutex); -@@ -841,6 +839,7 @@ bool CMMALVideo::GetPicture(DVDVideoPicture* pDvdVideoPicture) +@@ -841,6 +840,7 @@ bool CMMALVideo::GetPicture(DVDVideoPicture* pDvdVideoPicture) pDvdVideoPicture->iFlags, buffer->mmal_buffer->flags, pDvdVideoPicture->MMALBuffer, pDvdVideoPicture->MMALBuffer->mmal_buffer); assert(!(buffer->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_DECODEONLY)); buffer->mmal_buffer->flags &= ~MMAL_BUFFER_HEADER_FLAG_USER3; @@ -53328,10 +53324,18 @@ index d39dc1ded1511e08556ed1129f58b23df9b1dbdd..1b21fe1a8a26c80dfb83a0af5a6ebd5c static const char *names[] = { "MMALStateNone", "MMALStateHWDec", "MMALStateFFDec", "MMALStateDeint", }; if ((size_t)m_state < vcos_countof(names)) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..2bbcd549d4713b9594209c2fd9071767a9df1c88 100644 +index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..244dced9d7d5c4a9006a2e5a6d27f80fdf0f497a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -93,7 +93,7 @@ CMMALYUVBuffer::~CMMALYUVBuffer() +@@ -54,6 +54,7 @@ CMMALYUVBuffer::CMMALYUVBuffer(std::shared_ptr pool, uint32_t mmal_en + m_aspect_ratio = 0.0f; + mmal_buffer = nullptr; + m_rendered = false; ++ m_stills = false; + if (m_encoding == MMAL_ENCODING_I420) + size_pic = (m_aligned_width * m_aligned_height * 3) >> 1; + else if (m_encoding == MMAL_ENCODING_YUVUV128) +@@ -93,7 +94,7 @@ CMMALYUVBuffer::~CMMALYUVBuffer() #undef CLASSNAME #define CLASSNAME "CDecoder" @@ -53340,7 +53344,7 @@ index 864650d488d0f5b3dc9f89f01aa5c3b845b92564..2bbcd549d4713b9594209c2fd9071767 { if (g_advancedSettings.CanLogComponent(LOGVIDEO)) CLog::Log(LOGDEBUG, "%s::%s - create %p", CLASSNAME, __FUNCTION__, this); -@@ -289,6 +289,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture +@@ -289,6 +290,7 @@ bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture assert(picture->MMALBuffer->mmal_buffer); picture->MMALBuffer->mmal_buffer->data = (uint8_t *)gmem->m_vc_handle; picture->MMALBuffer->mmal_buffer->alloc_size = picture->MMALBuffer->mmal_buffer->length = gmem->m_numbytes; @@ -53391,7 +53395,7 @@ index a0104d9ff67402e74ea8076dd47e9e9bd11a74f1..2f9af729c26f81327a666a59a90f707e if (!g_graphicsContext.IsFullScreenVideo()) { -From 17b44c9a40d8ed81fc9dd7ba3914d5a6488fa8b6 Mon Sep 17 00:00:00 2001 +From 5030873f7ff40eaf7bddd1948cf9b832d1881438 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 15:19:02 +0100 Subject: [PATCH 67/71] MMAL: Move pool into base class @@ -53404,7 +53408,7 @@ Subject: [PATCH 67/71] MMAL: Move pool into base class 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 52ffb18370e590a73b9e484ae1d6dd35106e1785..120618a873965186817c726c8e67403e30e5b7fe 100644 +index 1cb76f65a24bf46fe4e3fc1f54e99f284672d80b..d62539aed69306a682d8dc68e410cf7b4a1d6594 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -59,7 +59,7 @@ using namespace KODI::MESSAGING; @@ -53464,7 +53468,7 @@ index 1b21fe1a8a26c80dfb83a0af5a6ebd5c9cae42ca..5c741d340d19b3765f96434ceb54745e class CMMALVideo : public CDVDVideoCodec diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 2bbcd549d4713b9594209c2fd9071767a9df1c88..3e3adbba41e43b2b63bb2765cb4ec2a49cebab92 100644 +index 244dced9d7d5c4a9006a2e5a6d27f80fdf0f497a..b0db2746b6eb51b2222e8f2813b1eb14ff120a2e 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp @@ -43,7 +43,7 @@ using namespace MMAL; @@ -53489,7 +53493,7 @@ index 60aff83a3e55f11313d0d9186212e9badbb6d52e..20eab3bed39fa11bd1454f6c6decd4ec class CDecoder -From 6665c4c5ebf015ac7a90c2759175bb746607b23a Mon Sep 17 00:00:00 2001 +From 6297a1f607bfcb2fae0e05af8c8b2b7b91ec9b3b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 16:20:30 +0100 Subject: [PATCH 68/71] MMAL: Make setting the decoder more consistent between @@ -53503,7 +53507,7 @@ Subject: [PATCH 68/71] MMAL: Make setting the decoder more consistent between 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index 3e3adbba41e43b2b63bb2765cb4ec2a49cebab92..dc7d97505e95dff2071c5fc85f6004690b3aac00 100644 +index b0db2746b6eb51b2222e8f2813b1eb14ff120a2e..f20305acaf0ca73a928bc0927129f384c642474a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp @@ -42,8 +42,8 @@ using namespace MMAL; @@ -53517,7 +53521,7 @@ index 3e3adbba41e43b2b63bb2765cb4ec2a49cebab92..dc7d97505e95dff2071c5fc85f600469 { uint32_t size_pic = 0; m_width = width; -@@ -243,6 +243,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel +@@ -244,6 +244,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel CLog::Log(LOGERROR, "%s::%s Failed to create pool for decoder output", CLASSNAME, __func__); return false; } @@ -53603,7 +53607,7 @@ index 5d3baa6534a2fe449990402ab805d84423fbc636..b7a61eab678f8aedeff96795c9ba3a06 class CMMALRenderer : public CBaseRenderer, public CThread, public IRunnable -From 7f02d82595b80eed6c9c32f3dba6672e65b1513a Mon Sep 17 00:00:00 2001 +From e7eaba9534259eb067272938f849be91cbded991 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 16:32:45 +0100 Subject: [PATCH 69/71] MMAL: Set processInfo in pool @@ -53616,10 +53620,10 @@ Subject: [PATCH 69/71] MMAL: Set processInfo in pool 4 files changed, 5 insertions(+) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 120618a873965186817c726c8e67403e30e5b7fe..422b709a4929d119a2d550433221867149306c0d 100644 +index d62539aed69306a682d8dc68e410cf7b4a1d6594..c65fc524273f2b6cc40cf6ff8e8beb8d0bc38440 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -@@ -480,6 +480,7 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) +@@ -481,6 +481,7 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) return false; } m_pool->SetDecoder(this); @@ -53628,10 +53632,10 @@ index 120618a873965186817c726c8e67403e30e5b7fe..422b709a4929d119a2d5504332218671 m_dec->control->userdata = (struct MMAL_PORT_USERDATA_T *)this; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -index dc7d97505e95dff2071c5fc85f6004690b3aac00..2fb4921c5c9ac726f60db5bd575ad5a402267e92 100644 +index f20305acaf0ca73a928bc0927129f384c642474a..d42e3090c9b38a43ee72fdc3780a244317ece11a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp -@@ -244,6 +244,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel +@@ -245,6 +245,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixel return false; } m_pool->SetDecoder(this); @@ -53672,7 +53676,7 @@ index b7a61eab678f8aedeff96795c9ba3a06157bb88d..b7621a8cf37907d544987b06dd4528ee class CMMALRenderer : public CBaseRenderer, public CThread, public IRunnable -From 322a328c70be40d7efc0b95fdca816a94a765cb9 Mon Sep 17 00:00:00 2001 +From 7201b3b43f2c3468bd8c158289611bc546264534 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 18 Sep 2016 18:35:55 +0100 Subject: [PATCH 70/71] MMAL: Report deinterlace method to processinfo overlay @@ -53685,7 +53689,7 @@ Subject: [PATCH 70/71] MMAL: Report deinterlace method to processinfo overlay 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp -index 422b709a4929d119a2d550433221867149306c0d..900f74b78c0d5fe45f7ebf338a854c48085573ea 100644 +index c65fc524273f2b6cc40cf6ff8e8beb8d0bc38440..1aca23f755ce273ca1e5e4ffdd8be02897e2304a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp @@ -57,6 +57,7 @@ using namespace KODI::MESSAGING; @@ -53696,7 +53700,7 @@ index 422b709a4929d119a2d550433221867149306c0d..900f74b78c0d5fe45f7ebf338a854c48 CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv, std::shared_ptr pool) : CMMALBuffer(pool), m_omv(omv) -@@ -375,8 +376,6 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) +@@ -376,8 +377,6 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) if (hints.workaround_bugs & FF_BUG_GMC_UNSUPPORTED) return false; @@ -53774,7 +53778,7 @@ index b7621a8cf37907d544987b06dd4528eed468abc0..5758deba4d5d30662507968ac7af0fb0 uint32_t m_mmal_format, m_width, m_height, m_aligned_width, m_aligned_height, m_size; AVCodecContext *m_avctx; -From 74733937597c92d832b8088a377d719d6643d749 Mon Sep 17 00:00:00 2001 +From 204ea8e03c62d18ba2c9793c63d289346678a082 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Mon, 19 Sep 2016 19:56:07 +0100 Subject: [PATCH 71/71] MMALRenderer: Ensure updated aspect ratio is seen in