Merge pull request #3916 from codesnake/wetek_update

WeTek update

packages/linux/package.mk

@@ -19,7 +19,7 @@
 PKG_NAME="linux"
 case "$LINUX" in
   amlogic)
-    PKG_VERSION="amlogic-3.10-84deff2"
+    PKG_VERSION="amlogic-3.10-24553c6"
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   imx6)

projects/WeTek_Play/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch

@@ -1,7 +1,7 @@
-From 631698197b3ed81e7ad3d7c3fa6356fb42f003a7 Mon Sep 17 00:00:00 2001
+From 5e5453322e71c16b8b96b471a9e5c32b96d6b1af Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Wed, 16 Apr 2014 22:02:01 +0300
-Subject: [PATCH 01/16] Fix ALSA sound output for Amlogic-based devices.
+Subject: [PATCH 01/17] Fix ALSA sound output for Amlogic-based devices.
 
 ---
  xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp |   19 +++++++++++++++++++
@@ -51,5 +51,5 @@ index df50940..9f80c06 100644
    CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: periodSize %lu, bufferSize %lu", periodSize, bufferSize);
  
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0002-Allow-audio-passthrough-for-Amlogic-based-devices.patch

@@ -1,10 +1,10 @@
-From 37b3fe27cde38ff20463c6e0a3f3405f8e9b8069 Mon Sep 17 00:00:00 2001
+From 7cdd0f41588b9ddf4778f643fc77cbcbf7ca54a5 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Wed, 16 Apr 2014 22:11:51 +0300
-Subject: [PATCH 02/16] Allow audio passthrough for Amlogic-based devices.
+Subject: [PATCH 02/17] Allow audio passthrough for Amlogic-based devices.
 
 ---
- .../AudioEngine/Engines/ActiveAE/ActiveAESink.cpp  |    8 ++++++++
+ xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp |    8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -45,5 +45,5 @@ index b391ff3..a7565f0 100644
  
  enum SINK_STATES
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0003-Enable-true-1920x1080-output-without-upscaling-on-Am.patch

@@ -1,7 +1,7 @@
-From f1271c71370fbce8d18817ce32b677c005028c5c Mon Sep 17 00:00:00 2001
+From 15445c00a63921fde8c22a9229186d7cb8117778 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Wed, 16 Apr 2014 23:08:58 +0300
-Subject: [PATCH 03/16] Enable true 1920x1080 output without upscaling on
+Subject: [PATCH 03/17] Enable true 1920x1080 output without upscaling on
  Amlogic-based devices.
 
 ---
@@ -97,5 +97,5 @@ index cc34ff7..781a153 100644
    std::string m_framebuffer_name;
  };
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0004-Add-support-for-retrieval-of-CPU-temperature-on-Amlo.patch

@@ -1,7 +1,7 @@
-From f3eacd30d27fe7b354f263562a8f55a788b6e7a3 Mon Sep 17 00:00:00 2001
+From 904bd346a5b7ca168a1137768dae5c9c731d8127 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Tue, 22 Jul 2014 12:18:29 +0300
-Subject: [PATCH 04/16] Add support for retrieval of CPU temperature on
+Subject: [PATCH 04/17] Add support for retrieval of CPU temperature on
  Amlogic
 
 ---
@@ -55,5 +55,5 @@ index 71aa745..f80e7ba 100644
        ret++;
      }
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0005-Add-support-for-AV-CVBS-video-output-on-Amlogic.patch

@@ -1,7 +1,7 @@
-From 6b5a1dfa9f7f27d34ae95bf0db37499641f9ec92 Mon Sep 17 00:00:00 2001
+From ab1f9d62fe66bc66caf165a2928f0607777caf38 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Wed, 23 Jul 2014 22:23:34 +0300
-Subject: [PATCH 05/16] Add support for AV (CVBS) video output on Amlogic
+Subject: [PATCH 05/17] Add support for AV (CVBS) video output on Amlogic
 
 ---
  xbmc/utils/AMLUtils.cpp                     |   18 +++++++++++++
@@ -124,5 +124,5 @@ index 781a153..8042f36 100644
    std::string m_framebuffer_name;
  };
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0006-Fix-the-issue-when-the-video-display-is-disabled-aft.patch

