Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

config.tests/resourcepolicy/resourcepolicy.pro

@@ -3,5 +3,5 @@ SOURCES += main.cpp
 CONFIG += link_pkgconfig
 
 PKGCONFIG += \
-    libresourceqt1
+    libresourceqt5
 

src/gsttools/gsttools.pro

@@ -26,7 +26,7 @@ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
 
 config_resourcepolicy {
     DEFINES += HAVE_RESOURCE_POLICY
-    PKGCONFIG += libresourceqt1
+    PKGCONFIG += libresourceqt5
 }
 
 # Header files must go inside source directory of a module

src/multimedia/audio/qwavedecoder_p.cpp

@@ -244,6 +244,8 @@ bool QWaveDecoder::enoughDataAvailable()
 bool QWaveDecoder::findChunk(const char *chunkId)
 {
     chunk descriptor;
+
+    do {
         if (!peekChunk(&descriptor))
             return false;
 
@@ -253,7 +255,7 @@ bool QWaveDecoder::findChunk(const char *chunkId)
         // It's possible that bytes->available() is less than the chunk size
         // if it's corrupt.
         junkToSkip = qint64(sizeof(chunk) + descriptor.size);
-    while (source->bytesAvailable() > 0) {
+
         // Skip the current amount
         if (junkToSkip > 0)
             discardBytes(junkToSkip);
@@ -263,12 +265,7 @@ bool QWaveDecoder::findChunk(const char *chunkId)
         if (junkToSkip > 0)
             return false;
 
-        if (!peekChunk(&descriptor))
-            return false;
-
-        if (qstrncmp(descriptor.id, chunkId, 4) == 0)
-            return true;
-    }
+    } while (source->bytesAvailable() > 0);
 
     return false;
 }

src/plugins/gstreamer/common.pri

