slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Polish and fix qmlvideofx example

Browse Source 
Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-12-18 15:11:44 +01:00
committed by The Qt Project
parent 5739d43eef
commit 416168db8a
33 changed files with 122 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
examples/multimedia/video/qmlvideofx/filereader.cpp
View File

@@ -41,36 +41,18 @@
#include "filereader.h"
#include "trace.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
QString adjustPath(const QString &path)
{
#ifdef Q_OS_UNIX
#ifdef Q_OS_MAC
if (!QDir::isAbsolutePath(path))
return QCoreApplication::applicationDirPath()
+ QLatin1String("/../Resources/") + path;
#else
QString pathInInstallDir;
const QString applicationDirPath = QCoreApplication::applicationDirPath();
pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path);
if (QFileInfo(pathInInstallDir).exists())
return pathInInstallDir;
#endif
#endif
return path;
}
#include <QCoreApplication>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QTextStream>
QString FileReader::readFile(const QString &fileName)
{
qtTrace() << "FileReader::readFile" << "fileName" << fileName;
QString content;
QFile file(adjustPath(fileName));
QFile file(fileName);
if (file.open(QIODevice::ReadOnly)) {
QTextStream stream(&file);
content = stream.readAll();

2
examples/multimedia/video/qmlvideofx/filereader.h
View File

@@ -39,7 +39,7 @@
**
****************************************************************************/
#include <QtCore/QObject>
#include <QObject>
class FileReader : public QObject
{

8
examples/multimedia/video/qmlvideofx/main.cpp
View File

@@ -72,17 +72,17 @@ int main(int argc, char *argv[])
#ifdef PERFORMANCEMONITOR_SUPPORT
PerformanceMonitor::State performanceMonitorState;
#endif
for (int i=1; i<args.count(); ++i) {
const QString &arg = args.at(i);
for (int i = 1; i < args.size(); ++i) {
const QByteArray arg = args.at(i).toUtf8();
if (arg.startsWith('-')) {
if ("-volume" == arg) {
if (i+1 < args.count())
if (i + 1 < args.size())
volume = 0.01 * args.at(++i).toInt();
else
qtTrace() << "Option \"-volume\" takes a value";
}
#ifdef PERFORMANCEMONITOR_SUPPORT
else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
else if (performanceMonitorState.parseArgument(arg)) {
// Do nothing
}
#endif

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
View File

@@ -69,7 +69,7 @@ ShaderEffect {
// rather than being inline in the QML file
onFragmentShaderFilenameChanged:
fragmentShader = d.fragmentShaderCommon + fileReader.readFile(fragmentShaderFilename)
fragmentShader = d.fragmentShaderCommon + fileReader.readFile(":shaders/" + fragmentShaderFilename)
onVertexShaderFilenameChanged:
vertexShader = fileReader.readFile(vertexShaderFilename)
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
View File

@@ -55,5 +55,5 @@ Effect {
property real step_x: 0.0015625
property real step_y: targetHeight ? (step_x * targetWidth / targetHeight) : 0.0
fragmentShaderFilename: "shaders/billboard.fsh"
fragmentShaderFilename: "billboard.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
View File

@@ -52,5 +52,5 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real threshold: parameters.get(0).value
fragmentShaderFilename: "shaders/blackandwhite.fsh"
fragmentShaderFilename: "blackandwhite.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/emboss.fsh"
fragmentShaderFilename: "emboss.fsh"
}

4
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
View File

@@ -63,7 +63,7 @@ Item {
anchors.fill: parent
dividerValue: parent.dividerValue
property real blurSize: 4.0 * parent.parameters.get(0).value / targetHeight
fragmentShaderFilename: "shaders/gaussianblur_v.fsh"
fragmentShaderFilename: "gaussianblur_v.fsh"
}
Effect {
@@ -71,7 +71,7 @@ Item {
anchors.fill: parent
dividerValue: parent.dividerValue
property real blurSize: 4.0 * parent.parameters.get(0).value / parent.targetWidth
fragmentShaderFilename: "shaders/gaussianblur_h.fsh"
fragmentShaderFilename: "gaussianblur_h.fsh"
source: horizontalShaderSource
ShaderEffectSource {

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/glow.fsh"
fragmentShaderFilename: "glow.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
View File

@@ -57,5 +57,5 @@ Effect {
property real targetHue: parameters.get(0).value * 360
property real windowWidth: parameters.get(1).value * 60
fragmentShaderFilename: "shaders/isolate.fsh"
fragmentShaderFilename: "isolate.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
View File

@@ -84,7 +84,7 @@ Effect {
d.oldTargetHeight = targetHeight
}
fragmentShaderFilename: "shaders/magnify.fsh"
fragmentShaderFilename: "magnify.fsh"
MouseArea {
anchors.fill: parent

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
View File

@@ -53,5 +53,5 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real curlExtent: 1.0 - parameters.get(0).value
fragmentShaderFilename: "shaders/pagecurl.fsh"
fragmentShaderFilename: "pagecurl.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
View File

@@ -52,5 +52,5 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real granularity: parameters.get(0).value * 20
fragmentShaderFilename: "shaders/pixelate.fsh"
fragmentShaderFilename: "pixelate.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
View File

@@ -54,5 +54,5 @@ Effect {
property real numColors: 8.0
fragmentShaderFilename: "shaders/posterize.fsh"
fragmentShaderFilename: "posterize.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
View File

@@ -60,5 +60,5 @@ Effect {
property real time: 0
NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
fragmentShaderFilename: "shaders/ripple.fsh"
fragmentShaderFilename: "ripple.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/sepia.fsh"
fragmentShaderFilename: "sepia.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
View File

@@ -52,5 +52,5 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real amount: parameters.get(0).value * 18
fragmentShaderFilename: "shaders/sharpen.fsh"
fragmentShaderFilename: "sharpen.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
View File

@@ -76,5 +76,5 @@ Effect {
}
}
fragmentShaderFilename: "shaders/shockwave.fsh"
fragmentShaderFilename: "shockwave.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
View File

@@ -55,5 +55,5 @@ Effect {
property real resS: targetSize
property real resT: targetSize
fragmentShaderFilename: "shaders/sobeledgedetection1.fsh"
fragmentShaderFilename: "sobeledgedetection1.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
View File

@@ -52,5 +52,5 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real weight: parameters.get(0).value
fragmentShaderFilename: "shaders/sobeledgedetection2.fsh"
fragmentShaderFilename: "sobeledgedetection2.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/tiltshift.fsh"
fragmentShaderFilename: "tiltshift.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
View File

@@ -59,5 +59,5 @@ Effect {
property real magTol: 0.3
property real quantize: 8.0
fragmentShaderFilename: "shaders/toon.fsh"
fragmentShaderFilename: "toon.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/vignette.fsh"
fragmentShaderFilename: "vignette.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
View File

@@ -42,5 +42,5 @@
import QtQuick 2.0
Effect {
fragmentShaderFilename: "shaders/warhol.fsh"
fragmentShaderFilename: "warhol.fsh"
}

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
View File

@@ -57,5 +57,5 @@ Effect {
NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
fragmentShaderFilename: "shaders/wobble.fsh"
fragmentShaderFilename: "wobble.fsh"
}

10
examples/multimedia/video/qmlvideofx/qmlvideofx.pro
View File

@@ -3,16 +3,12 @@ TARGET = qmlvideofx
QT += quick
LOCAL_SOURCES = filereader.cpp main.cpp
LOCAL_HEADERS = filereader.h trace.h
SOURCES += $$LOCAL_SOURCES
HEADERS += $$LOCAL_HEADERS
SOURCES += filereader.cpp main.cpp
HEADERS += filereader.h trace.h
RESOURCES += qmlvideofx.qrc
SNIPPETS_PATH = ../snippets
include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
include($$PWD/../snippets/performancemonitor/performancemonitordeclarative.pri)
maemo6: {
DEFINES += SMALL_SCREEN_LAYOUT

23
examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
View File

@@ -44,5 +44,28 @@
<file>qml/qmlvideofx/main-smallscreen.qml</file>
<file>qml/qmlvideofx/ParameterPanel.qml</file>
<file>qml/qmlvideofx/Slider.qml</file>
<file>shaders/billboard.fsh</file>
<file>shaders/blackandwhite.fsh</file>
<file>shaders/emboss.fsh</file>
<file>shaders/gaussianblur_h.fsh</file>
<file>shaders/gaussianblur_v.fsh</file>
<file>shaders/glow.fsh</file>
<file>shaders/isolate.fsh</file>
<file>shaders/magnify.fsh</file>
<file>shaders/pagecurl.fsh</file>
<file>shaders/pixelate.fsh</file>
<file>shaders/posterize.fsh</file>
<file>shaders/ripple.fsh</file>
<file>shaders/selectionpanel.fsh</file>
<file>shaders/sepia.fsh</file>
<file>shaders/sharpen.fsh</file>
<file>shaders/shockwave.fsh</file>
<file>shaders/sobeledgedetection1.fsh</file>
<file>shaders/sobeledgedetection2.fsh</file>
<file>shaders/tiltshift.fsh</file>
<file>shaders/toon.fsh</file>
<file>shaders/vignette.fsh</file>
<file>shaders/warhol.fsh</file>
<file>shaders/wobble.fsh</file>
</qresource>
</RCC>

12
examples/multimedia/video/qmlvideofx/trace.h
View File

@@ -42,7 +42,7 @@
#ifndef TRACE_H
#define TRACE_H
#include <QtCore/QDebug>
#include <QDebug>
#define ENABLE_TRACE
//#define VERBOSE_TRACE
@@ -53,7 +53,7 @@ class NullDebug
{
public:
template <typename T>
NullDebug& operator<<(const T&) { return *this; }
NullDebug &operator<<(const T &) { return *this; }
};
inline NullDebug nullDebug() { return NullDebug(); }
@@ -68,18 +68,12 @@ struct PtrWrapper
} // namespace Trace
template <typename T>
inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
inline QDebug &operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
{
debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
return debug.space();
}
template<typename T>
inline const void *qtVoidPtr(const T *ptr)
{ return static_cast<const void *>(ptr); }
#define qtThisPtr() qtVoidPtr(this)
#ifdef ENABLE_TRACE
inline QDebug qtTrace() { return qDebug() << "[qmlvideofx]"; }
# ifdef VERBOSE_TRACE