Skip to content
This repository has been archived by the owner on Mar 26, 2019. It is now read-only.

Commit

Permalink
projects/Amlogic: add a few aml-specific patches from https://github.…
Browse files Browse the repository at this point in the history
…com/koying/SPMC and a patch from https://github.com/osmc/osmc to prevent some hangs on reboot
  • Loading branch information
kszaq committed Mar 20, 2016
1 parent e716b3b commit dced795
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 8db4fb5d2ad598b70b4c354a54c268c90f9754b0 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <[email protected]>
Date: Sat, 2 Jan 2016 11:52:49 +0100
Subject: [PATCH] FIX: [aml] lower packet write retry sleep to 5ms

---
xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
index fad5fb7..d2aa6a1 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
@@ -257,7 +257,7 @@ class DllLibAmCodec : public DllDynamic, DllLibamCodecInterface
#define CODEC_TAG_jpeg (0x6765706a)
#define CODEC_TAG_mjpa (0x61706a6d)

-#define RW_WAIT_TIME (20 * 1000) // 20ms
+#define RW_WAIT_TIME (5 * 1000) // 20ms

#define P_PRE (0x02000000)
#define F_PRE (0x03000000)
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From bce806c94e52c8687eb90e5267d8281c0c712f27 Mon Sep 17 00:00:00 2001
From: Sam Nazarko <[email protected]>
Date: Sun, 13 Dec 2015 18:13:10 +0000
Subject: [PATCH] Do not try and stop scripts if we are going to reboot or
shutdown. There is a significant chance with some addons that we will see a
hang

Signed-off-by: Sam Nazarko <[email protected]>
---
xbmc/Application.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index bf7932e..91a9060 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -3018,7 +3018,8 @@ void CApplication::Stop(int exitCode)
// stop all remaining scripts; must be done after skin has been unloaded,
// not before some windows still need it when deinitializing during skin
// unloading
- CScriptInvocationManager::GetInstance().Uninitialize();
+ if (m_ExitCode == EXITCODE_QUIT)
+ CScriptInvocationManager::GetInstance().Uninitialize();

g_Windowing.DestroyRenderSystem();
g_Windowing.DestroyWindow();
--
2.1.0

0 comments on commit dced795

Please sign in to comment.