@@ -1,7 +1,7 @@
-From 394f77b5139be0aac28bee73e4bdaa4d1888a97a Mon Sep 17 00:00:00 2001
+From 56d4e85af28b0d65859fb84bb6b6582bf3c71a7b Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Tue, 29 Jul 2014 10:31:07 +0300
-Subject: [PATCH 06/16] Fix the issue when the video display is disabled after
+Subject: [PATCH 06/17] Fix the issue when the video display is disabled after
  a resolution change
 
 ---
@@ -100,5 +100,5 @@ index 8042f36..2e52b7e 100644
  
  private:
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0007-aml-Update-all-virtual-consoles-when-changing-frameb.patch

@@ -1,7 +1,7 @@
-From 5a9688ac90c40bd16f31736463a83c63f3b4ef7a Mon Sep 17 00:00:00 2001
+From 780dc8555d1f66fc1c0eebf08d91788d36659bde Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Thu, 4 Sep 2014 00:28:23 +0300
-Subject: [PATCH 07/16] [aml] Update all virtual consoles when changing
+Subject: [PATCH 07/17] [aml] Update all virtual consoles when changing
  framebuffer geometry after a resolution change
 
 That helps to resolve the issue when framebuffer size is not always correctly change according to the resolution set.
@@ -23,5 +23,5 @@ index 2d5c4a1..1652226 100644
      }
      close(fd0);
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0008-Reorder-libraries-in-configure-script-to-prevent-lin.patch

@@ -1,7 +1,7 @@
-From 87957767f7470d19cd29295e20bbc0e1b50c6650 Mon Sep 17 00:00:00 2001
+From d81c2be6e702206b7c00e25be4ee0c0750f1b84d Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Mon, 8 Sep 2014 23:29:40 +0300
-Subject: [PATCH 08/16] Reorder libraries in configure script to prevent
+Subject: [PATCH 08/17] Reorder libraries in configure script to prevent
  linker errors when linking with libsmbclient
 
 Place libsmbclient before all other libraries to prevent linker errors when linking
@@ -13,7 +13,7 @@ libresolv.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.in b/configure.in
-index 226b084..1d80869 100644
+index ff4022f..079fa27 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1475,7 +1475,7 @@ fi
@@ -26,5 +26,5 @@ index 226b084..1d80869 100644
        use_samba=no;AC_MSG_ERROR($missing_library))
        USE_LIBSMBCLIENT=0
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0009-aml-Change-the-sample-rates-that-are-supported-by-AL.patch

@@ -1,7 +1,7 @@
-From 777bf932a8d4a75a2f7df74507557411d38d779f Mon Sep 17 00:00:00 2001
+From a98954cef067010982c83568dfba45da0d43fe4d Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Fri, 19 Sep 2014 01:55:12 +0300
-Subject: [PATCH 09/16] [aml] Change the sample rates that are supported by
+Subject: [PATCH 09/17] [aml] Change the sample rates that are supported by
  ALSA but unsupported by HDMI to the closest supported
  value
 
@@ -44,5 +44,5 @@ index 9f80c06..18303f8 100644
  
    unsigned int channelCount = inconfig.channels;
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0010-aml-Fill-audio-packets-completely-when-resampling-to.patch

@@ -1,11 +1,11 @@
-From 5f75109bfd3d8351165384aa3db26484ec4fd8f7 Mon Sep 17 00:00:00 2001
+From 554f4a769d67155cbdf6f45ba256b5700baa65c1 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Sat, 20 Sep 2014 04:43:52 +0300
-Subject: [PATCH 10/16] [aml] Fill audio packets completely when resampling to
+Subject: [PATCH 10/17] [aml] Fill audio packets completely when resampling to
  prevent 'audio data unaligned' kernel warnings
 
 ---
- .../Engines/ActiveAE/ActiveAEBuffer.cpp            |    4 ++++
+ xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp |    4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
@@ -25,5 +25,5 @@ index 3b0a015..ef431a4 100644
    m_empty = true;
    m_procSample = NULL;
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0011-aml-Use-fpsrate-and-fpsscale-instead-of-rfpsrate-and.patch

@@ -1,7 +1,7 @@
-From d88df3bce66c802ace8e7568873971eb6add012b Mon Sep 17 00:00:00 2001
+From e065d31b7bac0a3fffc0f05922613090cc573709 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Sun, 21 Sep 2014 17:17:14 +0300
-Subject: [PATCH 11/16] [aml] Use fpsrate and fpsscale instead of rfpsrate and
+Subject: [PATCH 11/17] [aml] Use fpsrate and fpsscale instead of rfpsrate and
  rfpsscale to detect framerate
 
 ---
