Add qmlvideo and qmlvideofx examples
Based on code imported from master branch of QtMobility repo, ported to Qt Quick 2. Task-number: QTBUG-23118 Change-Id: Ifd297de0e595c675ff1a8e3218d91b03629295b9 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
f33731fe5a
commit
febe398400
@@ -0,0 +1,70 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia 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.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "performancemonitor.h"
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
bool parseArgument(const QString &arg, State &state)
|
||||
{
|
||||
bool result = false;
|
||||
if ("-log-perf" == arg) {
|
||||
state.logging = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-no-log-perf" == arg) {
|
||||
state.logging = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-show-perf" == arg) {
|
||||
state.visible = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-hide-perf" == arg) {
|
||||
state.visible = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia 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.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITOR_H
|
||||
#define PERFORMANCEMONITOR_H
|
||||
|
||||
class QString;
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
struct State {
|
||||
bool valid;
|
||||
bool logging;
|
||||
bool visible;
|
||||
|
||||
State() : valid(true), logging(false), visible(true) { }
|
||||
State(bool l, bool v) : valid(true), logging(l), visible(v) { }
|
||||
bool operator==(const State &other) const
|
||||
{ return logging == other.logging && visible == other.visible; }
|
||||
bool operator!=(const State &other) const
|
||||
{ return logging != other.logging || visible != other.visible; }
|
||||
};
|
||||
|
||||
bool parseArgument(const QString &arg, State &state);
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITOR_H
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
HEADERS += $$PWD/performancemonitor.h
|
||||
SOURCES += $$PWD/performancemonitor.cpp
|
||||
DEFINES += PERFORMANCEMONITOR_SUPPORT
|
||||
|
||||
message("performancemonitor.pri loaded")
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia 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.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "frequencymonitor.h"
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
void qmlRegisterTypes()
|
||||
{
|
||||
FrequencyMonitor::qmlRegisterType();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia 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.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITORDECLARATIVE_H
|
||||
#define PERFORMANCEMONITORDECLARATIVE_H
|
||||
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
void qmlRegisterTypes();
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITORDECLARATIVE_H
|
||||
@@ -0,0 +1,22 @@
|
||||
include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri)
|
||||
include($$PWD/performancemonitor.pri)
|
||||
|
||||
HEADERS += $$PWD/performancemonitordeclarative.h
|
||||
SOURCES += $$PWD/performancemonitordeclarative.cpp
|
||||
|
||||
PERFORMANCE_ROOT = $$PWD
|
||||
|
||||
defineTest(performanceItemAddDeployment) {
|
||||
frequencyItemAddDeployment()
|
||||
|
||||
symbian: performanceitem_folder.source = $$PWD/$$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
|
||||
else: performanceitem_folder.source = $$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
|
||||
performanceitem_folder.target = qml
|
||||
DEPLOYMENTFOLDERS += performanceitem_folder
|
||||
|
||||
export(performanceitem_folder.source)
|
||||
export(performanceitem_folder.target)
|
||||
export(DEPLOYMENTFOLDERS)
|
||||
}
|
||||
|
||||
message("performancemonitordeclarative.pri loaded")
|
||||
@@ -0,0 +1,110 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia 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.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
property bool logging: true
|
||||
property bool displayed: true
|
||||
property bool videoActive
|
||||
property int samplingInterval: 500
|
||||
property color textColor: "yellow"
|
||||
property int textSize: 28
|
||||
property int margins: 5
|
||||
|
||||
color: "transparent"
|
||||
|
||||
// This should ensure that the monitor is on top of all other content
|
||||
z: 999
|
||||
|
||||
Loader {
|
||||
id: videoFrameRateItemLoader
|
||||
function init() {
|
||||
source = "../frequencymonitor/FrequencyItem.qml"
|
||||
item.label = "videoFrameRate"
|
||||
item.parent = root
|
||||
item.anchors.left = root.left
|
||||
item.anchors.top = root.top
|
||||
item.anchors.margins = root.margins
|
||||
item.logging = root.logging
|
||||
item.displayed = root.displayed
|
||||
videoFrameRateActiveConnections.target = item
|
||||
}
|
||||
|
||||
Connections {
|
||||
id: videoFrameRateActiveConnections
|
||||
ignoreUnknownSignals: true
|
||||
onActiveChanged: root.videoActive = videoFrameRateActiveConnections.target.active
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
id: qmlFrameRateItemLoader
|
||||
function init() {
|
||||
source = "../frequencymonitor/FrequencyItem.qml"
|
||||
item.label = "qmlFrameRate"
|
||||
item.parent = root
|
||||
item.anchors.left = root.left
|
||||
item.anchors.bottom = root.bottom
|
||||
item.anchors.margins = root.margins
|
||||
item.logging = root.logging
|
||||
item.displayed = root.displayed
|
||||
}
|
||||
}
|
||||
|
||||
function init() {
|
||||
videoFrameRateItemLoader.init()
|
||||
qmlFrameRateItemLoader.init()
|
||||
}
|
||||
|
||||
function videoFramePainted() {
|
||||
videoFrameRateItemLoader.item.notify()
|
||||
}
|
||||
|
||||
function qmlFramePainted() {
|
||||
qmlFrameRateItemLoader.item.notify()
|
||||
}
|
||||
|
||||
onVideoActiveChanged: {
|
||||
videoFrameRateItemLoader.item.active = root.videoActive
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user