xbmc: update to xbmc-14-dc75ad6, update FM support patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-08-02 00:53:49 +02:00
parent 8d6818e1a6
commit ef7a11baf2
3 changed files with 244 additions and 124 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="14-8975e83"
PKG_VERSION="14-dc75ad6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="14-8975e83"
PKG_VERSION="14-dc75ad6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,7 +1,7 @@
From 5a5ede6b4fb9e7d098b769831a93125bf1e74e9e Mon Sep 17 00:00:00 2001
From 88407b12f16fd9b37ac4fb0ef4fc01d4220d15fa Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:34:39 +0200
Subject: [PATCH 01/28] videoplayer: adapt lateness detection and dropping to
Subject: [PATCH 01/31] videoplayer: adapt lateness detection and dropping to
buffering
---
@ -643,13 +643,13 @@ index 296cae6..4795ca0 100644
};
--
1.9.3
2.0.3
From 9f842f7914c029a5f7370d61661c0d64a006d374 Mon Sep 17 00:00:00 2001
From 0c230eb40a84be37b75ff3524945858839733437 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Sep 2012 16:05:21 +0200
Subject: [PATCH 02/28] video player: present correct pts to user for a/v sync
Subject: [PATCH 02/31] video player: present correct pts to user for a/v sync
(after buffering in renderer)
---
@ -698,13 +698,13 @@ index 4795ca0..b60a0ee 100644
double GetOutputDelay(); /* returns the expected delay, from that a packet is put in queue */
--
1.9.3
2.0.3
From 516bdce5520f82cb1d21f759c6190a17b28294cd Mon Sep 17 00:00:00 2001
From 1b446083247a50ee640f3fbbbfba3269f5c3b1e9 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 1 Jun 2013 11:21:19 +0200
Subject: [PATCH 03/28] renderer: bump buffers to 5
Subject: [PATCH 03/31] renderer: bump buffers to 5
---
xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +-
@ -724,13 +724,13 @@ index fb41ccf..f5e5677 100644
class CSetting;
--
1.9.3
2.0.3
From e8172d64c9b9bfa96d7d93d81d4d172ea445914d Mon Sep 17 00:00:00 2001
From 9e4070c20193efe1130a26ada3580c436956b230 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:41:31 +0200
Subject: [PATCH 04/28] videoplayer: update frametime, it might change due to
Subject: [PATCH 04/31] videoplayer: update frametime, it might change due to
fps detection
---
@ -751,13 +751,13 @@ index 75c67a9..fb7ea06 100644
{
m_codecname = m_pVideoCodec->GetName();
--
1.9.3
2.0.3
From 1a79dd425b667624b364676b5c81c6d66313d0ed Mon Sep 17 00:00:00 2001
From c2a2ce71fef08fc39b24bad848cbb865b9229cf6 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:43:06 +0200
Subject: [PATCH 05/28] videoplayer: give streams with invalid fps a chance for
Subject: [PATCH 05/31] videoplayer: give streams with invalid fps a chance for
fps detection
---
@ -778,13 +778,13 @@ index fb7ea06..af7a443 100644
//reset the stored framerates if no good framerate was detected
m_fStableFrameRate = 0.0;
--
1.9.3
2.0.3
From b75f512474e2dd44ec517e3124278ffe5943e246 Mon Sep 17 00:00:00 2001
From 9679baba7fd0f000d11ff1c213480a48958a7f0a Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:49:05 +0200
Subject: [PATCH 06/28] dvdplayer: allow rewinding at end of stream, do a seek
Subject: [PATCH 06/31] dvdplayer: allow rewinding at end of stream, do a seek
after rewind
---
@ -818,13 +818,13 @@ index 93df78c..fbff9fd 100644
// audioplayer, stops outputing audio to audiorendere, but still tries to
// sleep an correct amount for each packet
--
1.9.3
2.0.3
From c817ce561845fac0b3095fd3d24ce67b2cc4ea6b Mon Sep 17 00:00:00 2001
From 48ed6dd5a189e4013ec4bdef193882d18f5a5fc3 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 16:06:39 +0200
Subject: [PATCH 07/28] dvdplayer: observe pts counter overflow
Subject: [PATCH 07/31] dvdplayer: observe pts counter overflow
---
.../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 197 ++++++++++++++++++++-
@ -1104,13 +1104,13 @@ index 08eb3df..dd89584 100644
};
--
1.9.3
2.0.3
From 476fe7b13425dbb0ec7bf349391208e69b58cf35 Mon Sep 17 00:00:00 2001
From a178c584cf800702210406c383d2cfa8ba582b34 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 13:02:10 +0200
Subject: [PATCH 08/28] dvdplayer: avoid short screen flicker caused by
Subject: [PATCH 08/31] dvdplayer: avoid short screen flicker caused by
unnecessary reconfigure of renderer
---
@ -1140,13 +1140,13 @@ index af7a443..cc6e88c 100644
|| ( m_output.extended_format != pPicture->extended_format )
|| ( m_output.color_matrix != pPicture->color_matrix && pPicture->color_matrix != 0 ) // don't reconfigure on unspecified
--
1.9.3
2.0.3
From c7191e1d002126d915602bcf5fdb10e0c2730634 Mon Sep 17 00:00:00 2001
From 775a19a406601c73266feefa98b151e102c1cee6 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 12:05:50 +0200
Subject: [PATCH 09/28] vdpau: advanced settings for auto deinterlacing
Subject: [PATCH 09/31] vdpau: advanced settings for auto deinterlacing
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++----
@ -1155,10 +1155,10 @@ Subject: [PATCH 09/28] vdpau: advanced settings for auto deinterlacing
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
index 3085c43..a39c686 100644
index 0c71532..345c442 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1971,10 +1971,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */)
@@ -1970,10 +1970,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */)
if (method == VS_INTERLACEMETHOD_AUTO)
{
int deint = -1;
@ -1209,13 +1209,13 @@ index 7e50a63..980138e 100644
bool m_videoVDPAUdeintSkipChromaHD;
bool m_musicUseTimeSeeking;
--
1.9.3
2.0.3
From 10fb6ddcadd91a132ad15192509833eedf02fcdf Mon Sep 17 00:00:00 2001
From 53ae554c72f826f6a65f94bb888c6c3e9f1db80c Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 2 Nov 2012 13:20:03 +0100
Subject: [PATCH 10/28] player: fix rewind
Subject: [PATCH 10/31] player: fix rewind
---
xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++-
@ -1427,13 +1427,13 @@ index b60a0ee..ecd2d20 100644
unsigned int m_dropRequests;
};
--
1.9.3
2.0.3
From eb9f0bc9eedf952a8e2419b27aa5cd5b06c0cb26 Mon Sep 17 00:00:00 2001
From d507617b934c83b13a1bc49e8885722f058e1b61 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Mar 2013 15:18:53 +0100
Subject: [PATCH 11/28] OMXPlayer: some caching fixes for pvr
Subject: [PATCH 11/31] OMXPlayer: some caching fixes for pvr
---
xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++-
@ -1454,13 +1454,13 @@ index 29ea4ae..0df8aba 100644
m_av_clock.OMXSetSpeed(speed);
m_av_clock.OMXPause();
--
1.9.3
2.0.3
From 069568590fb9167b15f4ad8d7e57831b5d229459 Mon Sep 17 00:00:00 2001
From 6873226a091f9ad66e72dbfd88dd6f608dd5adbe Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Mar 2013 20:50:59 +0100
Subject: [PATCH 12/28] fix incorrect display of fps when dr kicks in
Subject: [PATCH 12/31] fix incorrect display of fps when dr kicks in
---
xbmc/Application.cpp | 3 ++-
@ -1484,20 +1484,20 @@ index a25f44f..027172e 100644
g_renderManager.UpdateResolution();
--
1.9.3
2.0.3
From 112cb2ab870e5940eba7d787fa58b9912d57a62d Mon Sep 17 00:00:00 2001
From f6217d1f508d8bdd0c025f859936b474f3136f85 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 25 Jul 2013 17:18:13 +0200
Subject: [PATCH 13/28] ActiveAE: slightly reduce buffer size
Subject: [PATCH 13/31] ActiveAE: slightly reduce buffer size
---
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index d6a18f5..97986ec 100644
index fe5e893..c98c73b 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -32,8 +32,8 @@ using namespace ActiveAE;
@ -1512,13 +1512,13 @@ index d6a18f5..97986ec 100644
void CEngineStats::Reset(unsigned int sampleRate)
--
1.9.3
2.0.3
From 1be49f56fdf13b8597a915bbd01ca630c855aa03 Mon Sep 17 00:00:00 2001
From 6715696b126d772fa3553eaaa30f6ca110841a7c Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 4 Aug 2013 10:11:16 +0200
Subject: [PATCH 14/28] Revert "vdpau: comment some features that will be added
Subject: [PATCH 14/31] Revert "vdpau: comment some features that will be added
later"
This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf.
@ -1527,10 +1527,10 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf.
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
index a39c686..a7b6dea 100644
index 345c442..6d2e564 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1098,8 +1098,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
@@ -1097,8 +1097,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
m_bufferStats.IncDecoded();
m_vdpauOutput.m_dataPort.SendOutMessage(COutputDataProtocol::NEWFRAME, &pic, sizeof(pic));
@ -1540,7 +1540,7 @@ index a39c686..a7b6dea 100644
}
int retval = 0;
@@ -2295,8 +2294,7 @@ void CMixer::InitCycle()
@@ -2294,8 +2293,7 @@ void CMixer::InitCycle()
int flags;
uint64_t latency;
m_config.stats->GetParams(latency, flags);
@ -1550,7 +1550,7 @@ index a39c686..a7b6dea 100644
SetPostProcFeatures(false);
else
SetPostProcFeatures(true);
@@ -2308,8 +2306,7 @@ void CMixer::InitCycle()
@@ -2307,8 +2305,7 @@ void CMixer::InitCycle()
bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED;
m_SeenInterlaceFlag |= interlaced;
@ -1560,7 +1560,7 @@ index a39c686..a7b6dea 100644
(mode == VS_DEINTERLACEMODE_FORCE ||
(mode == VS_DEINTERLACEMODE_AUTO && interlaced)))
{
@@ -2331,8 +2328,7 @@ void CMixer::InitCycle()
@@ -2330,8 +2327,7 @@ void CMixer::InitCycle()
m_config.stats->SetCanSkipDeint(true);
}
@ -1571,13 +1571,13 @@ index a39c686..a7b6dea 100644
m_mixersteps = 1;
}
--
1.9.3
2.0.3
From 328fff986a26d63498bc36c7e709948a6802beb6 Mon Sep 17 00:00:00 2001
From a542f0f7139300e06423d761f558d40b910a5730 Mon Sep 17 00:00:00 2001
From: Marcel Groothuis <margro.xbmc@gmail.com>
Date: Thu, 5 Dec 2013 22:02:50 +0100
Subject: [PATCH 15/28] ffmpeg demuxer: faster channel change for PVR addons
Subject: [PATCH 15/31] ffmpeg demuxer: faster channel change for PVR addons
without internal demuxing (such as MediaPortal, ArgusTV, MythTV, NextPVR)
Credits: FernetMenta, Davilla, Popcornmix, Whaupt
@ -1946,13 +1946,13 @@ index ca689d0..f383563 100644
else
return NULL;
--
1.9.3
2.0.3
From c1010ea42b2953dfae1fec4744c25590ab058afd Mon Sep 17 00:00:00 2001
From fb1c1a317923b34030bf9b3a21a5d472c05a884c Mon Sep 17 00:00:00 2001
From: Wolfgang Haupt <w.haupt@at-visions.com>
Date: Thu, 5 Dec 2013 22:11:57 +0100
Subject: [PATCH 16/28] DVDFactoryDemuxer: skip streaminfo for udp tcp and
Subject: [PATCH 16/31] DVDFactoryDemuxer: skip streaminfo for udp tcp and
pvr-channels
---
@ -2073,13 +2073,13 @@ index 667f6d3..0094709 100644
static void AddSlashAtEnd(std::string& strFolder);
static bool HasSlashAtEnd(const std::string& strFile, bool checkURL = false);
--
1.9.3
2.0.3
From 52462d88fc5cbc6a8200c89cd92414bcb08c33d8 Mon Sep 17 00:00:00 2001
From 574b9866f6fb72511e6ca66b9944e8b18bbc4563 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 22 Dec 2013 14:52:29 +0100
Subject: [PATCH 17/28] linux: add shared lib for sse4 operations
Subject: [PATCH 17/31] linux: add shared lib for sse4 operations
---
Makefile.in | 8 ++-
@ -2094,7 +2094,7 @@ Subject: [PATCH 17/28] linux: add shared lib for sse4 operations
create mode 100644 xbmc/linux/sse4/Makefile.in
diff --git a/Makefile.in b/Makefile.in
index a21013f..edff0e5 100644
index cc0b40c..f471695 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -318,6 +318,12 @@ CHECK_LIBADD=@WAYLAND_TEST_LIBS@
@ -2120,10 +2120,10 @@ index a21013f..edff0e5 100644
externals: codecs libs visualizations screensavers libaddon pvraddons
diff --git a/configure.in b/configure.in
index 5f3bf00..d414f79 100644
index ce82cd4..a1abd70 100644
--- a/configure.in
+++ b/configure.in
@@ -841,6 +841,19 @@ elif test "$use_arch" = "arm"; then
@@ -843,6 +843,19 @@ elif test "$use_arch" = "arm"; then
fi
fi
@ -2143,7 +2143,7 @@ index 5f3bf00..d414f79 100644
# Checks for library functions.
AC_FUNC_ALLOCA
AC_FUNC_CHOWN
@@ -2553,6 +2566,10 @@ if test "$use_codec_libstagefright" = "yes"; then
@@ -2557,6 +2570,10 @@ if test "$use_codec_libstagefright" = "yes"; then
OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile"
fi
@ -2154,7 +2154,7 @@ index 5f3bf00..d414f79 100644
OUTPUT_FILES="$OUTPUT_FILES \
xbmc/interfaces/python/Makefile \
xbmc/interfaces/python/test/Makefile"
@@ -2630,6 +2647,7 @@ AC_SUBST(GTEST_CONFIGURED)
@@ -2634,6 +2651,7 @@ AC_SUBST(GTEST_CONFIGURED)
AC_SUBST(USE_DOXYGEN)
AC_SUBST(USE_PVR_ADDONS)
AC_SUBST(UPNP_DEFINES)
@ -2371,13 +2371,13 @@ index 0000000..45aa826
+
+include ../../../Makefile.include
--
1.9.3
2.0.3
From 527badec353673e66ff0ce3b774695bba8761bfa Mon Sep 17 00:00:00 2001
From df4f83ca42cf1648bc3a9beacee8805f598092b9 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 28 Jan 2014 10:05:26 +0100
Subject: [PATCH 18/28] xbmc pr 3080
Subject: [PATCH 18/31] xbmc pr 3080
---
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 8 ++++++++
@ -2403,13 +2403,13 @@ index 2c541f5..dce21e0 100644
* Setting it correctly would allow CorePNG decoding. */
avpkt.flags = AV_PKT_FLAG_KEY;
--
1.9.3
2.0.3
From d3013befe3c51966a4ef6e1a87e5493d93b29b11 Mon Sep 17 00:00:00 2001
From d14da2b136b5242cf2e31892320e00f5ac237b39 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 11 Feb 2014 18:15:06 +0100
Subject: [PATCH 19/28] ActiveAE: add some debug logging
Subject: [PATCH 19/31] ActiveAE: add some debug logging
---
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 6 ++++++
@ -2434,13 +2434,13 @@ index c61e9175..99c2faf 100644
return copied;
}
--
1.9.3
2.0.3
From d328434d69f05677c1eebfa316397479095cbe03 Mon Sep 17 00:00:00 2001
From 419b457b3eed7bbadcc9265de698a1aa68cf721e Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 13 Jun 2014 14:37:16 +0200
Subject: [PATCH 20/28] vaapi - postprocessing
Subject: [PATCH 20/31] vaapi - postprocessing
---
configure.in | 16 +-
@ -2453,18 +2453,18 @@ Subject: [PATCH 20/28] vaapi - postprocessing
.../VideoRenderers/VideoShaders/YUV2RGBShader.cpp | 5 +-
.../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 4 +-
.../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 21 +-
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 3212 +++++++++++++++++---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 3211 +++++++++++++++++---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h | 539 +++-
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 1 +
xbmc/settings/VideoSettings.h | 4 +
xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 3 +
15 files changed, 3466 insertions(+), 675 deletions(-)
15 files changed, 3466 insertions(+), 674 deletions(-)
diff --git a/configure.in b/configure.in
index d414f79..f2ed0a7 100644
index a1abd70..20633fe 100644
--- a/configure.in
+++ b/configure.in
@@ -1858,21 +1858,15 @@ if test "x$use_vaapi" != "xno"; then
@@ -1862,21 +1862,15 @@ if test "x$use_vaapi" != "xno"; then
USE_VAAPI=0
else
initial_val=$use_vaapi
@ -3150,10 +3150,10 @@ index dce21e0..95e648a 100644
pDvdVideoPicture->pts = DVD_NOPTS_VALUE;
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
index a788abd..93be338 100644
index e1637fa..93be338 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
@@ -22,535 +22,3011 @@
@@ -22,534 +22,3011 @@
#include "windowing/WindowingFactory.h"
#include "VAAPI.h"
#include "DVDVideoCodec.h"
@ -3960,7 +3960,6 @@ index a788abd..93be338 100644
+ FiniVAAPIOutput();
- avctx->hwaccel_context = m_hwaccel;
- avctx->thread_count = 1;
- avctx->get_buffer2 = GetBufferS;
- avctx->draw_horiz_band = NULL;
- avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
@ -7171,13 +7170,13 @@ index 760eda5..965f297 100644
/* remove unsupported methods */
for (StaticIntegerSettingOptions::iterator it = entries.begin(); it != entries.end(); )
--
1.9.3
2.0.3
From a8be3c23c078980ff16d211057d2f428ce71e318 Mon Sep 17 00:00:00 2001
From 01fe1bb2130c11bd8ea0a2ddbb3de0ae568d43e8 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Sun, 29 Jun 2014 14:45:28 +0200
Subject: [PATCH 21/28] VAAPI: Don't use swfilter for large surfaces - fallback
Subject: [PATCH 21/31] VAAPI: Don't use swfilter for large surfaces - fallback
to vaapi render
---
@ -7255,13 +7254,13 @@ index 93be338..4e1b136 100644
VASurfaceID surface = config.videoSurfaces->GetAtIndex(0);
VAStatus status = vaDeriveImage(config.dpy, surface, &image);
--
1.9.3
2.0.3
From 36966d8ad4af7226af969557b0cd3749d2b3294f Mon Sep 17 00:00:00 2001
From 418e2d3a9c5c92ca02348005a83ad5949f209959 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Sun, 29 Jun 2014 16:21:44 +0200
Subject: [PATCH 22/28] VAAPI: Fix fallback condition
Subject: [PATCH 22/31] VAAPI: Fix fallback condition
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 3 +--
@ -7282,37 +7281,13 @@ index 4e1b136..92b2f97 100644
return false;
--
1.9.3
2.0.3
From 1da4827e3714191a8591b44adb339377897a841c Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 17 Jul 2014 08:40:22 +0200
Subject: [PATCH 23/28] ffmpeg: bump to 2.3
---
tools/depends/target/ffmpeg/FFMPEG-VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION
index 33f458e..d394b94 100644
--- a/tools/depends/target/ffmpeg/FFMPEG-VERSION
+++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION
@@ -1,5 +1,5 @@
LIBNAME=ffmpeg
BASE_URL=https://github.com/xbmc/FFmpeg/archive
-VERSION=2.2-Helix-alpha2
+VERSION=2.3-Helix-alpha2
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
--
1.9.3
From 4ec32cd621eae4fa62f1c70345e8fba4b58947c7 Mon Sep 17 00:00:00 2001
From 6fdaf675b27ebc4282044478ec755d80bac72b91 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 18 Jul 2014 10:39:07 +0200
Subject: [PATCH 24/28] fast channel switch, make sure extradata is decoded
Subject: [PATCH 24/31] fast channel switch, make sure extradata is decoded
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 3 ++-
@ -7333,13 +7308,13 @@ index 6e2f585..7a44a1a 100644
// We are looking for an IDR frame
--
1.9.3
2.0.3
From 847bc934fc7ab7cd1442d17214140c2c01431521 Mon Sep 17 00:00:00 2001
From 0b185af12c454c36afaefa4db81cd3aa7ddf03cc Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 21 Jul 2014 08:53:07 +0200
Subject: [PATCH 26/28] vaapi: fix potential segfault, squash me later
Subject: [PATCH 25/31] vaapi: fix potential segfault, squash me later
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 +
@ -7358,13 +7333,13 @@ index 92b2f97..671e8a5 100644
default:
break;
--
1.9.3
2.0.3
From ed4f59a15784cf6dd4819d8450e8edcf6b334034 Mon Sep 17 00:00:00 2001
From b1bf55d5abde519fa711d61f4b9664dbfce4623e Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 22 Jul 2014 15:36:31 +0200
Subject: [PATCH 27/28] dvdplayer: get number of channels for active audio
Subject: [PATCH 26/31] dvdplayer: get number of channels for active audio
stream from audio player, ffmpeg demuxer does not update this info for codecs
like AAC
@ -7443,13 +7418,13 @@ index 2a1b564..ec9570a 100644
// holds stream information for current playing stream
CDVDStreamInfo m_streaminfo;
--
1.9.3
2.0.3
From db0490adfee7b5f39d389de119f42963f0e47d02 Mon Sep 17 00:00:00 2001
From 495c5b8970309ee38d6ae8ae927c02a7c17709a0 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Wed, 23 Jul 2014 15:07:37 +0200
Subject: [PATCH 28/28] ffmpeg demuxer: allow a stream change if pat/pmt was
Subject: [PATCH 27/31] ffmpeg demuxer: allow a stream change if pat/pmt was
not seen on open
---
@ -7476,5 +7451,150 @@ index 7a44a1a..9983d9e 100644
m_bPtsWrapChecked = false;
m_bPtsWrap = false;
--
1.9.3
2.0.3
From 66aadd770712c0658a032c79fab287a102c477e5 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 26 Jul 2014 09:54:06 +0200
Subject: [PATCH 28/31] ffmpeg: adapt depreciated attribute
max_analyze_duration
---
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
index 9983d9e..a8e1f7a 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -52,6 +52,10 @@
#include "URL.h"
#include "cores/FFmpeg.h"
+extern "C" {
+#include "libavutil/opt.h"
+}
+
struct StereoModeConversionMap
{
const char* name;
@@ -402,11 +406,11 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo)
// analyse very short to speed up mjpeg playback start
if (iformat && (strcmp(iformat->name, "mjpeg") == 0) && m_ioContext->seekable == 0)
- m_pFormatContext->max_analyze_duration = 500000;
+ av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
if (iformat && (strcmp(iformat->name, "mpegts") == 0))
{
- m_pFormatContext->max_analyze_duration = 500000;
+ av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
m_checkvideo = true;
}
@@ -418,7 +422,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo)
{
/* to speed up dvd switches, only analyse very short */
if(m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
- m_pFormatContext->max_analyze_duration = 500000;
+ av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
CLog::Log(LOGDEBUG, "%s - avformat_find_stream_info starting", __FUNCTION__);
int iErr = avformat_find_stream_info(m_pFormatContext, NULL);
--
2.0.3
From 98e4a94f1dfb752a3207ac1fc97988196a3ce2cf Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 26 Jul 2014 14:37:52 +0200
Subject: [PATCH 29/31] ffmpeg: fix deadlock caused by calling
avctx->thread_count after codec_open
---
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
index 671e8a5..7021031 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
@@ -554,7 +554,6 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned
}
avctx->hwaccel_context = &m_hwContext;
- avctx->thread_count = 1;
avctx->get_buffer2 = CDecoder::FFGetBuffer;
avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD;
return true;
--
2.0.3
From 8e2ba85b190fd11a5e3d360c63fd0ec98b70ac6b Mon Sep 17 00:00:00 2001
From: xhaggi <sascha.woo@gmail.com>
Date: Tue, 22 Jul 2014 11:45:53 +0200
Subject: [PATCH 30/31] [builtins] don't activate an already active window
---
xbmc/interfaces/Builtins.cpp | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
index 1816851..af6a6fd 100644
--- a/xbmc/interfaces/Builtins.cpp
+++ b/xbmc/interfaces/Builtins.cpp
@@ -391,9 +391,12 @@ int CBuiltins::Execute(const std::string& execString)
int iWindow = CButtonTranslator::TranslateWindow(strWindow);
if (iWindow != WINDOW_INVALID)
{
- // disable the screensaver
- g_application.WakeUpScreenSaverAndDPMS();
- g_windowManager.ActivateWindow(iWindow, params, execute != "activatewindow");
+ if (iWindow != g_windowManager.GetActiveWindow())
+ {
+ // disable the screensaver
+ g_application.WakeUpScreenSaverAndDPMS();
+ g_windowManager.ActivateWindow(iWindow, params, execute != "activatewindow");
+ }
}
else
{
@@ -416,19 +419,22 @@ int CBuiltins::Execute(const std::string& execString)
int iWindow = CButtonTranslator::TranslateWindow(strWindow);
if (iWindow != WINDOW_INVALID)
{
- // disable the screensaver
- g_application.WakeUpScreenSaverAndDPMS();
- vector<string> dummy;
- g_windowManager.ActivateWindow(iWindow, dummy, execute != "activatewindowandfocus");
-
- unsigned int iPtr = 1;
- while (params.size() > iPtr + 1)
+ if (iWindow != g_windowManager.GetActiveWindow())
{
- CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(),
- atol(params[iPtr].c_str()),
- (params.size() >= iPtr + 2) ? atol(params[iPtr + 1].c_str())+1 : 0);
- g_windowManager.SendMessage(msg);
- iPtr += 2;
+ // disable the screensaver
+ g_application.WakeUpScreenSaverAndDPMS();
+ vector<string> dummy;
+ g_windowManager.ActivateWindow(iWindow, dummy, execute != "activatewindowandfocus");
+
+ unsigned int iPtr = 1;
+ while (params.size() > iPtr + 1)
+ {
+ CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(),
+ atol(params[iPtr].c_str()),
+ (params.size() >= iPtr + 2) ? atol(params[iPtr + 1].c_str())+1 : 0);
+ g_windowManager.SendMessage(msg);
+ iPtr += 2;
+ }
}
}
else
--
2.0.3