@@ -116,5 +116,5 @@ index 24c1ab9..960aae1 100644
      return;
    }
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0012-Fix-incorrect-frame-rate-detection-of-some-videos-wi.patch

@@ -1,7 +1,7 @@
-From 5562574fd8f897f354621059c63dcd01bc30fbf5 Mon Sep 17 00:00:00 2001
+From c1992302a958e8b98ce5b0181434b800bf61e78e Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Sun, 21 Sep 2014 17:20:25 +0300
-Subject: [PATCH 12/16] Fix incorrect frame rate detection of some videos with
+Subject: [PATCH 12/17] Fix incorrect frame rate detection of some videos with
  variable frame rate.
 
 Use FFMPEG's r_frame_rate, if it as valid, as a video stream frame rate, otherwise use avg_frame_rate.
@@ -139,5 +139,5 @@ index de66625..d775d78 100644
    int width; // width of the stream reported by the demuxer
    float aspect; // display aspect as reported by demuxer
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0013-Save-settings-only-if-they-were-modified-after-the-l.patch

@@ -1,7 +1,7 @@
-From 3c1d67f9fd93eb8ed44a5ede7377ebeed7f0738b Mon Sep 17 00:00:00 2001
+From ada3250ecc3cb73b805027ac6761ca5576f748c3 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Sun, 19 Oct 2014 16:20:33 +0300
-Subject: [PATCH 13/16] Save settings only if they were modified after the
+Subject: [PATCH 13/17] Save settings only if they were modified after the
  last save
 
 This prevents from multiple saving the same settings and helps to resolve
@@ -42,5 +42,5 @@ index 3c981a4..0850bce 100644
  }
  
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0014-aml-Fix-periodic-video-stuttering-during-playback-of.patch

@@ -1,45 +0,0 @@
-From 1fcd45b43a06a49454c54b3a2d726d8b96c35640 Mon Sep 17 00:00:00 2001
-From: Alex Deryskyba <alex@codesnake.com>
-Date: Fri, 10 Oct 2014 23:56:59 +0300
-Subject: [PATCH 14/16] [aml] Fix periodic video stuttering during playback of
- some media files and streams
-
----
- xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp |   20 ++++++++------------
- 1 file changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
-index fcdad19..1b1e715 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
-@@ -2001,19 +2001,15 @@ void CAMLCodec::Process()
- 
-         double error = app_pts - (double)pts_video/PTS_FREQ;
-         double abs_error = fabs(error);
--        if (abs_error > 0.125)
-+        if (abs_error > 0.150)
-         {
--          //CLog::Log(LOGDEBUG, "CAMLCodec::Process pts diff = %f", error);
--          if (abs_error > 0.150)
--          {
--            // big error so try to reset pts_pcrscr
--            SetVideoPtsSeconds(app_pts);
--          }
--          else
--          {
--            // small error so try to avoid a frame jump
--            SetVideoPtsSeconds((double)pts_video/PTS_FREQ + error/4);
--          }
-+          // big error so try to reset pts_pcrscr
-+          SetVideoPtsSeconds(app_pts);
-+        }
-+        else
-+        {
-+          // small error so try to avoid a frame jump
-+          SetVideoPtsSeconds((double)pts_video/PTS_FREQ + error/4);
-         }
-       }
-     }
--- 
-1.7.9.5
-

projects/WeTek_Play/patches/kodi/0014-aml-Remove-dependency-on-libamplayer-and-amffmpeg.patch

@@ -1,7 +1,7 @@
-From 93d56bb5ecb6650365635636323d50a8940ba489 Mon Sep 17 00:00:00 2001
+From b5021bcce9b95aa9f9b37e6599945aa6bf019904 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Thu, 6 Nov 2014 08:14:39 +0200
-Subject: [PATCH 15/16] [aml] Remove dependency on libamplayer and amffmpeg
+Subject: [PATCH 14/17] [aml] Remove dependency on libamplayer and amffmpeg
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp  |   79 +-------------------
@@ -9,7 +9,7 @@ Subject: [PATCH 15/16] [aml] Remove dependency on libamplayer and amffmpeg
  2 files changed, 3 insertions(+), 79 deletions(-)
 
 diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
-index 1b1e715..00a0770 100644
+index fcdad19..f3c67ea 100644
 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
 +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
 @@ -50,9 +50,9 @@
@@ -175,5 +175,5 @@ index 960aae1..57f8e40 100644
      case AV_CODEC_ID_RV20:
      case AV_CODEC_ID_RV30:
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0015-aml-Add-some-key-mappings-for-HDMI-CEC.patch

