diff --git a/packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-6b6e856.patch b/packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-39f578c.patch similarity index 98% rename from packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-6b6e856.patch rename to packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-39f578c.patch index 492ff8b3b4..bb436028a4 100644 --- a/packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-6b6e856.patch +++ b/packages/mediacenter/xbmc/patches/12.1.4/xbmc-995.01-xvba_support-39f578c.patch @@ -1,4 +1,4 @@ -From 371c47da0b14523fd3ca43dc7b7259723593536b Mon Sep 17 00:00:00 2001 +From c9075d67f9f25f070bab6a1fd9d50c11e4bc38dc Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:03:31 +0200 Subject: [PATCH 01/88] VideoRenerers: add buffering @@ -23,7 +23,7 @@ Subject: [PATCH 01/88] VideoRenerers: add buffering 16 files changed, 417 insertions(+), 100 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 22639ea..0aabb70 100644 +index 8f063ed..b52da5c 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2371,7 +2371,10 @@ void CApplication::Render() @@ -36,7 +36,7 @@ index 22639ea..0aabb70 100644 + } CTimeUtils::UpdateFrameTime(flip); - g_TextureManager.FreeUnusedTextures(); + g_renderManager.UpdateResolution(); diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h index f2aa227..eb654ec 100644 --- a/xbmc/cores/IPlayer.h @@ -952,10 +952,10 @@ index 2ab5684..f493ba7 100644 virtual unsigned int PreInit(); virtual void UnInit(); diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 0cd2510..dfb317f 100644 +index a844da1..2178ebd 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -4075,3 +4075,8 @@ bool CDVDPlayer::CachePVRStream(void) const +@@ -4094,3 +4094,8 @@ bool CDVDPlayer::CachePVRStream(void) const !g_PVRManager.IsPlayingRecording() && g_advancedSettings.m_bPVRCacheInDvdPlayer; } @@ -965,7 +965,7 @@ index 0cd2510..dfb317f 100644 + return m_clock.GetClock(absolute, interpolated); +} diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index d3c201e..093318e 100644 +index ebe0ce8..2d1b163 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -252,6 +252,8 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer @@ -1123,7 +1123,7 @@ index 3008c25..19496a7 100644 1.8.1.5 -From 1f98cce6a5ad1c2868ce2a65fef4edf96ae6b919 Mon Sep 17 00:00:00 2001 +From 4043fbd12da6db5f01dc5dc033f28311a1336802 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 08:32:18 +0100 Subject: [PATCH 02/88] add buffering for GLES @@ -1210,7 +1210,7 @@ index c6b69db..5bae10d 100644 1.8.1.5 -From 2f07bcddc82eb680d349beaa8dafc5ae81df3c84 Mon Sep 17 00:00:00 2001 +From 2a77913a5bf2973daa37827df9238b751333d355 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 16 Feb 2013 11:17:02 +0100 Subject: [PATCH 03/88] WinRenderer: add buffering @@ -1293,7 +1293,7 @@ index f493ba7..b3448ed 100644 1.8.1.5 -From 6980d499dbb5ac60896a7ebdfe580216738b460e Mon Sep 17 00:00:00 2001 +From 180fd94e4046a3687e5c341b72d3acaa370e011d Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 16 Feb 2013 11:17:32 +0100 Subject: [PATCH 04/88] DXVA: activate buffering in renderer @@ -1319,7 +1319,7 @@ index 19496a7..3bfe180 100644 1.8.1.5 -From 137710ba70a4082a72d8c50c4112cd61b98d5f24 Mon Sep 17 00:00:00 2001 +From b435db36cdd114056c19437d8194189c24072001 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 10:49:09 +0200 Subject: [PATCH 05/88] linuxrenderer: delete all textures on reconfigure @@ -1345,7 +1345,7 @@ index b32a7ea..a2dc2be 100644 1.8.1.5 -From 5cb6cbda0c123209396234d70fc96ce43acfd6e1 Mon Sep 17 00:00:00 2001 +From f15de3857c998108ee6ba2aad762ce3477b6e5e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:17:33 +0200 Subject: [PATCH 06/88] drop frame counter in application, ask render manager @@ -1359,7 +1359,7 @@ Subject: [PATCH 06/88] drop frame counter in application, ask render manager 4 files changed, 23 insertions(+), 45 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 0aabb70..5d94c7c 100644 +index b52da5c..72f6b58 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -419,8 +419,6 @@ @@ -1440,7 +1440,7 @@ index 0aabb70..5d94c7c 100644 } } -@@ -2381,13 +2363,6 @@ void CApplication::Render() +@@ -2379,13 +2361,6 @@ void CApplication::Render() g_renderManager.UpdateResolution(); g_renderManager.ManageCaptures(); @@ -1527,7 +1527,7 @@ index 96ab53f..1e44233 100644 1.8.1.5 -From 9b336ea3514f8bac3fec5697f14e9220a7473181 Mon Sep 17 00:00:00 2001 +From 6f7fd0575b10e79c930904fdc808895d01d3916d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 11:02:29 +0200 Subject: [PATCH 07/88] vaapi: adopt to buffering in renderer @@ -1588,7 +1588,7 @@ index 863edc4..417cbc0 100644 1.8.1.5 -From 8384c0d5b9f9e0a4d32db8614f4aab9c76f0fbe1 Mon Sep 17 00:00:00 2001 +From c9a5f257752eb0096e4c1db9f6814ac5aefae61c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 20:17:29 +0100 Subject: [PATCH 08/88] add buffering - some documentation @@ -1681,7 +1681,7 @@ index 1e44233..49da2ed 100644 1.8.1.5 -From 1708e30ded68b715882ec90ad72d6cb71b081ce3 Mon Sep 17 00:00:00 2001 +From 07265552cfcce1b03ba143e638674c1eff244d9c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 18 Feb 2013 10:42:00 +0100 Subject: [PATCH 09/88] RenderManager: only flip free buffer if player has @@ -1797,7 +1797,7 @@ index 49da2ed..afb6b1f 100644 1.8.1.5 -From 7d51ae1a8ef7b8546d46b247e13499ae4b7715f9 Mon Sep 17 00:00:00 2001 +From 3d5b7fbd018a86405e1411373b20e15d19a722bb Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 19 Feb 2013 09:06:22 +0100 Subject: [PATCH 10/88] move NUM_BUFFERS up to BaseRenderer.h @@ -1905,7 +1905,7 @@ index b3448ed..b099697 100644 1.8.1.5 -From db9a33ac36254e51a06593f8decd004224098302 Mon Sep 17 00:00:00 2001 +From 9dc409b6e103718f2e68a5dc2ba52f3bcc3d6de4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Feb 2013 09:55:00 +0100 Subject: [PATCH 11/88] OverlayRenderer: align buffers with index in @@ -2083,7 +2083,7 @@ index afb6b1f..3f95793 100644 1.8.1.5 -From 43a41ed14d31b8b5517e6860a465f7e3f3842a14 Mon Sep 17 00:00:00 2001 +From 11fd2b284e57f9d47c0d8de18591ef4ca166c537 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 26 Feb 2013 09:00:21 +0100 Subject: [PATCH 12/88] add buffering - submit absolute time to render buffers @@ -2201,10 +2201,10 @@ index 3f95793..858a547 100644 double m_presenttime; double m_presentcorr; diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index dfb317f..0cd2510 100644 +index 2178ebd..a844da1 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -4075,8 +4075,3 @@ bool CDVDPlayer::CachePVRStream(void) const +@@ -4094,8 +4094,3 @@ bool CDVDPlayer::CachePVRStream(void) const !g_PVRManager.IsPlayingRecording() && g_advancedSettings.m_bPVRCacheInDvdPlayer; } @@ -2214,7 +2214,7 @@ index dfb317f..0cd2510 100644 - return m_clock.GetClock(absolute, interpolated); -} diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 093318e..d3c201e 100644 +index 2d1b163..ebe0ce8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -252,8 +252,6 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer @@ -2243,7 +2243,7 @@ index 3bfe180..a90c141 100644 1.8.1.5 -From c330413204b1d127f74a1d9cb9dd577f4cee3462 Mon Sep 17 00:00:00 2001 +From 2624502f435b6182843e71163dd5996b555ba55d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 08:05:00 +0100 Subject: [PATCH 13/88] RenderManager: some rework, squash add buffering @@ -2310,7 +2310,7 @@ index a2001c0..09daaef 100644 1.8.1.5 -From ba28c236f2325504745341bd69b2f2a4082687bd Mon Sep 17 00:00:00 2001 +From 9bc38ca4b81113ba03c16f5a21f7d25c1733ae7a Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 08:07:07 +0100 Subject: [PATCH 14/88] dvdplayer: disable buffering unil dropping is improved @@ -2371,7 +2371,7 @@ index a90c141..c02bb96 100644 1.8.1.5 -From 12b0fa866c4fe674f553b6721f2f67654a0a0c0f Mon Sep 17 00:00:00 2001 +From 7f13945304c182ab98adcbf541cd75044494266b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:00:51 +0100 Subject: [PATCH 15/88] RenderManager: skip very late frames in render buffer @@ -2421,7 +2421,7 @@ index 09daaef..9897f1c 100644 1.8.1.5 -From 18dc1d1231fb086a8a53d635deb084e4459fe929 Mon Sep 17 00:00:00 2001 +From bbae767b68cd6e2bf2bea2abdd17adbf438bb5f4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:10:17 +0100 Subject: [PATCH 16/88] renderbuffers: drop enable/disable in this iteration @@ -2494,7 +2494,7 @@ index c02bb96..1d3c7e3 100644 1.8.1.5 -From 9c247b20b3bb7c661dc053286601c20d8bba6a22 Mon Sep 17 00:00:00 2001 +From fc67f618630b836fc822f834d6eb3b72263e2298 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 12:31:11 +0100 Subject: [PATCH 17/88] RenderManager: add method SetSpeed @@ -2599,7 +2599,7 @@ index 1d3c7e3..db4f7bd 100644 1.8.1.5 -From 6497df81fd5043a62602a64d077bc321d5b7d0fd Mon Sep 17 00:00:00 2001 +From 690c3b273bf67d4300d8ec56920def1af50d22c4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 10 Feb 2013 18:40:30 +0100 Subject: [PATCH 18/88] OMXPlayer: adapt to buffering @@ -2609,7 +2609,7 @@ Subject: [PATCH 18/88] OMXPlayer: adapt to buffering 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index fe86561..4c43e6c 100644 +index 7a903ad..7268531 100644 --- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp +++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp @@ -339,25 +339,16 @@ void OMXPlayerVideo::Output(int iGroupId, double pts, bool bDropPacket) @@ -2636,16 +2636,16 @@ index fe86561..4c43e6c 100644 - - m_iSleepEndTime = DVD_NOPTS_VALUE; + double pts_overlay = m_av_clock->OMXMediaTime(false) -+ + 2* (double)DVD_TIME_BASE / g_graphicsContext.GetFPS(); ++ + 2 * iFrameDuration; + ProcessOverlays(iGroupId, pts_overlay); - //m_av_clock->WaitAbsoluteClock((iCurrentClock + iSleepTime)); -+ double timestamp = CDVDClock::GetAbsoluteClock(false) + 2 / g_graphicsContext.GetFPS(); ++ double timestamp = (CDVDClock::GetAbsoluteClock(false) + 2 * iFrameDuration) / DVD_TIME_BASE; + g_renderManager.FlipPage(CThread::m_bStop, timestamp, -1, FS_NONE); } void OMXPlayerVideo::Process() -@@ -796,7 +787,7 @@ void OMXPlayerVideo::ResolutionUpdateCallBack(uint32_t width, uint32_t height) +@@ -790,7 +781,7 @@ void OMXPlayerVideo::ResolutionUpdateCallBack(uint32_t width, uint32_t height) if(!g_renderManager.Configure(width, height, iDisplayWidth, iDisplayHeight, m_fFrameRate, flags, format, 0, @@ -2658,7 +2658,7 @@ index fe86561..4c43e6c 100644 1.8.1.5 -From b1cbb33d1a94f39a6dfd240e497f951038ed27ec Mon Sep 17 00:00:00 2001 +From 1976656f66b5c11b133f8296e4d7fe3b8cf7dc08 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Mar 2013 20:42:10 +0100 Subject: [PATCH 19/88] overlays: squash to @@ -2757,7 +2757,7 @@ index dc984cf..1343a71 100644 1.8.1.5 -From 8c9125b145b837f99951abbab3eb65c9f6e59c36 Mon Sep 17 00:00:00 2001 +From 53b36d2c7a48f6f81af1e4834e06ef092c796dcb Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 Subject: [PATCH 20/88] videoplayer: adapt lateness detection and dropping to @@ -3374,7 +3374,7 @@ index fe7e12c..4913712 100644 1.8.1.5 -From ae200962c7b12d0b6493dfa4ced624a7f70f6765 Mon Sep 17 00:00:00 2001 +From 99e5dece6c1df30558b96f5982049ee8241e1cf5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 Subject: [PATCH 21/88] video player: present correct pts to user for a/v sync @@ -3468,7 +3468,7 @@ index 4913712..509d5f7 100644 1.8.1.5 -From 718bf177a582fbcfd47e2038cbdf92a96f8125f2 Mon Sep 17 00:00:00 2001 +From 2df29c4538fcf1caf5fe667216e05389e2f345ba Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 Subject: [PATCH 22/88] videoplayer: some rework and documentation @@ -3582,7 +3582,7 @@ index 8ac5a32..12b08ac 100644 1.8.1.5 -From 09149cb7d2f1ad6ad75ac1e8930d69030c9efde2 Mon Sep 17 00:00:00 2001 +From 0a0b16cd1a9c1f171a6707018d133244eafc65eb Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 1 Mar 2013 09:57:16 +0100 Subject: [PATCH 23/88] Revert "dvdplayer: disable buffering unit dropping is @@ -3645,7 +3645,7 @@ index 12b08ac..3297513 100644 1.8.1.5 -From d6f6ee55f62610c56ed1cad1a25a82d31bd40d9d Mon Sep 17 00:00:00 2001 +From 08eb228ed32bf34be1217a00fc15e685b516eff7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 Subject: [PATCH 24/88] videoplayer: update frametime, it might change due to @@ -3672,7 +3672,7 @@ index 3297513..8eb2eda 100644 1.8.1.5 -From da263c0b83590d2b49efa9fade7390c38099aa09 Mon Sep 17 00:00:00 2001 +From 3aea9f5d71a4ed377df72aeefbf1fb40d0946485 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 Subject: [PATCH 25/88] videoplayer: give streams with invalid fps a chance for @@ -3699,7 +3699,7 @@ index 8eb2eda..d004153 100644 1.8.1.5 -From 05e393dda78630adb5e40fa4dbed6073893e1bce Mon Sep 17 00:00:00 2001 +From 5c4b36158997fb72e261366ac07b2c4a279fc82f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 Subject: [PATCH 26/88] dvdplayer: allow rewinding at end of stream, do a seek @@ -3710,10 +3710,10 @@ Subject: [PATCH 26/88] dvdplayer: allow rewinding at end of stream, do a seek 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 0cd2510..3737419 100644 +index a844da1..d82e7da 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1542,7 +1542,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1549,7 +1549,7 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 @@ -3722,7 +3722,7 @@ index 0cd2510..3737419 100644 && m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts() && m_SpeedState.lasttime != GetTime()) { -@@ -2183,6 +2183,12 @@ void CDVDPlayer::HandleMessages() +@@ -2190,6 +2190,12 @@ void CDVDPlayer::HandleMessages() pvrinputstream->Pause( speed == 0 ); } @@ -3739,7 +3739,7 @@ index 0cd2510..3737419 100644 1.8.1.5 -From 249b24cd3bda9d427c1dcceb89ce69ddf580c760 Mon Sep 17 00:00:00 2001 +From dc61c6b640f4f432b54a8299ef362298380ad36e Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 Subject: [PATCH 27/88] vdpau: redesign @@ -9890,7 +9890,7 @@ index e7af3cb..2dd8a9f 100644 1.8.1.5 -From eec55a6168e20f46a63a7c408cf932e6e6457d74 Mon Sep 17 00:00:00 2001 +From 7a8ac0217661966ba16c5b9a8da597d7cc4fe76c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 Subject: [PATCH 28/88] vdpau: make interop gl default and remove setting, @@ -10048,7 +10048,7 @@ index d988598..2af9315 100644 1.8.1.5 -From f12af3f28d7074e76c718dd94ca58301c12e37f0 Mon Sep 17 00:00:00 2001 +From 8a5229565059456f6faa8890079d858adf88e197 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 18:34:47 +0100 Subject: [PATCH 29/88] vdpau: drop studio level conversion @@ -10234,7 +10234,7 @@ index 33467d9..4cec1b3 100644 1.8.1.5 -From f3b1f9824e0f0b0f5bd8f6a24c190967b82ed073 Mon Sep 17 00:00:00 2001 +From 49933a2ddb1c8c7d1be586a99ff1bed5ece3b93b Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 Subject: [PATCH 30/88] vdpau: observe ffmpeg tags for color space @@ -10341,7 +10341,7 @@ index 4d1559c..471ad68 100644 1.8.1.5 -From a0bcf33456b53c9bbcda36d10ce9146d717cd802 Mon Sep 17 00:00:00 2001 +From 85751be8be98832d48bf1d6ab57786885c9d8f55 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 27 Jan 2013 12:10:19 +0100 Subject: [PATCH 31/88] vdpau: switch off de-interlacing on ff @@ -10370,7 +10370,7 @@ index 34cc320..5de75ab 100644 1.8.1.5 -From 1f888b21be4870dba92cb1a261c791f9979ca966 Mon Sep 17 00:00:00 2001 +From 6916ab38aa593c746f9e3d9239513a7c89298940 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 2 Feb 2013 13:17:09 +0100 Subject: [PATCH 32/88] vdpau: fix mp4 part2 decoding, activate by default @@ -10428,7 +10428,7 @@ index 844f8e8..04a7c7c 100644 1.8.1.5 -From 4688a8f39fa763315faee214e8197fef9a9726d0 Mon Sep 17 00:00:00 2001 +From 21676c04dad9a0173e88bccd743940077b0679d5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 Subject: [PATCH 33/88] linuxrenderer: drop method RenderMultiPass @@ -10481,7 +10481,7 @@ index 329ddee..08f8234 100644 1.8.1.5 -From 1a8a1ede4a277d3e0e246a301ab0d71608fec825 Mon Sep 17 00:00:00 2001 +From 60bd58d96396ec67023c0a8f3ea520a5b72a1855 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 Subject: [PATCH 34/88] linuxrenderer: implement progressive weave for vdpau @@ -10612,7 +10612,7 @@ index 08f8234..13217ce 100644 1.8.1.5 -From dd87bbaa5e096f7daefe8e439fd54c90a3bd83af Mon Sep 17 00:00:00 2001 +From d118e6c6346c5b4ed5d2e55a60e8a5771665f4fb Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 Subject: [PATCH 35/88] X11: ditch SDL for video and window events @@ -10631,7 +10631,7 @@ Subject: [PATCH 35/88] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 5d94c7c..a4ec10d 100644 +index 72f6b58..8ec1d65 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -794,7 +794,7 @@ bool CApplication::CreateGUI() @@ -12099,7 +12099,7 @@ index 2dd8a9f..9616d17 100644 1.8.1.5 -From fd384c7f3570c1dc291372923c3a710bf6ed6a8c Mon Sep 17 00:00:00 2001 +From 5e7d62636fbab007800843cf996a7c17062693e9 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 Subject: [PATCH 36/88] X11: Add xbmc icon @@ -12291,7 +12291,7 @@ index 9616d17..debf714 100644 1.8.1.5 -From acadf4fb3993499540fa06bb6d8466cf7344e5e0 Mon Sep 17 00:00:00 2001 +From 5d72ad02cb4986a618688367dcbf359ae0a12deb Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 Subject: [PATCH 37/88] X11: add SDL joystick until we have a better solution @@ -12348,7 +12348,7 @@ index 24477ae..2ec86a8 100644 1.8.1.5 -From d09be92fa49276300db794b8e7a6f7aaf40ddd96 Mon Sep 17 00:00:00 2001 +From f505405de136a40edc66c94c1b2dc1ea5ea7e001 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 Subject: [PATCH 38/88] X11: factor out code handling device reset notification @@ -12414,7 +12414,7 @@ index debf714..8c28e3f 100644 1.8.1.5 -From 43d1d3b1a8e1878c2ea324b507e146cb45e36d21 Mon Sep 17 00:00:00 2001 +From 10b3cd2007ca9df5150d8551e4f3e84eaed5d283 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 Subject: [PATCH 39/88] X11: move xrandr events to WinEventsX11 @@ -12561,7 +12561,7 @@ index 70557d0..1cce843 100644 1.8.1.5 -From 682f85081cc169627a495e24536a45030076e3be Mon Sep 17 00:00:00 2001 +From be788a2cf6c247226835b07f1fd0a10677a89b9b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 Subject: [PATCH 40/88] xrandr: remove method RestoreState @@ -12643,7 +12643,7 @@ index 2a269d0..5b64633 100644 1.8.1.5 -From 1f368f7fed71094c91de304882a4e6cb95b36c62 Mon Sep 17 00:00:00 2001 +From da2144ac84c1975230d2fc9907c3324e0fe8cc07 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 Subject: [PATCH 41/88] xrandr: observe orientation @@ -12815,7 +12815,7 @@ index 5b64633..618bd68 100644 1.8.1.5 -From a1dc5ac80ccb6ff4e48075987248e887fba7064d Mon Sep 17 00:00:00 2001 +From 140b2dabcd03451e72f2d0b8cfccfaada65a275f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 Subject: [PATCH 42/88] xrandr: allow getting info for multiple screen's @@ -12993,7 +12993,7 @@ index 618bd68..0824af5 100644 1.8.1.5 -From 5e59bd5258a6390fb8b8258cbb2832b24e664c7e Mon Sep 17 00:00:00 2001 +From 2747bcafad56a31822bf7039195e10a6176b9525 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 Subject: [PATCH 43/88] X11: fix multi-head setups @@ -13728,7 +13728,7 @@ index 93cf5db..71034fc 100644 1.8.1.5 -From 032cd69a1c8ea5eccbe46787118ce26a2ee1f6a0 Mon Sep 17 00:00:00 2001 +From 61c6cbe95f8982658a6bae7413642e758863f5ac Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 Subject: [PATCH 44/88] X11: remove all DefaultScreen and RootWindow macros @@ -13799,7 +13799,7 @@ index f858f88..d192697 100644 1.8.1.5 -From 0ccb8aa4e116c98ab9b592337bdec933a97448b1 Mon Sep 17 00:00:00 2001 +From 3ea4403f5b66fac8550644e900a7ffc1620bdd5e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 Subject: [PATCH 45/88] X11: remove all DefaultScreen and RootWindow macros @@ -13874,7 +13874,7 @@ index 9785fe7..0004e07 100644 1.8.1.5 -From 3959adaf7e1ea39079fac59d28cea6da895fe50d Mon Sep 17 00:00:00 2001 +From 359516f5a3cf1a64b935a709a21bebe260680544 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 Subject: [PATCH 46/88] X11: recreate gl context after output has changed @@ -14028,7 +14028,7 @@ index d192697..0f2d1d2 100644 1.8.1.5 -From e667b22788bc91de725308a6b47aaeb3359d3c92 Mon Sep 17 00:00:00 2001 +From ee4f834670b196560d3237176f8c8fbf06c8ffd8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 Subject: [PATCH 47/88] X11: hook video reference clock in windowing @@ -14236,7 +14236,7 @@ index dcc4f09..7eb6317 100644 1.8.1.5 -From 80247befe0d208649a8b148944b3b309485cdcb3 Mon Sep 17 00:00:00 2001 +From 80aa803352136bf04a85e7bb209b367ec20b7f10 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 Subject: [PATCH 48/88] X11: fix video calibrations @@ -14344,7 +14344,7 @@ index cc28f56..c046c86 100644 1.8.1.5 -From 63048f89c495e78041361427f6d13406961d8893 Mon Sep 17 00:00:00 2001 +From 50d22113d58aba03b154bf8d4b0374977c40141e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 Subject: [PATCH 49/88] X11: deactivate screen saver on startup @@ -14417,7 +14417,7 @@ index c046c86..e953d2d 100644 1.8.1.5 -From 21c05c81343e519ea20bf51030a6c418010aff46 Mon Sep 17 00:00:00 2001 +From 96c3fa237209dd3cc7d3764ef5d755fa1d50345f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 Subject: [PATCH 50/88] X11: change method of going full-screen @@ -14464,7 +14464,7 @@ index b3e7ab5..91f92c1 100644 1.8.1.5 -From 9212003fae17bcab353bbe97bf3ee952e75dda29 Mon Sep 17 00:00:00 2001 +From fc32a0222216e9212bcea09d8f834c1fb8a9c2c6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 Subject: [PATCH 51/88] X11: reset key repeat and key modifier on focus lost @@ -14499,7 +14499,7 @@ index 6c22358..d86205d 100644 1.8.1.5 -From c4ee707bf959ff258b7ea04206eaa6d2c2677d35 Mon Sep 17 00:00:00 2001 +From 1163b8e69db2e504d4178b36a5c31b104675971e Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 Subject: [PATCH 52/88] X11: replace custom utf8 to unicode with charset @@ -14719,7 +14719,7 @@ index 6100933..72955ad 100644 1.8.1.5 -From 6aac957a645ffc1bab50f6c192cef4a2518af622 Mon Sep 17 00:00:00 2001 +From ca17e94876d4f97eb51284f8084de86069e28212 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 Subject: [PATCH 53/88] X11: fixed invalid usage of sizeof() (squash into x11 @@ -14786,7 +14786,7 @@ index 72955ad..102a076 100644 1.8.1.5 -From b8934342d7df312e13458a80391066c4126f29f3 Mon Sep 17 00:00:00 2001 +From 9c96d8e2725a84dde390c1a7b78beee18de51ead Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 Subject: [PATCH 54/88] add missing keys to xbmc keytable @@ -14812,7 +14812,7 @@ index aaf65ba..9d7922f 100644 1.8.1.5 -From fa735dd19b136620e982af6db7864f87d7f9c83e Mon Sep 17 00:00:00 2001 +From 4a3728b60c8290c0ee105e4ca7248f1b780d2f50 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 Subject: [PATCH 55/88] videorefclock: temp deactivate of nv settings @@ -14838,7 +14838,7 @@ index fa8e35a..85e36c7 100644 1.8.1.5 -From d4f8bf4e72e7bd94559f74faec4c4833ffe8b9bc Mon Sep 17 00:00:00 2001 +From ee1364f5bb58bb1c6678023c0ac27e0675ed04a9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 Subject: [PATCH 56/88] videorefclock: ask graphics context for refresh rate @@ -14872,7 +14872,7 @@ index 85e36c7..8209163 100644 1.8.1.5 -From 172d40e8404d636217b41692ffda28ee34e9626f Mon Sep 17 00:00:00 2001 +From 12aebdd0e2303ffdba2647a7d09d1ac24c48a8c7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 Subject: [PATCH 57/88] X11: fix icon texture after @@ -14983,7 +14983,7 @@ index 91f92c1..174ccef 100644 1.8.1.5 -From b6c42f32119b032ef359c9db98f2977c1c80305b Mon Sep 17 00:00:00 2001 +From f568193486b496bab8e016bccfb649e7f10c18c0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 Subject: [PATCH 58/88] X11: check for window manager @@ -15107,7 +15107,7 @@ index e953d2d..0b7c10a 100644 1.8.1.5 -From 5084e3e61675fa89ab0959a08935c3ac5993cc0c Mon Sep 17 00:00:00 2001 +From 735405acc67f62bd5ffae448a4f750344f7acb16 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 Subject: [PATCH 59/88] X11: dont set window on xrandr if no mode available @@ -15147,7 +15147,7 @@ index 4f1ae26..c11ea89 100644 1.8.1.5 -From e42fef16d3475bdfba4f1122ae14aaee78545e9d Mon Sep 17 00:00:00 2001 +From 180f70524c85667418ce0ed3094ba8b18402c295 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 Subject: [PATCH 60/88] X11: fix crash after a resolution change on startup @@ -15174,7 +15174,7 @@ index c11ea89..0bd72d4 100644 1.8.1.5 -From 5e994c0cd385f8ceda4135fef24ccbed7f1a99bd Mon Sep 17 00:00:00 2001 +From 5727d659489329f97ee0053397e1bb170d0dca18 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 Subject: [PATCH 61/88] X11: lock graphics context in NotifyXRREvent @@ -15200,7 +15200,7 @@ index 0bd72d4..ef83133 100644 1.8.1.5 -From 167663e44c9fb025ff64529659b739755ec2b72d Mon Sep 17 00:00:00 2001 +From 66ca5bbb4098ee285c47081f1eb3b77f79e131be Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 Subject: [PATCH 62/88] ffmpeg: add xvba hwaccel @@ -16076,7 +16076,7 @@ index f0d9c01..0f8cf7b 100644 1.8.1.5 -From f5e8b95f85c7ed230c6253e2642f18ce70715b38 Mon Sep 17 00:00:00 2001 +From 3efc5b89b3538e92ec9ceff3d4b2d7cdc8d7c4c0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 Subject: [PATCH 63/88] xvba: add decoder @@ -16102,7 +16102,7 @@ Subject: [PATCH 63/88] xvba: add decoder create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/configure.in b/configure.in -index 78104ad..4bf2f52 100644 +index 6565ed1..dd298b8 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" @@ -16127,7 +16127,7 @@ index 78104ad..4bf2f52 100644 AC_ARG_ENABLE([vdadecoder], [AS_HELP_STRING([--enable-vdadecoder], -@@ -1721,6 +1729,38 @@ else +@@ -1727,6 +1735,38 @@ else USE_CRYSTALHD=0 fi @@ -16166,7 +16166,7 @@ index 78104ad..4bf2f52 100644 # VDADecoder if test "x$use_vdadecoder" != "xno"; then if test "$host_vendor" = "apple" ; then -@@ -1932,6 +1972,12 @@ else +@@ -1938,6 +1978,12 @@ else final_message="$final_message\n CrystalHD:\tNo" fi @@ -16179,7 +16179,7 @@ index 78104ad..4bf2f52 100644 if test "x$use_vdadecoder" != "xno"; then final_message="$final_message\n VDADecoder:\tYes" else -@@ -2400,6 +2446,7 @@ AC_SUBST(USE_OPENGLES) +@@ -2406,6 +2452,7 @@ AC_SUBST(USE_OPENGLES) AC_SUBST(USE_VDPAU) AC_SUBST(USE_VAAPI) AC_SUBST(USE_CRYSTALHD) @@ -16187,7 +16187,7 @@ index 78104ad..4bf2f52 100644 AC_SUBST(USE_LIBSMBCLIENT) AC_SUBST(USE_LIBNFS) AC_SUBST(USE_LIBAFPCLIENT) -@@ -2582,6 +2629,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ +@@ -2588,6 +2635,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ `if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ `if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \ `if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \ @@ -19526,7 +19526,7 @@ index f25d10d..f6b1ea4 100644 1.8.1.5 -From 6ed1317a52a25107a70ef8066efc32636f64478b Mon Sep 17 00:00:00 2001 +From d49691b8cc4c3a5614e5a2eb8b2c761a263fc823 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 4 Nov 2012 16:24:10 +0100 Subject: [PATCH 64/88] xvba: add string for available decoders - we are @@ -19556,7 +19556,7 @@ index 0cea7a9..6fb74b7 100644 1.8.1.5 -From 1954285997005efabdab1767801cce099ccf8583 Mon Sep 17 00:00:00 2001 +From 6ccded13aa8872b24e1302b7d937968df4c4c6ca Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 Subject: [PATCH 65/88] xvba: do not use vaapi if xvba is present @@ -19589,7 +19589,7 @@ index a2b9195..43a05b3 100644 1.8.1.5 -From 585eacfbd0a50fc121351112ede57bfadd79dffc Mon Sep 17 00:00:00 2001 +From a4dd0e7ac5bedef2f97f50487be976aac63d3440 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 Subject: [PATCH 66/88] ffmpeg: add av_find_default_stream_index to interface @@ -19638,18 +19638,18 @@ index 9bda3f3..bf31fcb 100644 1.8.1.5 -From 9f4ba7941d92a5fe4c0ac5e40f476171020b480b Mon Sep 17 00:00:00 2001 +From 4b540cb1271f16d11e16ad6cb55e275caac6517b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 Subject: [PATCH 67/88] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- - xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 4 + - 2 files changed, 201 insertions(+), 1 deletion(-) + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 3 + + 2 files changed, 200 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -index 7c0ab03..f91be3c 100644 +index 35d0fc5..97d963a 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -18,13 +18,13 @@ @@ -19667,7 +19667,7 @@ index 7c0ab03..f91be3c 100644 #ifdef _LINUX #include "stdint.h" #endif -@@ -495,6 +495,9 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput) +@@ -499,6 +499,9 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput) AddStream(i); } @@ -19677,7 +19677,7 @@ index 7c0ab03..f91be3c 100644 return true; } -@@ -605,6 +608,12 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num) +@@ -603,6 +606,12 @@ double CDVDDemuxFFmpeg::ConvertTimestamp(int64_t pts, int den, int num) if (pts == (int64_t)AV_NOPTS_VALUE) return DVD_NOPTS_VALUE; @@ -19690,7 +19690,7 @@ index 7c0ab03..f91be3c 100644 // do calculations in floats as they can easily overflow otherwise // we don't care for having a completly exact timestamp anyway double timestamp = (double)pts * num / den; -@@ -729,6 +738,24 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() +@@ -725,6 +734,24 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() pkt.pts = AV_NOPTS_VALUE; } @@ -19715,7 +19715,7 @@ index 7c0ab03..f91be3c 100644 // copy contents into our own packet pPacket->iSize = pkt.size; -@@ -845,10 +872,20 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -839,10 +866,20 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) int ret; { CSingleLock lock(m_critSection); @@ -19736,7 +19736,7 @@ index 7c0ab03..f91be3c 100644 } if(m_iCurrentPts == DVD_NOPTS_VALUE) -@@ -867,6 +904,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) +@@ -861,6 +898,165 @@ bool CDVDDemuxFFmpeg::SeekTime(int time, bool backwords, double *startpts) return (ret >= 0); } @@ -19901,9 +19901,9 @@ index 7c0ab03..f91be3c 100644 + bool CDVDDemuxFFmpeg::SeekByte(int64_t pos) { - g_demuxer.set(this); + CSingleLock lock(m_critSection); diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h -index 2b5f2e8..e0acf29 100644 +index acef490..72ecc52 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h @@ -97,6 +97,7 @@ class CDVDDemuxFFmpeg : public CDVDDemux @@ -19914,20 +19914,19 @@ index 2b5f2e8..e0acf29 100644 bool SeekByte(int64_t pos); int GetStreamLength(); CDemuxStream* GetStream(int iStreamId); -@@ -141,5 +142,8 @@ class CDVDDemuxFFmpeg : public CDVDDemux +@@ -141,5 +142,7 @@ class CDVDDemuxFFmpeg : public CDVDDemux unsigned m_program; XbmcThreads::EndTime m_timeout; + bool m_bPtsWrap, m_bPtsWrapChecked; + int64_t m_iStartTime, m_iMaxTime, m_iEndTime; -+ }; -- 1.8.1.5 -From 310484992451576db827010ed3a1bf8dbeb4798c Mon Sep 17 00:00:00 2001 +From 7546bc1f9a703980e231cffc92a05fe4907113f1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 Subject: [PATCH 68/88] dvdplayer: avoid short screen flicker caused by @@ -19963,7 +19962,7 @@ index 1e5d2ac5..69f45d4 100644 1.8.1.5 -From 16bd756474f3e1b5c6d1234908b0f7f034af2e9a Mon Sep 17 00:00:00 2001 +From fe2a9dd659621ae8e6673c423139eef99e1e02b3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 Subject: [PATCH 69/88] vdpau: advanced settings for auto deinterlacing @@ -20032,7 +20031,32 @@ index 72718e5..aaa4702 100644 1.8.1.5 -From b1c80c0544b7ab6d0aa8b4ad1a19533c6bb685bd Mon Sep 17 00:00:00 2001 +From 47de1b833f9ab9f1e9fdfe7e4430750d180c505f Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Thu, 11 Oct 2012 13:01:08 +0200 +Subject: [PATCH 70/88] dvdplayer: correct determination if video is playing + +--- + xbmc/cores/dvdplayer/DVDPlayer.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp +index d82e7da..34df2f4 100644 +--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp ++++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp +@@ -2392,6 +2392,7 @@ bool CDVDPlayer::HasVideo() const + return m_HasVideo; + } + ++ + bool CDVDPlayer::HasAudio() const + { + return m_HasAudio; +-- +1.8.1.5 + + +From 27653714e7f74ed5896defcd8aa5e54214ce2bf4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 Subject: [PATCH 71/88] player: fix rewind @@ -20083,10 +20107,10 @@ index 30b2f5c..b9831d4 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 890d99e..d02f086 100644 +index 34df2f4..82a367d 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -1543,11 +1543,13 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1550,11 +1550,13 @@ void CDVDPlayer::HandlePlaySpeed() } else if (m_CurrentVideo.id >= 0 && (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file @@ -20101,7 +20125,7 @@ index 890d99e..d02f086 100644 // check how much off clock video is when ff/rw:ing // a problem here is that seeking isn't very accurate // and since the clock will be resynced after seek -@@ -1566,7 +1568,7 @@ void CDVDPlayer::HandlePlaySpeed() +@@ -1573,7 +1575,7 @@ void CDVDPlayer::HandlePlaySpeed() { CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up"); int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL); @@ -20110,7 +20134,7 @@ index 890d99e..d02f086 100644 } } } -@@ -2030,7 +2032,7 @@ void CDVDPlayer::HandleMessages() +@@ -2037,7 +2039,7 @@ void CDVDPlayer::HandleMessages() if(!m_pSubtitleDemuxer->SeekTime(time, msg.GetBackward())) CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time); } @@ -20119,7 +20143,7 @@ index 890d99e..d02f086 100644 } else CLog::Log(LOGWARNING, "error while seeking"); -@@ -2168,9 +2170,10 @@ void CDVDPlayer::HandleMessages() +@@ -2175,9 +2177,10 @@ void CDVDPlayer::HandleMessages() double offset; offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -20131,7 +20155,7 @@ index 890d99e..d02f086 100644 m_State.timestamp = CDVDClock::GetAbsoluteClock(); } -@@ -2186,7 +2189,8 @@ void CDVDPlayer::HandleMessages() +@@ -2193,7 +2196,8 @@ void CDVDPlayer::HandleMessages() // do a seek after rewind, clock is not in sync with current pts if (m_playSpeed < 0 && speed >= 0) { @@ -20141,7 +20165,7 @@ index 890d99e..d02f086 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -3140,7 +3144,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3142,7 +3146,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -20150,7 +20174,7 @@ index 890d99e..d02f086 100644 { double startpts; if(accurate) -@@ -3152,19 +3156,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3154,19 +3158,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -20178,7 +20202,7 @@ index 890d99e..d02f086 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3208,7 +3216,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3210,7 +3218,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -20188,7 +20212,7 @@ index 890d99e..d02f086 100644 UpdatePlayState(0); } diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index d3c201e..70ecea9 100644 +index ebe0ce8..d0a8bbc 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -310,7 +310,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer @@ -20267,7 +20291,7 @@ index 509d5f7..7cddda7 100644 1.8.1.5 -From d076e9767c434787e5aff94d409f9e6a6eb25ee9 Mon Sep 17 00:00:00 2001 +From 6d9144f181ce400ac5349678eeee9332eaf34ece Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 Subject: [PATCH 72/88] xrandr: fix query for multiple screens @@ -20311,7 +20335,7 @@ index cc933b9..533e03d 100644 1.8.1.5 -From 8417fda6ad107d4ae3b03f627b5d632acd2f425a Mon Sep 17 00:00:00 2001 +From cde9b9704719b3d25411720bd4726856105871f2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 Subject: [PATCH 73/88] X11: add debug log to print out refresh after xrr event @@ -20341,7 +20365,7 @@ index ef83133..76c6362 100644 1.8.1.5 -From f9d195799c457e9e17dd263aeb4042d2d89471cc Mon Sep 17 00:00:00 2001 +From 88f925ad13bddfb1559c6d8295fb20bfc54f25eb Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 Subject: [PATCH 74/88] X11: dont call XCloseDisplay on shutdown, it crashes @@ -20369,7 +20393,7 @@ index 76c6362..e4e25b2 100644 1.8.1.5 -From ff01dc2931958d9a29c17fb7fe08fef858b48b6e Mon Sep 17 00:00:00 2001 +From 102dd707f588687b2b1b67124e5f0424811a573a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 Subject: [PATCH 75/88] x11: support for multiple x screens @@ -20395,7 +20419,7 @@ index 533e03d..7a16488 100644 1.8.1.5 -From cbbf172b193f1b1e70f48c880ba3c8cfa228097b Mon Sep 17 00:00:00 2001 +From 944a67c658520f466de3cbed28fdb8eb5ef68a61 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 20 Dec 2012 19:35:38 +0100 Subject: [PATCH 76/88] fix compile error after recent change @@ -20421,7 +20445,7 @@ index b9f18e4..cacb32a 100644 1.8.1.5 -From fbffd910ebe5cc247e04f9179bd6d737380b05e7 Mon Sep 17 00:00:00 2001 +From e0d65f3611c34c1961d094fea46f81d286aae305 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 Subject: [PATCH 77/88] pvr: increase changes counter of stream on stream @@ -20458,7 +20482,7 @@ index 8c984f6..034e545 100644 1.8.1.5 -From 45a473289401e87fc4f88108ce33826c64b7d14e Mon Sep 17 00:00:00 2001 +From 4537ef89fdd2d68fe4f9e6e2c548efaf0b38229d Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 Subject: [PATCH 78/88] X11: add keymapping for XF86XK_Sleep @@ -20483,7 +20507,7 @@ index c31877e..ed31c04 100644 1.8.1.5 -From 6d677ef21716824d8dc55005d0c0d82865479f9e Mon Sep 17 00:00:00 2001 +From d7ceba4c1b9400d9fc9c086e7fa57702a47d21a2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 Subject: [PATCH 79/88] X11: remove toggle full screen after resume @@ -20512,7 +20536,7 @@ index a5534c9..7e2ddc6 100644 1.8.1.5 -From e357259f9a059fdcb0cfe0a464aa098ed2a64861 Mon Sep 17 00:00:00 2001 +From 73380917b7ae5019d5ed3fbce7d8a7d2292a4f6d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 Subject: [PATCH 80/88] xrandr: set screen on mode change command @@ -20538,7 +20562,7 @@ index 7a16488..6531ba3 100644 1.8.1.5 -From e6d8e6fb213d865da33f1358a08601ded8017e82 Mon Sep 17 00:00:00 2001 +From 42bd86b1d0f67b5c80a578b79613794c597f0b92 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 Subject: [PATCH 81/88] X11: recreate glx context when output changes @@ -20592,7 +20616,7 @@ index 0b7c10a..33b1739 100644 1.8.1.5 -From 552750dfe22ea24e87b7e34f1bdc9531c1518051 Mon Sep 17 00:00:00 2001 +From ef19ca21fa6bff9f81b67418faff9e275d729b75 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Jan 2013 15:16:38 +0100 Subject: [PATCH 82/88] multi-screen: fix compilation on windows @@ -20668,7 +20692,7 @@ index cacb32a..cbf0acb 100644 1.8.1.5 -From 3d58b5c8775cd2ee7db52defe5201f709e451647 Mon Sep 17 00:00:00 2001 +From 055b0c0e9d249c404ddc0caa16b8674b97ca288d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 Subject: [PATCH 83/88] pvr: do not show selection dialog for a single menu @@ -20679,10 +20703,10 @@ Subject: [PATCH 83/88] pvr: do not show selection dialog for a single menu 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp -index ae11936..69d8b0d 100644 +index 6e772a4..9fd9537 100644 --- a/xbmc/pvr/addons/PVRClients.cpp +++ b/xbmc/pvr/addons/PVRClients.cpp -@@ -717,16 +717,19 @@ void CPVRClients::ProcessMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat) +@@ -715,16 +715,19 @@ void CPVRClients::ProcessMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat) if (GetConnectedClient(iClientID, client) && client->HaveMenuHooks(cat)) { hooks = client->GetMenuHooks(); @@ -20714,7 +20738,7 @@ index ae11936..69d8b0d 100644 1.8.1.5 -From 99ad5025648cb96a4d7e7426875bc80266f14ca9 Mon Sep 17 00:00:00 2001 +From dde5a123faf602bbf314ba4684cadeb79f69632d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 Subject: [PATCH 84/88] X11: use default screen parameters if no output @@ -20821,7 +20845,7 @@ index b87e264..3cadd13 100644 1.8.1.5 -From ef6533b1a6f83cce56ac6e6e8cbee8cf469b2c16 Mon Sep 17 00:00:00 2001 +From a27eaa2d346de9af57e1de19fca1390ca9bd485c Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 25 Feb 2013 08:47:10 +0100 Subject: [PATCH 85/88] vdpau: release more resources on pre-cleanup @@ -20962,7 +20986,7 @@ index 471ad68..e33b6f5 100644 1.8.1.5 -From 5d68fc5b17c40590390449d2e192fa9c152e70e6 Mon Sep 17 00:00:00 2001 +From 8e6a1d5fb438ba9f1b4502d31e6e00fa29bf8d6a Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 5 Mar 2013 17:01:53 +0100 Subject: [PATCH 86/88] LinuxRendererGL: do not upscale if source equals dest @@ -20994,7 +21018,7 @@ index 0bb924b..b5b0838 100644 1.8.1.5 -From a700248019c5a565aa9879fc9ee6c34fc67d6974 Mon Sep 17 00:00:00 2001 +From 7a7085a36ebfcc04dfbc8c4512e7847b6f76ff9d Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 6 Mar 2013 07:35:10 +0100 Subject: [PATCH 87/88] vdpau: set deinterlacing method to auto, if default @@ -21029,7 +21053,7 @@ index 38ef375..b69ae8c 100644 1.8.1.5 -From 6b6e85640899317290649d8d577e2fe8287236ea Mon Sep 17 00:00:00 2001 +From 39f578cafa3018fdf90d48d9a78c31a26b95cd8c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Mar 2013 14:04:15 +0100 Subject: [PATCH 88/88] buffering: do not drop in RenderManager