From dbfc878a1125953caed93444e694a61a54a9efcd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 28 Mar 2015 12:06:39 +0100 Subject: [PATCH] projects/imx6/patches/kodi: update imx6 patches Signed-off-by: Stephan Raue --- ...d-tempfix-firstflippage-did-not-work.patch | 8 ++--- ...-flag-in-teletext-dialog-if-required.patch | 4 +-- ...-rendering-to-gui-and-separate-video.patch | 16 ++++----- ...trol-dirty-when-setting-to-invisible.patch | 4 +-- ...x-lock-when-waiting-for-present-time.patch | 4 +-- ...uence-from-WaitFrame-Render-FrameMov.patch | 10 +++--- ...hevc-function-and-recognize-S812-chi.patch | 4 +-- ...xtract-SysfsUtils-from-the-AML-utils.patch | 4 +-- ...ed-mode-change-after-SysfsUtils-port.patch | 4 +-- ...erlacing-method-enumerations-FAST_MO.patch | 4 +-- ...eserve-field-type-for-Renderer-Rende.patch | 4 +-- ...eo-decoding-and-rendering-see-http-f.patch | 4 +-- ...ndercapture-for-latest-rendering-re.patch} | 10 +++--- ...fractional-modes-picked-from-rabeeh.patch} | 12 +++---- ...tput-associated-pts-for-TRACE_FRAMES.patch | 24 +++++++++++++ ...-guard-to-fix-build-on-non-iMX6-arch.patch | 34 +++++++++++++++++++ 16 files changed, 104 insertions(+), 46 deletions(-) rename projects/imx6/patches/kodi/{kodi-13-implemented-rendercapture-for-latest-rendering-rework.patch => kodi-13-iMX6-Implement-rendercapture-for-latest-rendering-re.patch} (99%) rename projects/imx6/patches/kodi/{kodi-14-prepare-for-fractional-modes-rabeeh.patch => kodi-14-IMX-Prepare-for-fractional-modes-picked-from-rabeeh.patch} (82%) create mode 100644 projects/imx6/patches/kodi/kodi-15-imx-Output-associated-pts-for-TRACE_FRAMES.patch create mode 100644 projects/imx6/patches/kodi/kodi-16-Add-guard-to-fix-build-on-non-iMX6-arch.patch diff --git a/projects/imx6/patches/kodi/kodi-01-renderer-drop-old-tempfix-firstflippage-did-not-work.patch b/projects/imx6/patches/kodi/kodi-01-renderer-drop-old-tempfix-firstflippage-did-not-work.patch index 7d48ebda12..64d43df6c8 100644 --- a/projects/imx6/patches/kodi/kodi-01-renderer-drop-old-tempfix-firstflippage-did-not-work.patch +++ b/projects/imx6/patches/kodi/kodi-01-renderer-drop-old-tempfix-firstflippage-did-not-work.patch @@ -1,7 +1,7 @@ -From 1a49d401ee7c0ce645c8ee49a8f91aeb8b9cff4c Mon Sep 17 00:00:00 2001 +From 9ed9dcc8a30bbaf9e23dd8a738ec33824e9f7503 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 2 Jan 2015 10:02:09 +0100 -Subject: [PATCH 01/12] renderer: drop old tempfix firstflippage, did not work +Subject: [PATCH 01/16] renderer: drop old tempfix firstflippage, did not work anyway because RendererHandlesPresent returned always true --- @@ -12,10 +12,10 @@ Subject: [PATCH 01/12] renderer: drop old tempfix firstflippage, did not work 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 4a5619a..aa7aed0 100644 +index 5425322..69760da 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2222,7 +2222,7 @@ void CApplication::Render() +@@ -2227,7 +2227,7 @@ void CApplication::Render() bool extPlayerActive = m_pPlayer->GetCurrentPlayer() == EPC_EXTPLAYER && m_pPlayer->IsPlaying() && !m_AppFocused; m_bPresentFrame = false; diff --git a/projects/imx6/patches/kodi/kodi-02-Set-dirty-flag-in-teletext-dialog-if-required.patch b/projects/imx6/patches/kodi/kodi-02-Set-dirty-flag-in-teletext-dialog-if-required.patch index aa43dcf408..ce619c7b2d 100644 --- a/projects/imx6/patches/kodi/kodi-02-Set-dirty-flag-in-teletext-dialog-if-required.patch +++ b/projects/imx6/patches/kodi/kodi-02-Set-dirty-flag-in-teletext-dialog-if-required.patch @@ -1,7 +1,7 @@ -From 8627cb27e5771bb2d6da37c295f99b174cad4be9 Mon Sep 17 00:00:00 2001 +From 5c961dd12ad9e7949777e7140636c173924b3523 Mon Sep 17 00:00:00 2001 From: smallint Date: Fri, 2 Jan 2015 15:35:33 +0000 -Subject: [PATCH 02/12] Set dirty flag in teletext dialog if required +Subject: [PATCH 02/16] Set dirty flag in teletext dialog if required --- xbmc/video/dialogs/GUIDialogTeletext.cpp | 19 +++++++++++++++++++ diff --git a/projects/imx6/patches/kodi/kodi-03-renderer-improve-rendering-to-gui-and-separate-video.patch b/projects/imx6/patches/kodi/kodi-03-renderer-improve-rendering-to-gui-and-separate-video.patch index ad7df61bab..7939a0a9cd 100644 --- a/projects/imx6/patches/kodi/kodi-03-renderer-improve-rendering-to-gui-and-separate-video.patch +++ b/projects/imx6/patches/kodi/kodi-03-renderer-improve-rendering-to-gui-and-separate-video.patch @@ -1,7 +1,7 @@ -From f275a6996031d2226d0c3bc5e1f3ef04e21cd2fe Mon Sep 17 00:00:00 2001 +From 33dc66131f501609f2a50db217e0810ef9f876ac Mon Sep 17 00:00:00 2001 From: smallint Date: Sat, 16 Aug 2014 17:29:15 +0200 -Subject: [PATCH 03/12] renderer: improve rendering to gui and separate video +Subject: [PATCH 03/16] renderer: improve rendering to gui and separate video layer --- @@ -27,10 +27,10 @@ Subject: [PATCH 03/12] renderer: improve rendering to gui and separate video 19 files changed, 204 insertions(+), 62 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index aa7aed0..3a222d4 100644 +index 69760da..bc33a79 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2170,9 +2170,6 @@ bool CApplication::RenderNoPresent() +@@ -2175,9 +2175,6 @@ bool CApplication::RenderNoPresent() // dont show GUI when playing full screen video if (g_graphicsContext.IsFullScreenVideo()) { @@ -40,7 +40,7 @@ index aa7aed0..3a222d4 100644 // close window overlays CGUIDialog *overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_OVERLAY); if (overlay) overlay->Close(true); -@@ -2225,7 +2222,6 @@ void CApplication::Render() +@@ -2230,7 +2227,6 @@ void CApplication::Render() if (!extPlayerActive && g_graphicsContext.IsFullScreenVideo() && !m_pPlayer->IsPausedPlayback()) { m_bPresentFrame = g_renderManager.FrameWait(100); @@ -48,7 +48,7 @@ index aa7aed0..3a222d4 100644 } else { -@@ -2268,8 +2264,6 @@ void CApplication::Render() +@@ -2273,8 +2269,6 @@ void CApplication::Render() if(!g_Windowing.BeginRender()) return; @@ -57,7 +57,7 @@ index aa7aed0..3a222d4 100644 CDirtyRegionList dirtyRegions = g_windowManager.GetDirty(); if(g_graphicsContext.GetStereoMode()) { -@@ -2291,8 +2285,6 @@ void CApplication::Render() +@@ -2296,8 +2290,6 @@ void CApplication::Render() hasRendered = true; } @@ -66,7 +66,7 @@ index aa7aed0..3a222d4 100644 g_Windowing.EndRender(); // execute post rendering actions (finalize window closing) -@@ -2317,7 +2309,7 @@ void CApplication::Render() +@@ -2322,7 +2314,7 @@ void CApplication::Render() flip = true; //fps limiter, make sure each frame lasts at least singleFrameTime milliseconds diff --git a/projects/imx6/patches/kodi/kodi-04-guilib-mark-control-dirty-when-setting-to-invisible.patch b/projects/imx6/patches/kodi/kodi-04-guilib-mark-control-dirty-when-setting-to-invisible.patch index f0c39870b0..2a871c0ad2 100644 --- a/projects/imx6/patches/kodi/kodi-04-guilib-mark-control-dirty-when-setting-to-invisible.patch +++ b/projects/imx6/patches/kodi/kodi-04-guilib-mark-control-dirty-when-setting-to-invisible.patch @@ -1,7 +1,7 @@ -From ef4b58dd279c14ea5f62fe27690217f80880dfe2 Mon Sep 17 00:00:00 2001 +From 0eebba44430bb98521d9ff22478a0893869bda03 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 5 Jan 2015 11:29:15 +0100 -Subject: [PATCH 04/12] guilib: mark control dirty when setting to invisible +Subject: [PATCH 04/16] guilib: mark control dirty when setting to invisible --- xbmc/guilib/GUIControl.cpp | 2 ++ diff --git a/projects/imx6/patches/kodi/kodi-05-renderer-exit-gfx-lock-when-waiting-for-present-time.patch b/projects/imx6/patches/kodi/kodi-05-renderer-exit-gfx-lock-when-waiting-for-present-time.patch index dd92c69efa..14c9422e47 100644 --- a/projects/imx6/patches/kodi/kodi-05-renderer-exit-gfx-lock-when-waiting-for-present-time.patch +++ b/projects/imx6/patches/kodi/kodi-05-renderer-exit-gfx-lock-when-waiting-for-present-time.patch @@ -1,7 +1,7 @@ -From b3b3c3c1e03c7538b8d423e352c3e14f7a23e011 Mon Sep 17 00:00:00 2001 +From 0d91676f4100a43304702c76d737e05cc665cca5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 6 Jan 2015 13:13:27 +0100 -Subject: [PATCH 05/12] renderer: exit gfx lock when waiting for present time +Subject: [PATCH 05/16] renderer: exit gfx lock when waiting for present time --- xbmc/cores/VideoRenderers/RenderManager.cpp | 3 +++ diff --git a/projects/imx6/patches/kodi/kodi-06-renderer-fix-sequence-from-WaitFrame-Render-FrameMov.patch b/projects/imx6/patches/kodi/kodi-06-renderer-fix-sequence-from-WaitFrame-Render-FrameMov.patch index b0a48dbfcf..4774eefa90 100644 --- a/projects/imx6/patches/kodi/kodi-06-renderer-fix-sequence-from-WaitFrame-Render-FrameMov.patch +++ b/projects/imx6/patches/kodi/kodi-06-renderer-fix-sequence-from-WaitFrame-Render-FrameMov.patch @@ -1,7 +1,7 @@ -From c0976e515f0a8b05ab36a70ddb39b97db6aa7ef6 Mon Sep 17 00:00:00 2001 +From 0607a56a5f0eb916d2c27613bcd8db7d3c357aee Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 23 Jan 2015 07:41:46 +0100 -Subject: [PATCH 06/12] renderer: fix sequence from WaitFrame, Render, +Subject: [PATCH 06/16] renderer: fix sequence from WaitFrame, Render, FrameMove to WaitFrame, FrameMove, Render --- @@ -11,10 +11,10 @@ Subject: [PATCH 06/12] renderer: fix sequence from WaitFrame, Render, 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 3a222d4..5775a76 100644 +index bc33a79..a79c7dd 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2212,16 +2212,17 @@ void CApplication::Render() +@@ -2217,16 +2217,17 @@ void CApplication::Render() bool limitFrames = false; unsigned int singleFrameTime = 10; // default limit 100 fps @@ -35,7 +35,7 @@ index 3a222d4..5775a76 100644 } else { -@@ -2322,6 +2323,11 @@ void CApplication::Render() +@@ -2327,6 +2328,11 @@ void CApplication::Render() if (flip) g_graphicsContext.Flip(dirtyRegions); diff --git a/projects/imx6/patches/kodi/kodi-07-Add-aml_support_hevc-function-and-recognize-S812-chi.patch b/projects/imx6/patches/kodi/kodi-07-Add-aml_support_hevc-function-and-recognize-S812-chi.patch index bba3a26437..1637df70f0 100644 --- a/projects/imx6/patches/kodi/kodi-07-Add-aml_support_hevc-function-and-recognize-S812-chi.patch +++ b/projects/imx6/patches/kodi/kodi-07-Add-aml_support_hevc-function-and-recognize-S812-chi.patch @@ -1,7 +1,7 @@ -From 60dd2e99e0997d637bdff7c36e620d861ba536aa Mon Sep 17 00:00:00 2001 +From 264be7a32fdb566ecf69933189553128c589c800 Mon Sep 17 00:00:00 2001 From: Stanislav Vlasic Date: Mon, 13 Oct 2014 13:20:11 +0200 -Subject: [PATCH 07/12] Add aml_support_hevc function and recognize S812 chip +Subject: [PATCH 07/16] Add aml_support_hevc function and recognize S812 chip --- xbmc/utils/AMLUtils.cpp | 26 ++++++++++++++++++++++++-- diff --git a/projects/imx6/patches/kodi/kodi-08-CHG-Extract-SysfsUtils-from-the-AML-utils.patch b/projects/imx6/patches/kodi/kodi-08-CHG-Extract-SysfsUtils-from-the-AML-utils.patch index 1395a5966f..ba5f41cf3d 100644 --- a/projects/imx6/patches/kodi/kodi-08-CHG-Extract-SysfsUtils-from-the-AML-utils.patch +++ b/projects/imx6/patches/kodi/kodi-08-CHG-Extract-SysfsUtils-from-the-AML-utils.patch @@ -1,7 +1,7 @@ -From 7adba15f4a285d6445ed38c92797ea7778d3824e Mon Sep 17 00:00:00 2001 +From 22a9bc18b49eb5858b5c7511c9573a861fa81232 Mon Sep 17 00:00:00 2001 From: "Chris \"Koying\" Browet" Date: Wed, 31 Dec 2014 15:08:12 +0100 -Subject: [PATCH 08/12] CHG: Extract SysfsUtils from the AML utils +Subject: [PATCH 08/16] CHG: Extract SysfsUtils from the AML utils --- xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp | 46 +++++----- diff --git a/projects/imx6/patches/kodi/kodi-09-imx-Fixed-mode-change-after-SysfsUtils-port.patch b/projects/imx6/patches/kodi/kodi-09-imx-Fixed-mode-change-after-SysfsUtils-port.patch index 0585075c1a..98894197c8 100644 --- a/projects/imx6/patches/kodi/kodi-09-imx-Fixed-mode-change-after-SysfsUtils-port.patch +++ b/projects/imx6/patches/kodi/kodi-09-imx-Fixed-mode-change-after-SysfsUtils-port.patch @@ -1,7 +1,7 @@ -From 93962bc37ad6ffc092b37354f36431fafad424e7 Mon Sep 17 00:00:00 2001 +From 11a9bc199b0ebd9e6cfb9b82547bb3c5379b1104 Mon Sep 17 00:00:00 2001 From: smallint Date: Mon, 19 Jan 2015 20:38:42 +0100 -Subject: [PATCH 09/12] [imx] Fixed mode change after SysfsUtils port +Subject: [PATCH 09/16] [imx] Fixed mode change after SysfsUtils port --- xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 2 +- diff --git a/projects/imx6/patches/kodi/kodi-10-imx-Added-de-interlacing-method-enumerations-FAST_MO.patch b/projects/imx6/patches/kodi/kodi-10-imx-Added-de-interlacing-method-enumerations-FAST_MO.patch index 4fd4436799..12274ae0dd 100644 --- a/projects/imx6/patches/kodi/kodi-10-imx-Added-de-interlacing-method-enumerations-FAST_MO.patch +++ b/projects/imx6/patches/kodi/kodi-10-imx-Added-de-interlacing-method-enumerations-FAST_MO.patch @@ -1,7 +1,7 @@ -From 4608ac3855f881685f231838eebf51b3e6c8b9c1 Mon Sep 17 00:00:00 2001 +From 9c9935180aa9297d35855db674b7eb7f732714e9 Mon Sep 17 00:00:00 2001 From: smallint Date: Thu, 5 Feb 2015 19:35:05 +0000 -Subject: [PATCH 10/12] [imx] Added de-interlacing method enumerations +Subject: [PATCH 10/16] [imx] Added de-interlacing method enumerations FAST_MOTION and FAST_MOTION_DOUBLE --- diff --git a/projects/imx6/patches/kodi/kodi-11-RenderManager-preserve-field-type-for-Renderer-Rende.patch b/projects/imx6/patches/kodi/kodi-11-RenderManager-preserve-field-type-for-Renderer-Rende.patch index 8d1a7ad8ec..17793cd645 100644 --- a/projects/imx6/patches/kodi/kodi-11-RenderManager-preserve-field-type-for-Renderer-Rende.patch +++ b/projects/imx6/patches/kodi/kodi-11-RenderManager-preserve-field-type-for-Renderer-Rende.patch @@ -1,7 +1,7 @@ -From 9cbf6c98775dd8f4052c08aa18eb7401d8b17a12 Mon Sep 17 00:00:00 2001 +From ba9b668fcbfd4f6bcfd67b22bcdc850a140ac65c Mon Sep 17 00:00:00 2001 From: smallint Date: Thu, 5 Feb 2015 19:37:13 +0000 -Subject: [PATCH 11/12] [RenderManager] preserve field type for +Subject: [PATCH 11/16] [RenderManager] preserve field type for Renderer::RenderUpdate --- diff --git a/projects/imx6/patches/kodi/kodi-12-imx-Reworked-video-decoding-and-rendering-see-http-f.patch b/projects/imx6/patches/kodi/kodi-12-imx-Reworked-video-decoding-and-rendering-see-http-f.patch index b043383b09..fd5ed38378 100644 --- a/projects/imx6/patches/kodi/kodi-12-imx-Reworked-video-decoding-and-rendering-see-http-f.patch +++ b/projects/imx6/patches/kodi/kodi-12-imx-Reworked-video-decoding-and-rendering-see-http-f.patch @@ -1,7 +1,7 @@ -From 0f14c3a002498cdfda1243898865f9b77a6867c0 Mon Sep 17 00:00:00 2001 +From f868235f00f10e58d682a7786544b495d5113405 Mon Sep 17 00:00:00 2001 From: smallint Date: Thu, 5 Feb 2015 19:39:33 +0000 -Subject: [PATCH 12/12] [imx] Reworked video decoding and rendering, see +Subject: [PATCH 12/16] [imx] Reworked video decoding and rendering, see http://forum.kodi.tv/showthread.php?tid=211289&pid=1892440#pid1892440 Conflicts: diff --git a/projects/imx6/patches/kodi/kodi-13-implemented-rendercapture-for-latest-rendering-rework.patch b/projects/imx6/patches/kodi/kodi-13-iMX6-Implement-rendercapture-for-latest-rendering-re.patch similarity index 99% rename from projects/imx6/patches/kodi/kodi-13-implemented-rendercapture-for-latest-rendering-rework.patch rename to projects/imx6/patches/kodi/kodi-13-iMX6-Implement-rendercapture-for-latest-rendering-re.patch index e9ae8b5ccf..68e2d3ab4b 100644 --- a/projects/imx6/patches/kodi/kodi-13-implemented-rendercapture-for-latest-rendering-rework.patch +++ b/projects/imx6/patches/kodi/kodi-13-iMX6-Implement-rendercapture-for-latest-rendering-re.patch @@ -1,8 +1,8 @@ -From 03fe0bd48acc0399ede41e220d757ceba8be2937 Mon Sep 17 00:00:00 2001 +From 85ca69f3fc1f9bfd30f828921db1283366c7bfea Mon Sep 17 00:00:00 2001 From: wolfgar Date: Sat, 14 Feb 2015 03:06:03 +0100 -Subject: [PATCH] [iMX6] Implement rendercapture for latest rendering rework - blit fb using g2d when no deinterlacing is required +Subject: [PATCH 13/16] [iMX6] Implement rendercapture for latest rendering + rework blit fb using g2d when no deinterlacing is required --- configure.in | 2 +- @@ -14,7 +14,7 @@ Subject: [PATCH] [iMX6] Implement rendercapture for latest rendering rework 6 files changed, 401 insertions(+), 137 deletions(-) diff --git a/configure.in b/configure.in -index 23bf0aa..d395add 100644 +index 32e37c5..a8cdca0 100644 --- a/configure.in +++ b/configure.in @@ -1935,7 +1935,7 @@ for codecs in `echo $add_codecs | sed 's/,/ /g'`; do @@ -891,5 +891,5 @@ index dca3f2f..e414454 100644 -- -1.9.1 +1.9.3 diff --git a/projects/imx6/patches/kodi/kodi-14-prepare-for-fractional-modes-rabeeh.patch b/projects/imx6/patches/kodi/kodi-14-IMX-Prepare-for-fractional-modes-picked-from-rabeeh.patch similarity index 82% rename from projects/imx6/patches/kodi/kodi-14-prepare-for-fractional-modes-rabeeh.patch rename to projects/imx6/patches/kodi/kodi-14-IMX-Prepare-for-fractional-modes-picked-from-rabeeh.patch index af751cab72..239e8a8948 100644 --- a/projects/imx6/patches/kodi/kodi-14-prepare-for-fractional-modes-rabeeh.patch +++ b/projects/imx6/patches/kodi/kodi-14-IMX-Prepare-for-fractional-modes-picked-from-rabeeh.patch @@ -1,17 +1,17 @@ -From 0551526fa630c34d18ea7fcf28675ed6209220a7 Mon Sep 17 00:00:00 2001 +From e275d4438c1baa34ba9d7f5880aad53d776daf2e Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 20 Feb 2015 08:40:05 +0100 -Subject: [PATCH 1/4] IMX: Prepare for fractional modes (picked from @rabeeh) +Subject: [PATCH 14/16] IMX: Prepare for fractional modes (picked from @rabeeh) --- xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp -index 111406c..9065f5c 100644 +index cf2f706..25dbc9b 100644 --- a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp +++ b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp -@@ -275,14 +275,14 @@ bool CEGLNativeTypeIMX::ModeToResolution(std::string mode, RESOLUTION_INFO *res) +@@ -315,14 +315,14 @@ bool CEGLNativeTypeIMX::ModeToResolution(std::string mode, RESOLUTION_INFO *res) StringUtils::Trim(fromMode); CRegExp split(true); @@ -28,7 +28,7 @@ index 111406c..9065f5c 100644 res->iWidth = w; res->iHeight= h; -@@ -295,7 +295,7 @@ bool CEGLNativeTypeIMX::ModeToResolution(std::string mode, RESOLUTION_INFO *res) +@@ -335,7 +335,7 @@ bool CEGLNativeTypeIMX::ModeToResolution(std::string mode, RESOLUTION_INFO *res) res->bFullScreen = true; res->iSubtitles = (int)(0.965 * res->iHeight); res->fPixelRatio = 1.0f; @@ -38,5 +38,5 @@ index 111406c..9065f5c 100644 res->strId = mode; -- -1.9.1 +1.9.3 diff --git a/projects/imx6/patches/kodi/kodi-15-imx-Output-associated-pts-for-TRACE_FRAMES.patch b/projects/imx6/patches/kodi/kodi-15-imx-Output-associated-pts-for-TRACE_FRAMES.patch new file mode 100644 index 0000000000..7f663c51c1 --- /dev/null +++ b/projects/imx6/patches/kodi/kodi-15-imx-Output-associated-pts-for-TRACE_FRAMES.patch @@ -0,0 +1,24 @@ +From 1ec717d9197fb0086c76197519f2b522b4ec73af Mon Sep 17 00:00:00 2001 +From: smallint +Date: Fri, 20 Feb 2015 15:40:29 +0100 +Subject: [PATCH 15/16] [imx] Output associated pts for TRACE_FRAMES + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp +index fcd8b02..7789e38 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp +@@ -885,6 +885,7 @@ int CDVDVideoCodecIMX::Decode(BYTE *pData, int iSize, double dts, double pts) + + #ifdef TRACE_FRAMES + CLog::Log(LOGDEBUG, "+ %02d dts %f pts %f (VPU)\n", idx, dts, pts); ++ CLog::Log(LOGDEBUG, "+ %02d dts %f pts %f (VPU)\n", idx, buffer->GetDts(), buffer->GetPts()); + #endif + + if (!m_usePTS) +-- +1.9.3 + diff --git a/projects/imx6/patches/kodi/kodi-16-Add-guard-to-fix-build-on-non-iMX6-arch.patch b/projects/imx6/patches/kodi/kodi-16-Add-guard-to-fix-build-on-non-iMX6-arch.patch new file mode 100644 index 0000000000..6bf9b479b7 --- /dev/null +++ b/projects/imx6/patches/kodi/kodi-16-Add-guard-to-fix-build-on-non-iMX6-arch.patch @@ -0,0 +1,34 @@ +From d2113f254cabde119734440620d16aca7444acd8 Mon Sep 17 00:00:00 2001 +From: wolfgar +Date: Sat, 21 Feb 2015 23:45:26 +0100 +Subject: [PATCH 16/16] Add guard to fix build on non iMX6 arch + +--- + xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp +index 25dbc9b..f482075 100644 +--- a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp ++++ b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp +@@ -96,7 +96,7 @@ void CEGLNativeTypeIMX::Initialize() + CLog::Log(LOGERROR, "%s - Error while opening /dev/fb0.\n", __FUNCTION__); + return; + } +- ++#ifdef HAS_IMXVPU + struct mxcfb_color_key colorKey; + struct mxcfb_gbl_alpha gbl_alpha; + struct mxcfb_loc_alpha lalpha; +@@ -117,7 +117,7 @@ void CEGLNativeTypeIMX::Initialize() + colorKey.color_key = (16 << 16)|(8 << 8)|16; + if (ioctl(fd, MXCFB_SET_CLR_KEY, &colorKey) < 0) + CLog::Log(LOGERROR, "%s - Failed to setup color keying\n", __FUNCTION__); +- ++#endif + // Unblank the fb + if (ioctl(fd, FBIOBLANK, 0) < 0) + { +-- +1.9.3 +