@@ -23,7 +23,7 @@ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
 
 config_resourcepolicy {
     DEFINES += HAVE_RESOURCE_POLICY
-    PKGCONFIG += libresourceqt1
+    PKGCONFIG += libresourceqt5
 }
 
 config_xvideo:qtHaveModule(widgets) {

src/plugins/plugins.pro

@@ -56,3 +56,8 @@ mac:!simulator {
 config_opensles {
     SUBDIRS += opensles
 }
+
+config_resourcepolicy {
+    SUBDIRS += resourcepolicy
+}
+

src/plugins/resourcepolicy/resourcepolicy.json

@@ -0,0 +1,4 @@
+{
+    "Keys": ["resourcepolicy"],
+    "Services": ["org.qt-project.qt.mediaplayerresourcesetfactory", "default"]
+}

src/plugins/resourcepolicy/resourcepolicy.pro

@@ -0,0 +1,21 @@
+TARGET = resourceqt
+
+QT += multimedia-private
+CONFIG += no_private_qt_headers_warning link_pkgconfig
+PKGCONFIG += libresourceqt5
+
+PLUGIN_TYPE = resourcepolicy
+PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin
+load(qt_plugin)
+
+INCLUDEPATH += $$PWD \
+    $${SOURCE_DIR}/src/multimedia
+
+HEADERS += \
+    $$PWD/resourcepolicyplugin.h \
+    $$PWD/resourcepolicyimpl.h
+
+SOURCES += \
+    $$PWD/resourcepolicyplugin.cpp \
+    $$PWD/resourcepolicyimpl.cpp
+

src/plugins/resourcepolicy/resourcepolicyimpl.cpp

@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com>
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <policy/resource.h>
+#include <policy/resources.h>
+#include <policy/resource-set.h>
+
+#include "resourcepolicyimpl.h"
+
+ResourcePolicyImpl::ResourcePolicyImpl(QObject *parent)
+    : QMediaPlayerResourceSetInterface(parent)
+{
+    m_resourceSet = new ResourcePolicy::ResourceSet("player", this);
+    m_resourceSet->setAlwaysReply();
+
+    ResourcePolicy::AudioResource *audioResource = new ResourcePolicy::AudioResource("player");
+    audioResource->setProcessID(QCoreApplication::applicationPid());
+    audioResource->setStreamTag("media.name", "*");
+    m_resourceSet->addResourceObject(audioResource);
+
+    m_resourceSet->addResource(ResourcePolicy::VideoPlaybackType);
+    m_resourceSet->update();
+
+    connect(m_resourceSet, SIGNAL(resourcesGranted(const QList<ResourcePolicy::ResourceType>)),
+            this, SLOT(handleResourcesGranted()));
+    connect(m_resourceSet, SIGNAL(resourcesDenied()),
+            this, SLOT(handleResourcesDenied()));
+    connect(m_resourceSet, SIGNAL(lostResources()),
+            this, SLOT(handleResourcesLost()));
+    connect(m_resourceSet, SIGNAL(resourcesReleasedByManager()),
+            this, SLOT(handleResourcesLost()));
+}
+
+bool ResourcePolicyImpl::isVideoEnabled() const
+{
+    return m_videoEnabled;
+}
+
+void ResourcePolicyImpl::setVideoEnabled(bool videoEnabled)
+{
+    if (m_videoEnabled != videoEnabled) {
+        m_videoEnabled = videoEnabled;
+
+        if (videoEnabled)
+            m_resourceSet->addResource(ResourcePolicy::VideoPlaybackType);
+        else
+            m_resourceSet->deleteResource(ResourcePolicy::VideoPlaybackType);
+
+        m_resourceSet->update();
+    }
+}
+
+void ResourcePolicyImpl::acquire()
+{
+    m_status = RequestedResource;
+    m_resourceSet->acquire();
+}
+
+void ResourcePolicyImpl::release()
+{
+    m_resourceSet->release();
+    m_status = Initial;
+}
+
+bool ResourcePolicyImpl::isGranted() const
+{
+    return m_status == GrantedResource;
+}
+
+bool ResourcePolicyImpl::isAvailable() const
+{
+    // TODO: is this used? what is it for?
+    qWarning() << Q_FUNC_INFO << "Stub";
+    return true;
+}
+
+void ResourcePolicyImpl::handleResourcesGranted()
+{
+    m_status = GrantedResource;
+    emit resourcesGranted();
+}
+
+void ResourcePolicyImpl::handleResourcesDenied()
+{
+    m_status = Initial;
+    emit resourcesDenied();
+}
+
+void ResourcePolicyImpl::handleResourcesLost()
+{
+    if (m_status != Initial) {
+        m_status = Initial;
+        emit resourcesLost();
+    }
+
+    m_resourceSet->release();
+}
+

src/plugins/resourcepolicy/resourcepolicyimpl.h

@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com>
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RESOURCEPOLICYIMPL_H
+#define RESOURCEPOLICYIMPL_H
+
+#include <QObject>
+
+#include <private/qmediaresourceset_p.h>
+
+namespace ResourcePolicy {
+    class ResourceSet;
+};
+
+class ResourcePolicyImpl : public QMediaPlayerResourceSetInterface
+{
+    Q_OBJECT
+public:
+    ResourcePolicyImpl(QObject *parent = 0);
+
+    bool isVideoEnabled() const;
+    void setVideoEnabled(bool videoEnabled);
+    void acquire();
+    void release();
+    bool isGranted() const;
+    bool isAvailable() const;
+
+private slots:
+    void handleResourcesGranted();
+    void handleResourcesDenied();
+    void handleResourcesLost();
+
+private:
+    enum ResourceStatus {
+        Initial = 0,
+        RequestedResource,
+        GrantedResource
+    };
+
+    bool m_videoEnabled;
+    ResourcePolicy::ResourceSet *m_resourceSet;
+    ResourceStatus m_status;
+};
+
+#endif // RESOURCEPOLICYIMPL_H

src/plugins/resourcepolicy/resourcepolicyplugin.cpp

@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com>
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+
+#include "resourcepolicyplugin.h"
+#include "resourcepolicyimpl.h"
+
+ResourcePolicyPlugin::ResourcePolicyPlugin(QObject *parent)
+    : QMediaResourcePolicyPlugin(parent)
+{
+}
+
+QObject *ResourcePolicyPlugin::create(const QString &interfaceId)
+{
+    // TODO: what is interfaceId for?
+    return new ResourcePolicyImpl(this);
+}
+
+void ResourcePolicyPlugin::destroy(QObject *resourceSet)
+{
+    // TODO: do we need to do anything more elaborate here?
+    delete resourceSet;
+}
+

src/plugins/resourcepolicy/resourcepolicyplugin.h

@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com>
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RESOURCEPOLICYPLUGIN_H
+#define RESOURCEPOLICYPLUGIN_H
+
+#include <private/qmediaresourcepolicyplugin_p.h>
+#include <QObject>
+
+class ResourcePolicyPlugin : public QMediaResourcePolicyPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaresourcesetfactory/5.0" FILE "resourcepolicy.json")
+    Q_INTERFACES(QMediaResourceSetFactoryInterface)
+public:
+    ResourcePolicyPlugin(QObject *parent = 0);
+
+    QObject *create(const QString &interfaceId);
+    void destroy(QObject *resourceSet);
+};
+
+#endif // RESOURCEPOLICYPLUGIN_H