From 77f82ca3fac0972b85c620153ec827998471a9f2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 Feb 2014 01:55:47 +0100 Subject: [PATCH] projects/Cuboxi/patches: update IMX patch Signed-off-by: Stephan Raue --- .../patches/xbmc/xbmc-001-imx6_support.patch | 179 ++++++++++-------- 1 file changed, 104 insertions(+), 75 deletions(-) diff --git a/projects/Cuboxi/patches/xbmc/xbmc-001-imx6_support.patch b/projects/Cuboxi/patches/xbmc/xbmc-001-imx6_support.patch index b44d6eee2c..3573cd652c 100644 --- a/projects/Cuboxi/patches/xbmc/xbmc-001-imx6_support.patch +++ b/projects/Cuboxi/patches/xbmc/xbmc-001-imx6_support.patch @@ -1,7 +1,7 @@ diff -Naur xbmc-gotham-latest.test/configure.in xbmc-wolfgar-imx-wip.test/configure.in ---- xbmc-gotham-latest.test/configure.in 2014-01-31 18:15:15.409622984 +0100 -+++ xbmc-wolfgar-imx-wip.test/configure.in 2014-01-31 18:18:09.534025963 +0100 -@@ -558,7 +558,7 @@ +--- xbmc-gotham-latest.test/configure.in 2014-02-09 01:41:42.290169158 +0100 ++++ xbmc-wolfgar-imx-wip.test/configure.in 2014-02-09 01:40:43.539103171 +0100 +@@ -555,7 +555,7 @@ AC_ARG_ENABLE([codec], [AS_HELP_STRING([--enable-codec], @@ -10,7 +10,7 @@ diff -Naur xbmc-gotham-latest.test/configure.in xbmc-wolfgar-imx-wip.test/config [add_codecs=$enableval], [add_codecs=no]) -@@ -1978,6 +1978,17 @@ +@@ -1985,6 +1985,17 @@ *libstagefright*) XB_ADD_CODEC([LIBSTAGEFRIGHT], [libstagefright], [$codecs]) ;; @@ -28,18 +28,37 @@ diff -Naur xbmc-gotham-latest.test/configure.in xbmc-wolfgar-imx-wip.test/config *) esac done -@@ -2653,6 +2664,7 @@ - AC_SUBST(USE_DOXYGEN) - AC_SUBST(USE_PVR_ADDONS) +@@ -2663,6 +2674,7 @@ + AC_SUBST(GNUTLS_ALL_LIBS) + AC_SUBST(VORBISENC_ALL_LIBS) + # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions XB_DIRSTACK="$PWD" diff -Naur xbmc-gotham-latest.test/lib/ffmpeg/libavcodec/arm/dca.h xbmc-wolfgar-imx-wip.test/lib/ffmpeg/libavcodec/arm/dca.h +--- xbmc-gotham-latest.test/lib/ffmpeg/libavcodec/arm/dca.h 2014-02-09 01:41:27.311152362 +0100 ++++ xbmc-wolfgar-imx-wip.test/lib/ffmpeg/libavcodec/arm/dca.h 2014-02-09 01:40:36.140094843 +0100 +@@ -30,9 +30,9 @@ + + #define decode_blockcodes decode_blockcodes + static inline int decode_blockcodes(int code1, int code2, int levels, +- int *values) ++ int32_t *values) + { +- int v0, v1, v2, v3, v4, v5; ++ int32_t v0, v1, v2, v3, v4, v5; + + __asm__ ("smmul %0, %6, %10 \n" + "smmul %3, %7, %10 \n" +@@ -101,3 +101,4 @@ + #endif + + #endif /* AVCODEC_ARM_DCA_H */ ++ diff -Naur xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp ---- xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-01-31 18:15:01.973474894 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-01-31 18:18:05.822022698 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-02-09 01:41:15.200138764 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2014-02-09 01:40:26.161083601 +0100 @@ -714,7 +714,10 @@ * will automatically add "@" instead to enable surroundXX mangling. * We don't want to do that if "default" can handle multichannel @@ -86,8 +105,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp x return AE_DEVTYPE_HDMI; else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif") diff -Naur xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp ---- xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp 2014-01-31 18:15:01.999475246 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp 2014-01-31 18:18:05.829022704 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp 2014-02-09 01:41:15.237138806 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp 2014-02-09 01:40:26.223083671 +0100 @@ -841,7 +841,7 @@ _mm_empty(); #else /* no SSE2 */ @@ -98,8 +117,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/AudioEngine/Utils/AEConvert.cpp xb return samples << 2; diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp ---- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2014-01-31 18:15:01.800472552 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2014-01-31 18:18:05.731022617 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2014-02-09 01:41:14.964138497 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2014-02-09 01:40:25.777083169 +0100 @@ -35,6 +35,9 @@ #include "Video/DVDVideoCodecFFmpeg.h" #include "Video/DVDVideoCodecOpenMax.h" @@ -140,8 +159,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCode if (!hint.software && CSettings::Get().GetBool("videoplayer.usevda")) { diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h ---- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2014-01-31 18:15:01.813472728 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2014-01-31 18:18:05.731022617 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2014-02-09 01:41:14.980138516 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h 2014-02-09 01:40:25.834083233 +0100 @@ -38,7 +38,9 @@ class COpenMax; class COpenMaxVideo; @@ -176,8 +195,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo }; diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp --- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp 2014-01-31 18:18:05.743022628 +0100 -@@ -0,0 +1,1737 @@ ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp 2014-02-09 01:40:25.852083253 +0100 +@@ -0,0 +1,1745 @@ +/* + * Copyright (C) 2013 Stephan Rafin + * @@ -1377,6 +1396,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo + uint8_t *demuxer_content = pData; + bool bitstream_convered = false; + bool retry = false; ++ bool frameConsumed = false; + +#ifdef IMX_PROFILE + static unsigned long long previous, current; @@ -1425,31 +1445,6 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo + } + } + -+ if (pts != DVD_NOPTS_VALUE) -+ { -+ if (m_tsSyncRequired) -+ { -+ m_tsSyncRequired = false; -+ resyncTSManager(m_tsm, llrint(pts) * 1000, MODE_AI); -+ } -+ //TSManagerReceive2(m_tsm, llrint(pts) * 1000, iSize); -+ TSManagerReceive(m_tsm, llrint(pts) * 1000); -+ } -+ else -+ { -+ //If no pts but dts available (AVI container for instance) then use this one -+ if (dts != DVD_NOPTS_VALUE) -+ { -+ if (m_tsSyncRequired) -+ { -+ m_tsSyncRequired = false; -+ resyncTSManager(m_tsm, llrint(dts) * 1000, MODE_AI); -+ } -+ //TSManagerReceive2(m_tsm, llrint(dts) * 1000, iSize); -+ TSManagerReceive(m_tsm, llrint(dts) * 1000); -+ } -+ } -+ + inData.nSize = demuxer_bytes; + inData.pPhyAddr = NULL; + inData.pVirAddr = demuxer_content; @@ -1523,6 +1518,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo + { + CLog::Log(LOGERROR, "%s - VPU error retireving info about consummed frame (%d).\n", __FUNCTION__, ret); + } ++ frameConsumed = true; + // FIXME TSManagerValid2(m_tsm, frameLengthInfo.nFrameLength + frameLengthInfo.nStuffLength, frameLengthInfo.pFrame); + //CLog::Log(LOGDEBUG, "%s - size : %d - key consummed : %x\n", __FUNCTION__, frameLengthInfo.nFrameLength + frameLengthInfo.nStuffLength, frameLengthInfo.pFrame); + }//VPU_DEC_ONE_FRM_CONSUMED @@ -1603,6 +1599,37 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo + } + + } while (retry == true); ++ ++ /* Push ts only if a frame was consumed by the VPU ++ * as it will produce an output in future for sure */ ++ if (frameConsumed) ++ { ++ if (pts != DVD_NOPTS_VALUE) ++ { ++ if (m_tsSyncRequired) ++ { ++ m_tsSyncRequired = false; ++ resyncTSManager(m_tsm, llrint(pts) * 1000, MODE_AI); ++ } ++ //TSManagerReceive2(m_tsm, llrint(pts) * 1000, iSize); ++ TSManagerReceive(m_tsm, llrint(pts) * 1000); ++ } ++ else ++ { ++ //If no pts but dts available (AVI container for instance) then use this one ++ if (dts != DVD_NOPTS_VALUE) ++ { ++ if (m_tsSyncRequired) ++ { ++ m_tsSyncRequired = false; ++ resyncTSManager(m_tsm, llrint(dts) * 1000, MODE_AI); ++ } ++ //TSManagerReceive2(m_tsm, llrint(dts) * 1000, iSize); ++ TSManagerReceive(m_tsm, llrint(dts) * 1000); ++ } ++ } ++ } ++ + } //(pData && iSize) + + if (GetAvailableBufferNb() > (m_vpuFrameBufferNum - m_extraVpuBuffers)) @@ -1917,7 +1944,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo +} diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h --- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h 2014-01-31 18:18:05.743022628 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h 2014-02-09 01:40:25.878083282 +0100 @@ -0,0 +1,191 @@ +#pragma once +/* @@ -2111,8 +2138,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideo + +}; diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in ---- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2014-01-31 18:15:01.800472552 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2014-01-31 18:18:05.731022617 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2014-02-09 01:41:14.966138502 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in 2014-02-09 01:40:25.810083206 +0100 @@ -23,6 +23,22 @@ SRCS += OpenMaxVideo.cpp SRCS += DVDVideoCodecOpenMax.cpp @@ -2138,7 +2165,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile SRCS += DVDVideoCodecAmlogic.cpp diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.c xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.c --- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.c 2014-01-31 18:18:05.743022628 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.c 2014-02-09 01:40:25.855083256 +0100 @@ -0,0 +1,752 @@ +/* + * Copyright (c) 2010-2012, Freescale Semiconductor, Inc. All rights reserved. @@ -2894,7 +2921,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ +} diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.h xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.h --- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.h 2014-01-31 18:18:05.731022617 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ts.h 2014-02-09 01:40:25.830083229 +0100 @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2010-2012, Freescale Semiconductor, Inc. All rights reserved. @@ -3067,8 +3094,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDCodecs/Video/mfw_gst_ + +#endif /*_TIMESTAMP_H_ */ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp ---- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2014-01-31 18:15:01.946474529 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2014-01-31 18:18:05.793022672 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2014-02-09 01:41:15.126138681 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2014-02-09 01:40:26.047083473 +0100 @@ -994,6 +994,7 @@ case RENDER_FMT_CVBREF: return "BGRA"; case RENDER_FMT_EGLIMG: return "EGLIMG"; @@ -3078,8 +3105,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc- case RENDER_FMT_NONE: return "NONE"; } diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp ---- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp 2014-01-31 18:15:01.764472065 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp 2014-01-31 18:18:05.730022616 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp 2014-02-09 01:41:14.829138348 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp 2014-02-09 01:40:25.675083053 +0100 @@ -20,6 +20,10 @@ //#define DEBUG_VERBOSE 1 @@ -3272,8 +3299,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.c void CLinuxRendererGLES::AddProcessor(CDVDMediaCodecInfo *mediacodec, int index) { diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h ---- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h 2014-01-31 18:15:01.761472024 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h 2014-01-31 18:18:05.730022616 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h 2014-02-09 01:41:14.826138345 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h 2014-02-09 01:40:25.665083043 +0100 @@ -42,6 +42,7 @@ class COpenMaxVideo; class CDVDVideoCodecStageFright; @@ -3303,8 +3330,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/LinuxRendererGLES.h CDVDVideoCodecStageFright* stf; EGLImageKHR eglimg; diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderFormats.h xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderFormats.h ---- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderFormats.h 2014-01-31 18:15:01.763472051 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderFormats.h 2014-01-31 18:18:05.730022616 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderFormats.h 2014-02-09 01:41:14.827138346 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderFormats.h 2014-02-09 01:40:25.674083053 +0100 @@ -35,6 +35,7 @@ RENDER_FMT_OMXEGL, RENDER_FMT_CVBREF, @@ -3314,8 +3341,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderFormats.h xbm RENDER_FMT_MEDIACODEC, }; diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderManager.cpp xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderManager.cpp ---- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderManager.cpp 2014-01-31 18:15:01.762472038 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderManager.cpp 2014-01-31 18:18:05.730022616 +0100 +--- xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderManager.cpp 2014-02-09 01:41:14.826138345 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/cores/VideoRenderers/RenderManager.cpp 2014-02-09 01:40:25.674083053 +0100 @@ -920,6 +920,10 @@ else if(pic.format == RENDER_FMT_VAAPI) m_pRenderer->AddProcessor(*pic.vaapi, index); @@ -3328,21 +3355,23 @@ diff -Naur xbmc-gotham-latest.test/xbmc/cores/VideoRenderers/RenderManager.cpp x else if(pic.format == RENDER_FMT_EGLIMG) m_pRenderer->AddProcessor(pic.stf, pic.eglimg, index); diff -Naur xbmc-gotham-latest.test/xbmc/input/linux/LinuxInputDevices.cpp xbmc-wolfgar-imx-wip.test/xbmc/input/linux/LinuxInputDevices.cpp +--- xbmc-gotham-latest.test/xbmc/input/linux/LinuxInputDevices.cpp 2014-02-09 01:41:09.587132460 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/input/linux/LinuxInputDevices.cpp 2014-02-09 01:40:22.522079500 +0100 +@@ -1222,7 +1222,8 @@ + + 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 -Naur xbmc-gotham-latest.test/xbmc/powermanagement/PowerManager.cpp xbmc-wolfgar-imx-wip.test/xbmc/powermanagement/PowerManager.cpp diff -Naur xbmc-gotham-latest.test/xbmc/video/dialogs/GUIDialogVideoOSD.cpp xbmc-wolfgar-imx-wip.test/xbmc/video/dialogs/GUIDialogVideoOSD.cpp ---- xbmc-gotham-latest.test/xbmc/video/dialogs/GUIDialogVideoOSD.cpp 2014-01-31 18:14:59.301437729 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/video/dialogs/GUIDialogVideoOSD.cpp 2014-01-31 18:18:05.444022357 +0100 -@@ -55,6 +55,7 @@ - || g_windowManager.IsWindowActive(WINDOW_DIALOG_PVR_OSD_DIRECTOR) - || g_windowManager.IsWindowActive(WINDOW_DIALOG_PVR_OSD_CUTTER) - || g_windowManager.IsWindowActive(WINDOW_DIALOG_OSD_TELETEXT)) -+ - // extend show time by original value - SetAutoClose(m_showDuration); - } diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp ---- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp 2014-01-31 18:15:01.575469507 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp 2014-01-31 18:18:05.666022562 +0100 +--- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp 2014-02-09 01:41:14.415137886 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp 2014-02-09 01:40:25.076082379 +0100 @@ -17,6 +17,7 @@ * . * @@ -3361,7 +3390,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp x diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp --- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2014-01-31 18:18:05.666022562 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp 2014-02-09 01:40:25.076082379 +0100 @@ -0,0 +1,272 @@ +/* + * Copyright (C) 2011-2013 Team XBMC @@ -3637,7 +3666,7 @@ diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.cpp xbmc- +} diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.h xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.h --- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.h 2014-01-31 18:18:05.666022562 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLNativeTypeIMX.h 2014-02-09 01:40:25.078082381 +0100 @@ -0,0 +1,62 @@ +#pragma once + @@ -3702,8 +3731,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLNativeTypeIMX.h xbmc-wo + +}; diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLWrapper.cpp xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLWrapper.cpp ---- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLWrapper.cpp 2014-01-31 18:15:01.583469614 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLWrapper.cpp 2014-01-31 18:18:05.666022562 +0100 +--- xbmc-gotham-latest.test/xbmc/windowing/egl/EGLWrapper.cpp 2014-02-09 01:41:14.417137884 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/EGLWrapper.cpp 2014-02-09 01:40:25.077082380 +0100 @@ -17,11 +17,10 @@ * . * @@ -3728,8 +3757,8 @@ diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/EGLWrapper.cpp xbmc-wolfga m_nativeTypes = nativeGuess; diff -Naur xbmc-gotham-latest.test/xbmc/windowing/egl/Makefile.in xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/Makefile.in ---- xbmc-gotham-latest.test/xbmc/windowing/egl/Makefile.in 2014-01-31 18:15:01.564469357 +0100 -+++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/Makefile.in 2014-01-31 18:18:05.665022561 +0100 +--- xbmc-gotham-latest.test/xbmc/windowing/egl/Makefile.in 2014-02-09 01:41:14.375137840 +0100 ++++ xbmc-wolfgar-imx-wip.test/xbmc/windowing/egl/Makefile.in 2014-02-09 01:40:25.055082355 +0100 @@ -5,6 +5,7 @@ SRCS+= EGLNativeTypeAndroid.cpp SRCS+= EGLNativeTypeRaspberryPI.cpp