projects/Cuboxi/patches/xbmc-master: update Cuboxi support patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-07-26 22:22:43 +02:00
parent db307ac481
commit 2a7749b4cb

View File

@ -1,7 +1,7 @@
From 053ee11795e547f04f18280e6cd3aac1fbe7d672 Mon Sep 17 00:00:00 2001 From 8960497bcda032b018953ebc675ecfdb96827a56 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Fri, 31 Jan 2014 14:43:24 +0100 Date: Fri, 31 Jan 2014 14:43:24 +0100
Subject: [PATCH 01/49] ADD: Freeescale imx h/w codec Subject: [PATCH 01/50] ADD: Freeescale imx h/w codec
--- ---
configure.in | 13 +- configure.in | 13 +-
@ -33,10 +33,10 @@ Subject: [PATCH 01/49] ADD: Freeescale imx h/w codec
create mode 100644 xbmc/windowing/egl/EGLNativeTypeIMX.h create mode 100644 xbmc/windowing/egl/EGLNativeTypeIMX.h
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index 1766ce1..a3775fd 100644 index 5f3bf00..5d46d24 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -536,7 +536,7 @@ AC_ARG_ENABLE([gtest], @@ -524,7 +524,7 @@ AC_ARG_ENABLE([gtest],
AC_ARG_ENABLE([codec], AC_ARG_ENABLE([codec],
[AS_HELP_STRING([--enable-codec], [AS_HELP_STRING([--enable-codec],
@ -45,7 +45,7 @@ index 1766ce1..a3775fd 100644
[add_codecs=$enableval], [add_codecs=$enableval],
[add_codecs=no]) [add_codecs=no])
@@ -1990,6 +1990,17 @@ for codecs in `echo $add_codecs | sed 's/,/ /g'`; do @@ -1968,6 +1968,17 @@ for codecs in `echo $add_codecs | sed 's/,/ /g'`; do
*libstagefright*) *libstagefright*)
XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright], [$codecs]) XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright], [$codecs])
;; ;;
@ -64,10 +64,10 @@ index 1766ce1..a3775fd 100644
esac esac
done done
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 8cbf6e5..c26ad44 100644 index 8dee4bc..4592e39 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -720,7 +720,10 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) @@ -1084,7 +1084,10 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
* will automatically add "@" instead to enable surroundXX mangling. * will automatically add "@" instead to enable surroundXX mangling.
* We don't want to do that if "default" can handle multichannel * We don't want to do that if "default" can handle multichannel
* itself (e.g. in case of a pulseaudio server). */ * itself (e.g. in case of a pulseaudio server). */
@ -79,7 +79,7 @@ index 8cbf6e5..c26ad44 100644
void **hints; void **hints;
@@ -771,8 +774,8 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) @@ -1135,8 +1138,8 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
* found by the enumeration process. Skip them as well ("hw", "dmix", * found by the enumeration process. Skip them as well ("hw", "dmix",
* "plughw", "dsnoop"). */ * "plughw", "dsnoop"). */
@ -89,7 +89,7 @@ index 8cbf6e5..c26ad44 100644
&& baseName != "surround40" && baseName != "surround40"
&& baseName != "surround41" && baseName != "surround41"
&& baseName != "surround50" && baseName != "surround50"
@@ -881,6 +884,22 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) @@ -1245,6 +1248,22 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name)
{ {
@ -343,10 +343,10 @@ index f15e80d..d40e4f5 100644
RENDER_FMT_MEDIACODEC, RENDER_FMT_MEDIACODEC,
}; };
diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index 6832721..a9d071d 100644 index b6fb1a3..79c4223 100644
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -922,6 +922,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) @@ -924,6 +924,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic)
else if(pic.format == RENDER_FMT_VAAPI) else if(pic.format == RENDER_FMT_VAAPI)
m_pRenderer->AddProcessor(*pic.vaapi, index); m_pRenderer->AddProcessor(*pic.vaapi, index);
#endif #endif
@ -358,7 +358,7 @@ index 6832721..a9d071d 100644
else if(pic.format == RENDER_FMT_EGLIMG) else if(pic.format == RENDER_FMT_EGLIMG)
m_pRenderer->AddProcessor(pic.stf, pic.eglimg, index); m_pRenderer->AddProcessor(pic.stf, pic.eglimg, index);
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index f77ac40..a8eeb2b 100644 index 32d58d4..048bd92 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -36,6 +36,9 @@ @@ -36,6 +36,9 @@
@ -3323,7 +3323,7 @@ index 0000000..f5d66c4
+ +
+#endif /*_TIMESTAMP_H_ */ +#endif /*_TIMESTAMP_H_ */
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index 633e333..cdddd66 100644 index be532ec..9a0acf1 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -995,6 +995,7 @@ static std::string GetRenderFormatName(ERenderFormat format) @@ -995,6 +995,7 @@ static std::string GetRenderFormatName(ERenderFormat format)
@ -3336,8 +3336,18 @@ index 633e333..cdddd66 100644
} }
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index ee21474..1446a56 100644 index ee21474..1446a56 100644
diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp --- a/xbmc/input/linux/LinuxInputDevices.cpp
index fe72016..acc373c 100644 +++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -1227,7 +1227,8 @@ XBMC_Event CLinuxInputDevices::ReadEvent()
if ((now - m_lastHotplugCheck) >= 10)
{
- CheckHotplugged();
+ // Comment for now as it has visible issue on video decoding when USB devices are available
+ //CheckHotplugged();
m_lastHotplugCheck = now;
}
}
diff --git a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp diff --git a/xbmc/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp
new file mode 100644 new file mode 100644
index 0000000..4ac19c4 index 0000000..4ac19c4
@ -3727,10 +3737,10 @@ index f800b7f..f59f9cb 100644
1.9.3 1.9.3
From 403a451c7f14e3f6c933409e351bb4f10f09c861 Mon Sep 17 00:00:00 2001 From 8621accc7a9a0ebf81369ee4ad85b3d4cd7f126a Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Thu, 6 Feb 2014 16:26:29 +0100 Date: Thu, 6 Feb 2014 16:26:29 +0100
Subject: [PATCH 02/49] CHG: [imx] remove V4L and baseline software rendering Subject: [PATCH 02/50] CHG: [imx] remove V4L and baseline software rendering
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 103 +- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 103 +-
@ -3976,10 +3986,10 @@ index d40e4f5..f15e80d 100644
RENDER_FMT_MEDIACODEC, RENDER_FMT_MEDIACODEC,
}; };
diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index a9d071d..6832721 100644 index 79c4223..b6fb1a3 100644
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -922,10 +922,6 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) @@ -924,10 +924,6 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic)
else if(pic.format == RENDER_FMT_VAAPI) else if(pic.format == RENDER_FMT_VAAPI)
m_pRenderer->AddProcessor(*pic.vaapi, index); m_pRenderer->AddProcessor(*pic.vaapi, index);
#endif #endif
@ -5545,7 +5555,7 @@ index d72b899..cc0f26c 100644
}; };
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index cdddd66..633e333 100644 index 9a0acf1..be532ec 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -995,7 +995,6 @@ static std::string GetRenderFormatName(ERenderFormat format) @@ -995,7 +995,6 @@ static std::string GetRenderFormatName(ERenderFormat format)
@ -5619,10 +5629,10 @@ index f59f9cb..85abb44 100644
1.9.3 1.9.3
From 8406b04208038f84c00e74b1c6d987590bb97e95 Mon Sep 17 00:00:00 2001 From 1a49ec3b85157e39d0045965d055db089cf95cd0 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Tue, 11 Feb 2014 13:42:53 +0100 Date: Tue, 11 Feb 2014 13:42:53 +0100
Subject: [PATCH 03/49] CHG: [IMX] baseline direct buffer rendering Subject: [PATCH 03/50] CHG: [IMX] baseline direct buffer rendering
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 107 ++++++++++++++++++++- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 107 ++++++++++++++++++++-
@ -5861,10 +5871,10 @@ index f15e80d..384bcd6 100644
#endif #endif
diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index 6832721..1079ff4 100644 index b6fb1a3..0aebd2d 100644
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -930,6 +930,8 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) @@ -932,6 +932,8 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic)
else if(pic.format == RENDER_FMT_MEDIACODEC) else if(pic.format == RENDER_FMT_MEDIACODEC)
m_pRenderer->AddProcessor(pic.mediacodec, index); m_pRenderer->AddProcessor(pic.mediacodec, index);
#endif #endif
@ -6133,7 +6143,7 @@ index 0000000..18078d3
+ +
+#endif // DVDVIDEOCODECINFO_H +#endif // DVDVIDEOCODECINFO_H
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index 633e333..cf7b4fc 100644 index be532ec..98f12f4 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -996,6 +996,7 @@ static std::string GetRenderFormatName(ERenderFormat format) @@ -996,6 +996,7 @@ static std::string GetRenderFormatName(ERenderFormat format)
@ -6148,10 +6158,10 @@ index 633e333..cf7b4fc 100644
1.9.3 1.9.3
From a65dda63aa97ba0c977c4d24caa9d5d7f3bba1c5 Mon Sep 17 00:00:00 2001 From 2643aee68ee75afe8384db7cb933e257db7af3f2 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Thu, 13 Feb 2014 17:43:23 +0100 Date: Thu, 13 Feb 2014 17:43:23 +0100
Subject: [PATCH 04/49] ADD: [imx] direct texture rendering Subject: [PATCH 04/50] ADD: [imx] direct texture rendering
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 171 +++++++++++++++++++++ xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 171 +++++++++++++++++++++
@ -6442,10 +6452,10 @@ index 384bcd6..714619e 100644
#endif #endif
diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index 1079ff4..836bcd1 100644 index 0aebd2d..653dc52 100644
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -930,7 +930,7 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) @@ -932,7 +932,7 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic)
else if(pic.format == RENDER_FMT_MEDIACODEC) else if(pic.format == RENDER_FMT_MEDIACODEC)
m_pRenderer->AddProcessor(pic.mediacodec, index); m_pRenderer->AddProcessor(pic.mediacodec, index);
#endif #endif
@ -6718,7 +6728,7 @@ index 18078d3..6096bf4 100644
int iLineSize[4]; // [4] = alpha channel, currently not used int iLineSize[4]; // [4] = alpha channel, currently not used
}; };
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
index cf7b4fc..7c9bd4a 100644 index 98f12f4..efac52b 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -997,6 +997,7 @@ static std::string GetRenderFormatName(ERenderFormat format) @@ -997,6 +997,7 @@ static std::string GetRenderFormatName(ERenderFormat format)
@ -6835,10 +6845,10 @@ index 4ac19c4..b44d4b8 100644
1.9.3 1.9.3
From f2b45426b2f60e9e7c44d611e889369d3d366069 Mon Sep 17 00:00:00 2001 From 19981bbbc0007b308d43de31478229f3a109709c Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Mon, 17 Feb 2014 22:09:19 +0100 Date: Mon, 17 Feb 2014 22:09:19 +0100
Subject: [PATCH 05/49] Fixed include and display size issues Subject: [PATCH 05/50] Fixed include and display size issues
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 6 +++ xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 6 +++
@ -6980,10 +6990,10 @@ index 7c5c26b..a5d9eeb 100644
1.9.3 1.9.3
From 36b7b50e5e6c956112b085e59126b2cace4b9c42 Mon Sep 17 00:00:00 2001 From 4ecfa9bd4f0b0e47c273766477ea94a39d350468 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Mon, 17 Feb 2014 23:26:07 +0100 Date: Mon, 17 Feb 2014 23:26:07 +0100
Subject: [PATCH 06/49] Removed debug output used for testing Subject: [PATCH 06/50] Removed debug output used for testing
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 3 --- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 3 ---
@ -7007,10 +7017,10 @@ index 4f3d042..2c7f132 100644
1.9.3 1.9.3
From 0fc718531cb2f1da8a9924e100b295eff096ba7b Mon Sep 17 00:00:00 2001 From bd888a536c9397a41ad5846acd75f9ea8d450e4b Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 18 Feb 2014 16:07:23 +0000 Date: Tue, 18 Feb 2014 16:07:23 +0000
Subject: [PATCH 07/49] Attempt to fix potential race condition and Subject: [PATCH 07/50] Attempt to fix potential race condition and
mutlithreading issues ... to be tested mutlithreading issues ... to be tested
--- ---
@ -7329,10 +7339,10 @@ index 5487bfe..df568e5 100644
1.9.3 1.9.3
From dc01ee8b2d181795a336f21bbf9ed098b3bb8eb0 Mon Sep 17 00:00:00 2001 From 7a3a957432dfd6f7e7e45cea945b9061080da906 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 18 Feb 2014 19:19:09 +0100 Date: Tue, 18 Feb 2014 19:19:09 +0100
Subject: [PATCH 08/49] Fixed buffer reference and added more logs to track a Subject: [PATCH 08/50] Fixed buffer reference and added more logs to track a
frames lifetime frames lifetime
--- ---
@ -7441,10 +7451,10 @@ index df568e5..1aef626 100644
1.9.3 1.9.3
From c059fcd74ad1f28b91268053e4631622728468dc Mon Sep 17 00:00:00 2001 From 219cf2b55e64e99102944e38059348676e2db8bc Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 18 Feb 2014 20:03:46 +0100 Date: Tue, 18 Feb 2014 20:03:46 +0100
Subject: [PATCH 09/49] Missing initialization and extradata handling backport Subject: [PATCH 09/50] Missing initialization and extradata handling backport
from wolfgar from wolfgar
--- ---
@ -7488,10 +7498,10 @@ index 75aba7c..f3a7adc 100644
1.9.3 1.9.3
From 9751bc766f087659cad764eef276320a5455c25a Mon Sep 17 00:00:00 2001 From 83b66029c052489db358e739b1d913b61eff1558 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 18 Feb 2014 22:38:31 +0100 Date: Tue, 18 Feb 2014 22:38:31 +0100
Subject: [PATCH 10/49] Added safety check to render texture and moved Subject: [PATCH 10/50] Added safety check to render texture and moved
invalidation of frames before destroying the VPU handle invalidation of frames before destroying the VPU handle
--- ---
@ -7549,10 +7559,10 @@ index f3a7adc..6689261 100644
1.9.3 1.9.3
From bb7e12f317133ae1bba2513c12582e3be88ac902 Mon Sep 17 00:00:00 2001 From 63e8ea582169bead998f39593f75fdb80d75194b Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 18 Feb 2014 23:29:48 +0100 Date: Tue, 18 Feb 2014 23:29:48 +0100
Subject: [PATCH 11/49] Added Reset of buffers Subject: [PATCH 11/50] Added Reset of buffers
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 7 ++++++- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 7 ++++++-
@ -7593,10 +7603,10 @@ index 6689261..a6de84f 100644
1.9.3 1.9.3
From cc9f6a9c8d88a03f67fd3ffa69c9f277adc29d1d Mon Sep 17 00:00:00 2001 From c69fa85452212c14af8702af054556c4c99fcdf1 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Wed, 19 Feb 2014 00:29:48 +0100 Date: Wed, 19 Feb 2014 00:29:48 +0100
Subject: [PATCH 12/49] Fixed lost frames when seeking Subject: [PATCH 12/50] Fixed lost frames when seeking
--- ---
.../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 22 +++++++++++++++++----- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 22 +++++++++++++++++-----
@ -7683,10 +7693,10 @@ index 1aef626..b17e51b 100644
1.9.3 1.9.3
From fde017f6fda6a913133cad942dfad9e121255613 Mon Sep 17 00:00:00 2001 From b4650f0c0c1596157f3fb49488c72d1daedba531 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Wed, 19 Feb 2014 02:18:24 +0100 Date: Wed, 19 Feb 2014 02:18:24 +0100
Subject: [PATCH 13/49] Change copyright notice to remove explicit mention of Subject: [PATCH 13/50] Change copyright notice to remove explicit mention of
my name and be compliant with xbmc rules for upstreaming my name and be compliant with xbmc rules for upstreaming
--- ---
@ -7710,10 +7720,10 @@ index 7e26756..58075bc 100644
1.9.3 1.9.3
From f48da345e3c174f2d32285f2ab7fd070330a6941 Mon Sep 17 00:00:00 2001 From fc61582dc74af0437c91297e6a00d40480edc476 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Wed, 19 Feb 2014 03:19:00 +0100 Date: Wed, 19 Feb 2014 03:19:00 +0100
Subject: [PATCH 14/49] Fix includes for yocto cross toolchain Subject: [PATCH 14/50] Fix includes for yocto cross toolchain
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 4 ++-- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 4 ++--
@ -7738,10 +7748,10 @@ index cef2f65..f731beb 100644
1.9.3 1.9.3
From aa026e8f777c55e7a9670c5aedd259e65d0a0042 Mon Sep 17 00:00:00 2001 From fc7068f886d0bf6774ff72b46e7f75ef8830b0d2 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Wed, 19 Feb 2014 03:25:10 +0100 Date: Wed, 19 Feb 2014 03:25:10 +0100
Subject: [PATCH 15/49] pts simplification (merge latest changes from my imxpts Subject: [PATCH 15/50] pts simplification (merge latest changes from my imxpts
branch) branch)
--- ---
@ -8023,10 +8033,10 @@ index b17e51b..c4418fe 100644
1.9.3 1.9.3
From b072c1aa63299c43f26ece456be1ad4c766d424d Mon Sep 17 00:00:00 2001 From a9692ba840f915f6182752db771a79b63e0837ef Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Wed, 19 Feb 2014 04:08:19 +0100 Date: Wed, 19 Feb 2014 04:08:19 +0100
Subject: [PATCH 16/49] Remove mfw_gst_ts from build Subject: [PATCH 16/50] Remove mfw_gst_ts from build
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in | 2 +- xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in | 2 +-
@ -8987,10 +8997,10 @@ index f5d66c4..0000000
1.9.3 1.9.3
From 3e40defd4634c49c56d6dcd91dfb07b40fb4f98a Mon Sep 17 00:00:00 2001 From 99fa8a5470edb26a19c820521192ace57f7d5ff2 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Wed, 19 Feb 2014 12:35:40 +0100 Date: Wed, 19 Feb 2014 12:35:40 +0100
Subject: [PATCH 17/49] FIX: [imx] cosmetics Subject: [PATCH 17/50] FIX: [imx] cosmetics
--- ---
.../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 73 ++++++++++------------ .../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 73 ++++++++++------------
@ -9340,10 +9350,10 @@ index 61d5833..b9162ee
1.9.3 1.9.3
From e9cbd60e76d772d1312e82ff2aa29b89c6bc9508 Mon Sep 17 00:00:00 2001 From c36564c00b617d823bacc08493379a141f455c52 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Wed, 19 Feb 2014 12:41:34 +0100 Date: Wed, 19 Feb 2014 12:41:34 +0100
Subject: [PATCH 18/49] FIX: [imx] avoid potential segfault Subject: [PATCH 18/50] FIX: [imx] avoid potential segfault
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 10 ++++------ xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 10 ++++------
@ -9379,10 +9389,10 @@ index f731beb..4c286f8
1.9.3 1.9.3
From f9d6accde22dded80680b800bf67388bea902a91 Mon Sep 17 00:00:00 2001 From 4551494f84316b09978fd66eceb5a8742de9dd6c Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Wed, 19 Feb 2014 13:00:37 +0100 Date: Wed, 19 Feb 2014 13:00:37 +0100
Subject: [PATCH 19/49] FIX: [imx] CDVDVideoCodecIMXBuffer optimizations Subject: [PATCH 19/50] FIX: [imx] CDVDVideoCodecIMXBuffer optimizations
--- ---
.../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 37 ++++++++-------------- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 37 ++++++++--------------
@ -9490,10 +9500,10 @@ index ac0345f..1b9a2b8 100755
1.9.3 1.9.3
From 4f307c6f92aacbe0b5c55cf028a4268f353ce912 Mon Sep 17 00:00:00 2001 From c0d8a8ea4e35080dc0ff9624c36657d9d35c632f Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Fri, 21 Feb 2014 07:04:02 +0000 Date: Fri, 21 Feb 2014 07:04:02 +0000
Subject: [PATCH 20/49] chmod -x Subject: [PATCH 20/50] chmod -x
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h
@ -9520,10 +9530,10 @@ new mode 100644
1.9.3 1.9.3
From b587982c2fe1cde38681d7047dcfc9992eea5e2b Mon Sep 17 00:00:00 2001 From e3f2a17d37ae08cae2e2eccc6120e6a5b0e0869c Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Thu, 20 Feb 2014 17:42:39 +0100 Date: Thu, 20 Feb 2014 17:42:39 +0100
Subject: [PATCH 21/49] ADD: [imx] dynamic resolutions / refresh rates Subject: [PATCH 21/50] ADD: [imx] dynamic resolutions / refresh rates
--- ---
xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 199 ++++++++++++++++++++++---------- xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 199 ++++++++++++++++++++++----------
@ -9885,10 +9895,10 @@ index b9162ee..df7b3b7 100755
1.9.3 1.9.3
From bcb712c5f15ccfc312f5fbdc583248c5ce17b589 Mon Sep 17 00:00:00 2001 From 62d3f035c8ed7a303f13daf766cc40ab3b8f7a28 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Fri, 21 Feb 2014 13:02:34 +0100 Date: Fri, 21 Feb 2014 13:02:34 +0100
Subject: [PATCH 22/49] Merge pull request #9 Subject: [PATCH 22/50] Merge pull request #9
FIX: [imx] runtime vivante egl extensions FIX: [imx] runtime vivante egl extensions
--- ---
@ -9942,20 +9952,20 @@ index 4c286f8..1c2fc86 100644
1.9.3 1.9.3
From 843a06a1323283c19fa9b008b2da2157d69e3291 Mon Sep 17 00:00:00 2001 From 0f0ed66d8be81510f07a80f9ba7b851f75d96b79 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Mon, 24 Feb 2014 11:18:51 +0100 Date: Mon, 24 Feb 2014 11:18:51 +0100
Subject: [PATCH 23/49] FIX: cross-complation Subject: [PATCH 23/50] FIX: cross-complation
--- ---
xbmc/cores/VideoRenderers/RenderManager.cpp | 2 ++ xbmc/cores/VideoRenderers/RenderManager.cpp | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/xbmc/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp
index 836bcd1..60b9118 100644 index 653dc52..8b5aee6 100644
--- a/xbmc/cores/VideoRenderers/RenderManager.cpp --- a/xbmc/cores/VideoRenderers/RenderManager.cpp
+++ b/xbmc/cores/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoRenderers/RenderManager.cpp
@@ -930,8 +930,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic) @@ -932,8 +932,10 @@ int CXBMCRenderManager::AddVideoPicture(DVDVideoPicture& pic)
else if(pic.format == RENDER_FMT_MEDIACODEC) else if(pic.format == RENDER_FMT_MEDIACODEC)
m_pRenderer->AddProcessor(pic.mediacodec, index); m_pRenderer->AddProcessor(pic.mediacodec, index);
#endif #endif
@ -9970,10 +9980,10 @@ index 836bcd1..60b9118 100644
1.9.3 1.9.3
From 36a0fc8009724dd4d15ef43ae22027ec74a1d383 Mon Sep 17 00:00:00 2001 From 5a10d02debd4a697424458d0f8c15f835e0418f1 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Mon, 24 Feb 2014 22:55:58 +0100 Date: Mon, 24 Feb 2014 22:55:58 +0100
Subject: [PATCH 24/49] Fix mode (remove x) on EGLNativeTypeIMX.* files Subject: [PATCH 24/50] Fix mode (remove x) on EGLNativeTypeIMX.* files
--- ---
xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 0 xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 0
@ -9992,10 +10002,10 @@ new mode 100644
1.9.3 1.9.3
From 0791af311fdaf83b29d3b8ae22321b30544b7e4d Mon Sep 17 00:00:00 2001 From 697afedca97e49d5eae3ec6445f4c1adb31a8a2c Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Fri, 21 Feb 2014 16:48:09 +0100 Date: Fri, 21 Feb 2014 16:48:09 +0100
Subject: [PATCH 25/49] CHG: [imx] force vsync depending on FB_MULTI_BUFFER Subject: [PATCH 25/50] CHG: [imx] force vsync depending on FB_MULTI_BUFFER
value value
--- ---
@ -10044,10 +10054,10 @@ index 3e3e45e..3d32705 100644
1.9.3 1.9.3
From 6c32b52ef31d5350dcac2e413a4f0cc33978d84f Mon Sep 17 00:00:00 2001 From 7f1781e62459d810d391c60f8062ef05518c7295 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Wed, 26 Feb 2014 18:37:05 +0100 Date: Wed, 26 Feb 2014 18:37:05 +0100
Subject: [PATCH 26/49] FIX: [imx] drop decoder frames which are returned with Subject: [PATCH 26/50] FIX: [imx] drop decoder frames which are returned with
flag VPU_DEC_OUTPUT_MOSAIC_DIS set flag VPU_DEC_OUTPUT_MOSAIC_DIS set
--- ---
@ -10107,10 +10117,10 @@ index 2b9002a..c85bd8a 100644
1.9.3 1.9.3
From 4d494b15aadb744785ac6224143d791ef763b849 Mon Sep 17 00:00:00 2001 From c949c1ad3887a80427d8b4bd6f759ff65984165e Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Thu, 27 Feb 2014 07:26:21 +0000 Date: Thu, 27 Feb 2014 07:26:21 +0000
Subject: [PATCH 27/49] FIX: [imx] removed unnecessary block that releases an Subject: [PATCH 27/50] FIX: [imx] removed unnecessary block that releases an
associated pts associated pts
--- ---
@ -10139,10 +10149,10 @@ index c85bd8a..46ddaac 100644
1.9.3 1.9.3
From 126d9e74f46fb2573de5032b43aa4fb70fc4d019 Mon Sep 17 00:00:00 2001 From e93342c198785a88ba915e6dd87ad4c4a6cdc211 Mon Sep 17 00:00:00 2001
From: "Chris \"koying\" Browet" <cbro@semperpax.com> From: "Chris \"koying\" Browet" <cbro@semperpax.com>
Date: Thu, 27 Feb 2014 09:49:49 +0000 Date: Thu, 27 Feb 2014 09:49:49 +0000
Subject: [PATCH 28/49] FIX: [imx] Do not force resolution if the same as Subject: [PATCH 28/50] FIX: [imx] Do not force resolution if the same as
current current
--- ---
@ -10178,10 +10188,10 @@ index 3d32705..729fe56 100644
1.9.3 1.9.3
From 1e7c5ec258de911f553f4460f21c1d875b74650c Mon Sep 17 00:00:00 2001 From 46fa92730fa659b4bc3aa86f0857ffec4cb7eb65 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Thu, 27 Feb 2014 11:58:31 +0100 Date: Thu, 27 Feb 2014 11:58:31 +0100
Subject: [PATCH 29/49] FIX: [imx] dynamic allocation of buffer array Subject: [PATCH 29/50] FIX: [imx] dynamic allocation of buffer array
--- ---
.../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 68 +++++++++++++--------- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 68 +++++++++++++---------
@ -10369,10 +10379,10 @@ index 1b9a2b8..139d918 100644
1.9.3 1.9.3
From 7ed59c18a7a2e95c5903c28a1ff68bfe1bd7d527 Mon Sep 17 00:00:00 2001 From 2410769cc01ead4f9694b34f2ec1b2e1d5124fbc Mon Sep 17 00:00:00 2001
From: tomlohave <tomlohave@gmail.com> From: tomlohave <tomlohave@gmail.com>
Date: Sat, 1 Mar 2014 07:52:01 +0100 Date: Sat, 1 Mar 2014 07:52:01 +0100
Subject: [PATCH 30/49] fix CheckCompatibility for newer kernel Subject: [PATCH 30/50] fix CheckCompatibility for newer kernel
on newer kernel (3.10.30), on newer kernel (3.10.30),
cat /sys/class/graphics/fb0/device/modalias returns "platform:mxc_sdc_fb.28" cat /sys/class/graphics/fb0/device/modalias returns "platform:mxc_sdc_fb.28"
@ -10401,10 +10411,10 @@ index 729fe56..65063e9 100644
1.9.3 1.9.3
From c078bd7b2b83fc910a7f1d2c44e9752650bc5339 Mon Sep 17 00:00:00 2001 From a638454b9612f3c19031bc943e7d6aee1da2471d Mon Sep 17 00:00:00 2001
From: Chris Browet <koying@semperpax.com> From: Chris Browet <koying@semperpax.com>
Date: Sat, 1 Mar 2014 09:06:02 +0100 Date: Sat, 1 Mar 2014 09:06:02 +0100
Subject: [PATCH 31/49] fixup: remove obsolete comment Subject: [PATCH 31/50] fixup: remove obsolete comment
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 1 - xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h | 1 -
@ -10426,10 +10436,10 @@ index 139d918..d71e975 100644
1.9.3 1.9.3
From e1623abd7e3badba2afc984c1897cab182756080 Mon Sep 17 00:00:00 2001 From bc1badb6a2cffb688cc2e52bcee2b85b9ae7a760 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Sat, 1 Mar 2014 09:32:24 +0100 Date: Sat, 1 Mar 2014 09:32:24 +0100
Subject: [PATCH 32/49] FIX: [imx] force mod 16 output frame size Subject: [PATCH 32/50] FIX: [imx] force mod 16 output frame size
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 5 +++++ xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 5 +++++
@ -10455,10 +10465,10 @@ index d0d035a..8d9a5e6 100644
1.9.3 1.9.3
From 091b6e8aa9ca4de184e78455a06e658d3a636d60 Mon Sep 17 00:00:00 2001 From 2ca01100dedb1988d19d94bd1d2b82dd02387f54 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Sat, 1 Mar 2014 10:23:37 +0100 Date: Sat, 1 Mar 2014 10:23:37 +0100
Subject: [PATCH 33/49] [imx] Add IPU hardware deinterlacing support Subject: [PATCH 33/50] [imx] Add IPU hardware deinterlacing support
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 3 +- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 3 +-
@ -11272,10 +11282,10 @@ index d71e975..71a0d39 100644
1.9.3 1.9.3
From d08d7a8e3f635246a0a8a9da25aba8b3d1ce22a0 Mon Sep 17 00:00:00 2001 From 53e42f3dd2fe3a5fbc0c02027a452b844fa455f5 Mon Sep 17 00:00:00 2001
From: tomlohave <tomlohave@gmail.com> From: tomlohave <tomlohave@gmail.com>
Date: Sun, 2 Mar 2014 17:26:30 +0100 Date: Sun, 2 Mar 2014 17:26:30 +0100
Subject: [PATCH 34/49] fix CheckCompatibility for newer kernel (try2) Subject: [PATCH 34/50] fix CheckCompatibility for newer kernel (try2)
Use "mxc_sdc_fb" instead of "mxc" as requested by Chris Use "mxc_sdc_fb" instead of "mxc" as requested by Chris
--- ---
@ -11299,10 +11309,10 @@ index 65063e9..91e223f 100644
1.9.3 1.9.3
From da9e58d2305ad5b4a8456ef38939dcab26e8f29b Mon Sep 17 00:00:00 2001 From a8d428bc497703232a089c85ec0b284e9bff6ee1 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Sun, 2 Mar 2014 03:05:46 +0100 Date: Sun, 2 Mar 2014 03:05:46 +0100
Subject: [PATCH 35/49] Properly track pts in case the associated frame is Subject: [PATCH 35/50] Properly track pts in case the associated frame is
consumed at next ::Decode call consumed at next ::Decode call
--- ---
@ -11428,10 +11438,10 @@ index 71a0d39..1cfb2a4 100644
1.9.3 1.9.3
From 5c48e2d4031ce54a6b269c4539b226e70574bd74 Mon Sep 17 00:00:00 2001 From 0d61cd9f8cff6351cabcc4bf2f1f9d20207c4d73 Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Fri, 28 Feb 2014 12:48:26 +0100 Date: Fri, 28 Feb 2014 12:48:26 +0100
Subject: [PATCH 36/49] [imx] attempt to recover audio from resolution change Subject: [PATCH 36/50] [imx] attempt to recover audio from resolution change
--- ---
xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 5 +++++ xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 5 +++++
@ -11464,10 +11474,10 @@ index 91e223f..4ffa708 100644
1.9.3 1.9.3
From ce2e0548ae4ed15825af99d928620dd3fa81f39f Mon Sep 17 00:00:00 2001 From 56e81c54c84b4f7992ed932d224d23fe7e95d0bd Mon Sep 17 00:00:00 2001
From: "Chris \"koying\" Browet" <cbro@semperpax.com> From: "Chris \"koying\" Browet" <cbro@semperpax.com>
Date: Fri, 28 Feb 2014 19:12:16 +0000 Date: Fri, 28 Feb 2014 19:12:16 +0000
Subject: [PATCH 37/49] [imx] A VPU_DEC_FLUSH should amount to a Reset() Subject: [PATCH 37/50] [imx] A VPU_DEC_FLUSH should amount to a Reset()
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 6 +----- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 6 +-----
@ -11494,10 +11504,10 @@ index 26ba552..44bfe34 100644
1.9.3 1.9.3
From 78e5172667ff355fac92eb90fb93f1ff5db7c6f7 Mon Sep 17 00:00:00 2001 From 4fc825be17c2258265581b1055dff94c8249f35d Mon Sep 17 00:00:00 2001
From: "Chris \"Koying\" Browet" <cbro@semperpax.com> From: "Chris \"Koying\" Browet" <cbro@semperpax.com>
Date: Tue, 4 Mar 2014 12:48:32 +0100 Date: Tue, 4 Mar 2014 12:48:32 +0100
Subject: [PATCH 38/49] CHG: [imx] decouple compile options for vpu & fb Subject: [PATCH 38/50] CHG: [imx] decouple compile options for vpu & fb
--- ---
configure.in | 9 +++++++++ configure.in | 9 +++++++++
@ -11506,10 +11516,10 @@ Subject: [PATCH 38/49] CHG: [imx] decouple compile options for vpu & fb
3 files changed, 11 insertions(+), 2 deletions(-) 3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index a3775fd..3a8128b 100644 index 5d46d24..891e9c2 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -983,6 +983,15 @@ else @@ -992,6 +992,15 @@ else
AC_MSG_RESULT($wayland_disabled) AC_MSG_RESULT($wayland_disabled)
fi fi
@ -11555,10 +11565,10 @@ index 85abb44..ec84c1d 100644
1.9.3 1.9.3
From be02a7d3453779b33801701148a6f5baba92ec90 Mon Sep 17 00:00:00 2001 From 2d4368023f913e33210d8017379662de7fe79b3d Mon Sep 17 00:00:00 2001
From: "Chris \"koying\" Browet" <cbro@semperpax.com> From: "Chris \"koying\" Browet" <cbro@semperpax.com>
Date: Mon, 3 Mar 2014 18:46:45 +0000 Date: Mon, 3 Mar 2014 18:46:45 +0000
Subject: [PATCH 39/49] FIX: [imx] lower log spam Subject: [PATCH 39/50] FIX: [imx] lower log spam
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 4 +++- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 4 +++-
@ -11583,10 +11593,10 @@ index 44bfe34..a6f3712 100644
1.9.3 1.9.3
From 0718c74fcb8e7ac98971b6eb0619f4b1cbd10822 Mon Sep 17 00:00:00 2001 From 9998d4bcb880237eeea8c93d591cfde46c12220e Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Sat, 15 Mar 2014 02:30:15 +0100 Date: Sat, 15 Mar 2014 02:30:15 +0100
Subject: [PATCH 40/49] Revert to sw decoding for AVC hi10 profile and divX3 Subject: [PATCH 40/50] Revert to sw decoding for AVC hi10 profile and divX3
codecs codecs
--- ---
@ -11624,10 +11634,10 @@ index a6f3712..4110f83 100644
1.9.3 1.9.3
From e4677d666f0df315dc131a9967e9b07a7e9ea9d7 Mon Sep 17 00:00:00 2001 From 089903e6b8742ab924aad0a3bacf1c49be4a0e26 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Sun, 16 Mar 2014 01:53:02 +0100 Date: Sun, 16 Mar 2014 01:53:02 +0100
Subject: [PATCH 41/49] Add VPU support for MPEG1 Subject: [PATCH 41/50] Add VPU support for MPEG1
--- ---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 4 ++++ xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 4 ++++
@ -11652,10 +11662,10 @@ index 4110f83..a4f6ede 100644
1.9.3 1.9.3
From 65c207fa5471f590c9e57566f82753ba80c97447 Mon Sep 17 00:00:00 2001 From 11dc7dcbc0de3cced6cd6011cd9fda59b7326723 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Sun, 16 Mar 2014 23:53:01 +0100 Date: Sun, 16 Mar 2014 23:53:01 +0100
Subject: [PATCH 42/49] Avoid to invoke VPU decoding without additional data Subject: [PATCH 42/50] Avoid to invoke VPU decoding without additional data
when we are not specifically in PR28 context as it improves VC1 issue when we are not specifically in PR28 context as it improves VC1 issue
reported in #41 To do so, Test if frame size (and thus reported in #41 To do so, Test if frame size (and thus
VPU_DEC_ONE_FRM_CONSUMED) is handled before dealing with m_bytesToBeConsumed VPU_DEC_ONE_FRM_CONSUMED) is handled before dealing with m_bytesToBeConsumed
@ -11712,10 +11722,10 @@ index 1cfb2a4..6c935f1 100644
1.9.3 1.9.3
From 642d258db641567e936a2352427b6fcd1f925fc2 Mon Sep 17 00:00:00 2001 From 959f937091defba1c706df51452044e7e1a2cdbb Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net> From: wolfgar <stephan.rafin@laposte.net>
Date: Wed, 19 Mar 2014 03:08:48 +0100 Date: Wed, 19 Mar 2014 03:08:48 +0100
Subject: [PATCH 43/49] Handle dts properly instead of reverting to NOPTS when Subject: [PATCH 43/50] Handle dts properly instead of reverting to NOPTS when
only dts is available (no pts provided) Also try to decode harder only dts is available (no pts provided) Also try to decode harder
--- ---
@ -11895,10 +11905,10 @@ index 6c935f1..1ae2618 100644
1.9.3 1.9.3
From 38626442fdbf428848487a86a824b84bcb5fc4de Mon Sep 17 00:00:00 2001 From 84692dca572b0a8e100af3944d90dcd39f583d61 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Sun, 2 Mar 2014 17:13:52 +0100 Date: Sun, 2 Mar 2014 17:13:52 +0100
Subject: [PATCH 44/49] [imx] Move deinterlacing processing into render thread Subject: [PATCH 44/50] [imx] Move deinterlacing processing into render thread
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 40 ++++++++- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 40 ++++++++-
@ -12279,10 +12289,10 @@ index 1ae2618..1b1786e 100644
1.9.3 1.9.3
From 1e34d040ff5b431d2019e1a4543e0f6f04e85582 Mon Sep 17 00:00:00 2001 From 1569163ab1b9ccdf89036d59bce2173b4c5a8941 Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Mon, 3 Mar 2014 19:39:17 +0100 Date: Mon, 3 Mar 2014 19:39:17 +0100
Subject: [PATCH 45/49] ADD: [imx] Deinterlacing options configurable from gui Subject: [PATCH 45/50] ADD: [imx] Deinterlacing options configurable from gui
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 38 +++++++++++++++++----- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 38 +++++++++++++++++-----
@ -12439,10 +12449,10 @@ index 1b1786e..37d5734 100644
1.9.3 1.9.3
From e384ec1fd13254176ed91b6ea96802f2eae3bd6c Mon Sep 17 00:00:00 2001 From c9bcc7162227cd22a5dd6f800696bd9f3ce9f6ec Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Tue, 11 Mar 2014 20:49:40 +0100 Date: Tue, 11 Mar 2014 20:49:40 +0100
Subject: [PATCH 46/49] [imx] Cleanups after code review Subject: [PATCH 46/50] [imx] Cleanups after code review
--- ---
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 28 ++++++++++++---------- xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp | 28 ++++++++++++----------
@ -12627,10 +12637,10 @@ index 37d5734..a76575f 100644
1.9.3 1.9.3
From 5daa4b1a87e04b37a5cf8a742611dcadff4f79a0 Mon Sep 17 00:00:00 2001 From 98e8973ef0a51844af3f34067cad1ff78504748e Mon Sep 17 00:00:00 2001
From: smallint <tahoma@gmx.de> From: smallint <tahoma@gmx.de>
Date: Fri, 14 Mar 2014 15:27:24 +0000 Date: Fri, 14 Mar 2014 15:27:24 +0000
Subject: [PATCH 47/49] [imx] Fixed low motion deinterlacing picture jumps Subject: [PATCH 47/50] [imx] Fixed low motion deinterlacing picture jumps
--- ---
.../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 129 ++++++++++++++------- .../dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp | 129 ++++++++++++++-------
@ -13089,10 +13099,10 @@ index a76575f..05722ce 100644
1.9.3 1.9.3
From 7aabf0c4038642ae2f981dff7cc7c57083913b94 Mon Sep 17 00:00:00 2001 From e376aa4d95b8d0a730cf04cefca417762e92c90b Mon Sep 17 00:00:00 2001
From: Thomas Genty <tomlohave@openbricks.org> From: Thomas Genty <tomlohave@openbricks.org>
Date: Sun, 6 Apr 2014 13:57:12 +0200 Date: Sun, 6 Apr 2014 13:57:12 +0200
Subject: [PATCH 48/49] detect imx device on all platform using file Subject: [PATCH 48/50] detect imx device on all platform using file
/sys/class/graphics/fb0/fsl_disp_dev_property /sys/class/graphics/fb0/fsl_disp_dev_property
--- ---
@ -13134,10 +13144,10 @@ index 4ffa708..404bd3c 100644
1.9.3 1.9.3
From ea9cdc6246bcc272a80a8fd6ffc3c4d30e667719 Mon Sep 17 00:00:00 2001 From f7c5f0ada67613994651ab24a987f2f1b147bc70 Mon Sep 17 00:00:00 2001
From: Thomas Genty <tomlohave@openbricks.org> From: Thomas Genty <tomlohave@openbricks.org>
Date: Tue, 8 Apr 2014 19:02:52 +0200 Date: Tue, 8 Apr 2014 19:02:52 +0200
Subject: [PATCH 49/49] detect imx device on all platforms (try2) Subject: [PATCH 49/50] detect imx device on all platforms (try2)
--- ---
xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 5 +---- xbmc/windowing/egl/EGLNativeTypeIMX.cpp | 5 +----
@ -13162,3 +13172,29 @@ index 404bd3c..3dc64a3 100644
-- --
1.9.3 1.9.3
From 23c32ef03be062e088fbd760fc1758c5726f0c44 Mon Sep 17 00:00:00 2001
From: wolfgar <stephan.rafin@laposte.net>
Date: Mon, 23 Jun 2014 23:17:34 +0200
Subject: [PATCH 50/50] Reenable hotplug devices check
---
xbmc/input/linux/LinuxInputDevices.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 1446a56..85dbb80 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -1228,7 +1228,7 @@ XBMC_Event CLinuxInputDevices::ReadEvent()
if ((now - m_lastHotplugCheck) >= 10)
{
// Comment for now as it has visible issue on video decoding when USB devices are available
- //CheckHotplugged();
+ CheckHotplugged();
m_lastHotplugCheck = now;
}
}
--
1.9.3