From d4f7f9dbbcd3abec1c3aebb6c7c553b5abbcb792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 3 Feb 2016 11:01:07 +0200 Subject: RHEL 7.1: Enabling make check Blacklisting those test cases which were blackisted for RedHat 6.6 and which are not passing on RedHat 7.1 either Change-Id: I6750b7a6ed3305829153a4cce7714b0e969f0a98 Reviewed-by: Heikki Halmet Reviewed-by: Yoann Lopes --- tests/auto/integration/qaudiooutput/BLACKLIST | 1 + tests/auto/integration/qmediaplayerbackend/BLACKLIST | 1 + tests/auto/integration/qsoundeffect/BLACKLIST | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST index e640ef926..4d45efe06 100644 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ b/tests/auto/integration/qaudiooutput/BLACKLIST @@ -1,4 +1,5 @@ [pullSuspendResume] redhatenterpriselinuxworkstation-6.6 +rhel-7.1 ubuntu-14.04 opensuse-13.1 64bit diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index 9f0d4b746..b55c167ac 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -21,6 +21,7 @@ windows 64bit developer-build [playPauseStop] opensuse-13.1 64bit redhatenterpriselinuxworkstation-6.6 +rhel-7.1 ubuntu-14.04 64bit windows 64bit developer-build diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST index f290cc8ff..1feeb4b5f 100644 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ b/tests/auto/integration/qsoundeffect/BLACKLIST @@ -3,4 +3,5 @@ [testLooping] ubuntu-14.04 64bit redhatenterpriselinuxworkstation-6.6 +rhel-7.1 opensuse-13.1 -- cgit v1.2.3 From 59629bef84af3fd817de1b3724189f45bacc5aea Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 1 Feb 2016 17:29:43 +0100 Subject: Windows EVR: fix EndOfStream event never being sent. This was causing QMediaPlayer to never go into the EndOfMedia state. Task-number: QTBUG-50814 Change-Id: I8920cf93db37a834f67b9e0b4abcf5a4934dfe0e Reviewed-by: Christian Stromme --- src/plugins/common/evr/evrcustompresenter.cpp | 28 +++++++-------------------- src/plugins/common/evr/evrcustompresenter.h | 4 ++-- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/plugins/common/evr/evrcustompresenter.cpp b/src/plugins/common/evr/evrcustompresenter.cpp index 73d032aa6..3afd2342f 100644 --- a/src/plugins/common/evr/evrcustompresenter.cpp +++ b/src/plugins/common/evr/evrcustompresenter.cpp @@ -248,6 +248,12 @@ HRESULT Scheduler::flush() return S_OK; } +bool Scheduler::areSamplesScheduled() +{ + QMutexLocker locker(&m_mutex); + return m_scheduledSamples.count() > 0; +} + HRESULT Scheduler::scheduleSample(IMFSample *sample, bool presentNow) { if (!m_schedulerThread) @@ -441,7 +447,6 @@ DWORD Scheduler::schedulerThreadProcPrivate() SamplePool::SamplePool() : m_initialized(false) - , m_pending(0) { } @@ -468,8 +473,6 @@ HRESULT SamplePool::getSample(IMFSample **sample) IMFSample *taken = m_videoSampleQueue.takeFirst(); - m_pending++; - // Give the sample to the caller. *sample = taken; (*sample)->AddRef(); @@ -489,25 +492,9 @@ HRESULT SamplePool::returnSample(IMFSample *sample) m_videoSampleQueue.append(sample); sample->AddRef(); - m_pending--; - return S_OK; } -BOOL SamplePool::areSamplesPending() -{ - QMutexLocker locker(&m_mutex); - - bool ret = false; - - if (!m_initialized) - ret = false; - else - ret = (m_pending > 0); - - return ret; -} - HRESULT SamplePool::initialize(QList &samples) { QMutexLocker locker(&m_mutex); @@ -540,7 +527,6 @@ HRESULT SamplePool::clear() m_videoSampleQueue[i]->Release(); m_videoSampleQueue.clear(); m_initialized = false; - m_pending = 0; return S_OK; } @@ -1214,7 +1200,7 @@ HRESULT EVRCustomPresenter::checkEndOfStream() return S_OK; } - if (m_samplePool.areSamplesPending()) { + if (m_scheduler.areSamplesScheduled()) { // Samples are still scheduled for rendering. return S_OK; } diff --git a/src/plugins/common/evr/evrcustompresenter.h b/src/plugins/common/evr/evrcustompresenter.h index e25780140..0e62c747c 100644 --- a/src/plugins/common/evr/evrcustompresenter.h +++ b/src/plugins/common/evr/evrcustompresenter.h @@ -131,6 +131,8 @@ public: HRESULT processSample(IMFSample *sample, LONG *nextSleep); HRESULT flush(); + bool areSamplesScheduled(); + // ThreadProc for the scheduler thread. static DWORD WINAPI schedulerThreadProc(LPVOID parameter); @@ -167,13 +169,11 @@ public: HRESULT getSample(IMFSample **sample); HRESULT returnSample(IMFSample *sample); - BOOL areSamplesPending(); private: QMutex m_mutex; QList m_videoSampleQueue; bool m_initialized; - DWORD m_pending; }; class EVRCustomPresenter -- cgit v1.2.3 From d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Fri, 5 Feb 2016 08:31:55 +0100 Subject: Disable wince build Do not build audiocapture and windowsaudio for wince. Change-Id: I2cbc7743e8f88c74be49ce85a41909653816aca7 Reviewed-by: Lars Knoll --- src/plugins/plugins.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index dc1979187..8b3322024 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -25,7 +25,7 @@ qnx:!blackberry { SUBDIRS += qnx-audio } -win32:!winrt { +win32:!winrt:!wince { SUBDIRS += audiocapture \ windowsaudio -- cgit v1.2.3 From 3b6de26fe585c586d055ac86c5911cc6df0e3887 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 14:56:13 +0100 Subject: Bump version Change-Id: I6d91859ec788c78384d527a421172a92315c994e --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a9b6a3290..9450b8383 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.6.0 +MODULE_VERSION = 5.6.1 -- cgit v1.2.3