@@ -1,7 +1,7 @@
-From 088faad814a85c970042650f2f97e201d828935b Mon Sep 17 00:00:00 2001
+From f8aeb55bea64fde80a63a88d5d7bad8fd2dde3d9 Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 Date: Sun, 2 Nov 2014 15:54:29 +0200
-Subject: [PATCH 16/16] [aml] Add some key mappings for HDMI CEC
+Subject: [PATCH 15/17] [aml] Add some key mappings for HDMI CEC
 
 ---
  xbmc/input/linux/LinuxInputDevices.cpp |    5 +++++
@@ -24,5 +24,5 @@ index 0b0f7ae..c84930f 100644
    { 384               , XBMCK_LEFT        }, // Red
    { 378               , XBMCK_RIGHT       }, // Green
 -- 
-1.7.9.5
+1.7.10.4
 

projects/WeTek_Play/patches/kodi/0016-aml-Disable-deinterlacing-for-HD-content-while-video.patch

@@ -0,0 +1,30 @@
+From fbc3b79cb960d559aad3e0c125b1094cfee3142c Mon Sep 17 00:00:00 2001
+From: Alex Deryskyba <alex@codesnake.com>
+Date: Tue, 3 Feb 2015 17:58:19 +0100
+Subject: [PATCH 16/17] [aml] Disable deinterlacing for HD content while video
+ is being played in a window to prevent screen
+ blinking in 1080p50/60hz display modes
+
+---
+ xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+index f3c67ea..0410bfa 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+@@ -2226,6 +2226,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)
+   CLog::Log(LOGDEBUG, "CAMLCodec::SetVideoRect:m_stereo_view(%d)", m_stereo_view);
+ #endif
+ 
++  if (dst_rect.Width() < display.Width() || dst_rect.Height() < display.Height())
++    aml_set_sysfs_int("/sys/module/di/parameters/bypass_hd", 1);
++  else
++    aml_set_sysfs_int("/sys/module/di/parameters/bypass_hd", 0);
++
+   // goofy 0/1 based difference in aml axis coordinates.
+   // fix them.
+   dst_rect.x2--;
+-- 
+1.7.10.4
+

projects/WeTek_Play/patches/kodi/0017-pivos-amcodec-hack-pvr-can-reopen-too-fast-slow-us-d.patch

@@ -0,0 +1,28 @@
+From 5ea60323c4d6648943e774946010251e0f560a8d Mon Sep 17 00:00:00 2001
+From: davilla <davilla@4pi.com>
+Date: Wed, 3 Sep 2014 22:14:01 -0400
+Subject: [PATCH 17/17] pivos: [amcodec-hack] pvr can reopen too fast, slow us
+ down a little
+
+---
+ xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+index 0410bfa..66ec4f7 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
+@@ -1632,6 +1632,10 @@ void CAMLCodec::CloseDecoder()
+   aml_set_sysfs_int("/sys/class/tsync/enable", 1);
+ 
+   ShowMainVideo(false);
++
++  // add a little delay after closing in case
++  // we are reopened too fast.
++  usleep(500 * 1000);
+ }
+ 
+ void CAMLCodec::Reset()
+-- 
+1.7.10.4
+

projects/WeTek_Play/patches/linux/10-revert_default_dvb_core_code.patch

@@ -48,6 +48,18 @@ diff -Naur a/drivers/media/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
  struct dmx_ts_feed {
  	int is_filtering; /* Set to non-zero when filtering in progress */
  	struct dmx_demux *parent; /* Back-pointer */
+diff -Naur a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
+--- a/drivers/media/dvb-core/dmxdev.c	2015-01-04 18:07:59.000000000 +0100
++++ b/drivers/media/dvb-core/dmxdev.c	2015-02-12 18:25:19.000000000 +0100
+@@ -1160,7 +1160,7 @@
+ 
+ 	switch (cmd) {
+ 	case DMX_SET_BUFFER_SIZE:
+-		ret = dvb_dvr_set_buffer_size(dmxdev, arg);
++		ret = dvb_dvr_set_buffer_size(dmxdev, arg);	
+ 		break;
+ 
+ 	default:
 diff -Naur a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
 --- a/drivers/media/dvb-core/dvbdev.c	2015-01-04 18:07:59.000000000 +0100
 +++ b/drivers/media/dvb-core/dvbdev.c	2014-12-20 18:25:15.000000000 +0100