xbmc: update to xbmc-14-4fbeb1b, update FM support patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-10-15 01:04:29 +02:00
parent c0e74ae4b6
commit ecddc9b9b3
5 changed files with 689 additions and 908 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="14-fa7c4bb"
PKG_VERSION="14-4fbeb1b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="14-fa7c4bb"
PKG_VERSION="14-4fbeb1b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +0,0 @@
From 6e5461cc577376fe6efa291549d6987883a07123 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 21 Sep 2014 19:26:42 +0300
Subject: [PATCH] AEStreamInfo: Handle sync headers with extension blocks
Fixes passthrough of Dolby TrueHD audio with Atmos.
Behavior based on FFmpeg patch "mlpdec: support major sync headers with
optional extension blocks" by Hendrik Leppkes.
---
xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
index 08e375b..73b84f3 100644
--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
@@ -666,10 +666,21 @@ unsigned int CAEStreamInfo::SyncTrueHD(uint8_t *data, unsigned int size)
if (rate == 0xF)
continue;
+ unsigned int major_sync_size = 28;
+ if (data[29] & 1)
+ {
+ /* extension(s) present, look up count */
+ int extension_count = data[30] >> 4;
+ major_sync_size += 2 + extension_count * 2;
+ }
+
+ if (left < 4 + major_sync_size)
+ return skip;
+
/* verify the crc of the audio unit */
- uint16_t crc = av_crc(m_crcTrueHD, 0, data + 4, 24);
- crc ^= (data[29] << 8) | data[28];
- if (((data[31] << 8) | data[30]) != crc)
+ uint16_t crc = av_crc(m_crcTrueHD, 0, data + 4, major_sync_size - 4);
+ crc ^= (data[4 + major_sync_size - 3] << 8) | data[4 + major_sync_size - 4];
+ if (((data[4 + major_sync_size - 1] << 8) | data[4 + major_sync_size - 2]) != crc)
continue;
/* get the sample rate and substreams, we have a valid master audio unit */

View File

@ -1,43 +0,0 @@
commit 3f472ab8a09d2dfc724fa667646ce47159d8c166
Author: wolfgar <stephan.rafin@laposte.net>
Date: Thu Sep 25 02:50:27 2014 +0200
Undef EGL_KHR_reusable_sync when imx support is enabled as
egl*SyncKHR declarations will conflict
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
index 1300a7f..c747118 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
@@ -79,23 +79,25 @@ static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
#endif
-#if defined(EGL_KHR_reusable_sync)
-static PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR;
-static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR;
-static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR;
-#endif
-
#ifdef HAS_IMXVPU
#include "windowing/egl/EGLWrapper.h"
#include "DVDCodecs/Video/DVDVideoCodecIMX.h"
#define GL_VIV_NV12 0x8FC1
+#undef EGL_KHR_reusable_sync
typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVMAPPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical);
typedef void (GL_APIENTRYP PFNGLTEXDIRECTINVALIDATEVIVPROC) (GLenum Target);
static PFNGLTEXDIRECTVIVMAPPROC glTexDirectVIVMap;
static PFNGLTEXDIRECTINVALIDATEVIVPROC glTexDirectInvalidateVIV;
#endif
+#if defined(EGL_KHR_reusable_sync)
+static PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR;
+static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR;
+static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR;
+#endif
+
+
#if defined(TARGET_ANDROID)
#include "DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h"
#endif