Commit Graph

53 Commits

Author SHA1 Message Date
Oswald Buddenhagen
6dc5ff99ac fix example installs
Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
2016-04-28 12:25:31 +00:00
Edward Welbourne
7b68ca81dd Purge sRGB chunks from PNGs in examples.
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce

Change-Id: Iff326d7e63d6e0106204beb1f42700032cb6b79a
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-03-22 12:09:07 +00:00
Topi Reinio
c5f5c7a5f2 Doc: Fix documentation warnings
- Fix incorrect paths passed to \example command
   - Fix resulting linking issues
   - Fix examplesinstallpath in .qdocconf
   - Remove unnecessary group definition

Change-Id: I72a437ac6d297f3c63d4f29a0e3110971d1e330f
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2016-01-08 11:47:52 +00:00
Paolo Angelelli
1c7543a640 Fix for disallowed property bindings in qml effect files
According to the documentation of ListModel.get, "The returned object
is not guaranteed to remain valid. It should not be used in property
bindings." So the property bindings have been removed, and a js function
has been introduced to update the properties upon list change.

Task-number: QTBUG-49221
Change-Id: Idaed746ca237198b52a3aff0234076331e1512c1
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-11-06 09:32:41 +00:00
Yoann Lopes
0761f2d53f Update license header in qmlvideofx example.
Change-Id: Icb525176a8f00cc1a7414e68a7452452d1ef3da0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-05-05 11:31:57 +00:00
Yoann Lopes
9d2943bce8 Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	.qmake.conf
	src/plugins/avfoundation/camera/avfcamerasession.h
	src/plugins/avfoundation/camera/avfcamerasession.mm

Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85
2015-05-05 11:48:21 +02:00
Christian Strømme
6fe3061c1f Restore ContentCamera.qml
The file was removed in 5c3a5cf810 but
left the description, documentation and parts of the functionality
unchanged. This change adds the camera functionality back into the
example.

Change-Id: I3bfdd95f8322796d446c571a4e074ce98e5443dd
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-04-16 20:19:22 +00:00
Friedemann Kleint
4d17db19f8 Fix debug stream operators.
- Use QDebugStateSaver to restore space setting in stream operators
  instead of returning dbg.space() which breaks formatting on streams
  that already have nospace() set.
- Fix some single character string constants, streamline code.

Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-04-07 17:21:38 +00:00
Laszlo Agocs
d109e6dd5d Improvide device selection in the video filter example
The non-OS X path also uses clGetGLContextInfoKHR when available,
instead of just blindly taking the first GPU device for the platform.

This way we get the correct OpenCL device in case the application is using an
OpenGL context on the same vendor's second GPU.

On Windows desktop OpenGL is now correctly forced and therefore there is
no need to waste time on runtime checks for ANGLE later on.

Remove the hard-coded custom pathes from the .pro file.

Also fixes error reporting on the OS X specific path.

Change-Id: I8d6ab867510d113d5135b61e66822381e81c995a
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-03-16 13:00:43 +00:00
Laszlo Agocs
f86a3b7bb3 Add Linux and AMD support to the OpenCL filter example
Change-Id: I1ea91f93677c53322c3867db6069e4362c58cebd
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-02-24 10:30:15 +00:00
Antti Kokko
bbfccc7135 Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-02-12 10:27:47 +00:00
Sergio Ahumada
d60347eb83 Replace blog.qt.digia.com with blog.qt.io
Change-Id: I2c0a3ba90c3343b362cd756584979f1b08405d34
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-02-06 13:45:46 +00:00
Laszlo Agocs
3e94b7ce2d Add video filtering support to VideoOutput
Add the QAbstractVideoFilter base class and integrate it with VideoOutput.

This can be used to perform arbitrary filtering or image processing
on the frames of a video stream of a VideoOutput element right before
the OpenGL texture is provided to the scenegraph by the video node.

This opens up the possibility to integrate computer vision
frameworks or accelerated image processing with Qt Quick applications
that display video streams using Qt Multimedia.

Conceptually it is somewhat similar to QVideoProbe, this
approach however allows modifying the frame, in real time
with tight integration to the scenegraph node, and targets
Qt Quick meaning setting up the filter and processing the results
of the computations happen completely in QML.

[ChangeLog] Added QAbstractVideoFilter that serves as a base class for QML
video filtering elements that integrate compute, vision, and image processing
frameworks with VideoOutput.

Change-Id: Ice1483f8c2daec5a43536978627a7bbb64549480
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-02-03 14:41:39 +00:00
Venu
f51ca0b97c Doc: Updated the \brief statements
Most of them were unnecessarily long.

Change-Id: I8942254c2211adb268e399056435e6acc940616f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-24 10:24:29 +02:00
Tomi Korpipää
7f1f5edf4d Updated snapshots for qmlvideo example documentation
Task-number: QTBUG-36287
Change-Id: I9da63560ba92a572d6d3943cfdade0b609469ace
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-29 12:25:38 +02:00
Tomi Korpipää
5c3a5cf810 QMLVideo Example visual update
Task-number: QTBUG-36287
Change-Id: I797a995c2ccd6f6fec40fbf50f93e297ae15a9b1
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-26 05:04:55 +02:00
Alex Blasche
f788f8e5c6 Make the multimedia examples less verbose
Important warnings such as missing services are still printed though.

Task-number: QTBUG-31080
Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-09-22 11:11:10 +02:00
Alex Blasche
da383e5c7e Remove QtSystemInfo dependency from Multimedia examples
QtSystemInfo is not officially supported in Qt5 and its QML API is
currently broken. Inhibition of the screensaver is not essential
for the example anyway.

Task-number: QTBUG-31080
Change-Id: Ia2e7d8de3e2044e11e1681907e61a7207489ad1b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-09-19 09:12:48 +02:00
Frederik Gladhorn
659f238bbb Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
	src/gsttools/qgstreamervideoinputdevicecontrol.cpp
	src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
	src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp

Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
2014-09-01 12:52:51 +02:00
Antti Kokko
2732e23887 Update license headers and add new license files
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-24 17:30:13 +02:00
Niels Weber
da77331952 Improve Magnify and Ripple effects on video shader example
Re-enable Magnify shader.
Use correct coordinates for Magnify and Ripple shader.

Task-number: QTBUG-38121
Change-Id: Ie8d962ba841d074c9ebcf3b86f948848ad6a1812
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-08-18 14:05:22 +02:00
Nico Vertriest
c9b4793350 Doc: link errors
Task-number: QTBUG-34749
Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22
Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-07-01 13:10:14 +02:00
Sze Howe Koh
1d6872ae9c Doc: Clean up references to Qt System Info
The module is not released yet; the current documentation is misleading.

Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-05-12 12:26:40 +02:00
Niels Weber
82d96105ce Fix documentation of qmlvideofx example
Make the documentation fit to the current state of the example.

Task-number: QTBUG-38121
Change-Id: I3379e3328d07ef8bcdb35a5e3821ab194c3443c4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-04-30 18:27:31 +02:00
Niels Weber
02c0229a05 Handle resizing of mainwindow better
Task-number: QTBUG-38121
Change-Id: I877fd5c626418a91850d43de31e71351c14eef25
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 13:40:42 +02:00
Niels Weber
c5d184cbe3 Selecting something now closes menu
On a closed menu, the text is now hidden.

Task-number: QTBUG-38121
Change-Id: I305fd4f24768115ed21495857cce672d8cbd2135
Reviewed-by: Petref Saraci <petref.saraci@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 13:40:34 +02:00
Niels Weber
2939c9953a Add missing background for effect selection list.
Also remove highlight and fix button text color.
Make Menu animation faster.

Task-number: QTBUG-38121
Change-Id: I7d5868d370a8dc7925cee5e694ae043970c569d9
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 13:40:26 +02:00
Niels Weber
4c8284de46 Rework qmlvideofx example
Task-number: QTBUG-38121
Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-04-18 20:10:23 +02:00
Jerome Pasion
af73d55eff Doc: Improved example documentation
-added instructions on how to run the example
 (using \include to insert a section from qtbase/doc/global/)
-updated copyright year
-removed links to Qt 4 API
-rearranged some of the sections
-created links from the example pages to Qt Multimedia
-fixed QDoc warnings related to the example pages

Task-number: QTBUG-33597
Change-Id: Id45ce5cbd40dbfa384abd7260a316f6f6837c186
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2014-04-14 06:45:43 +02:00
Friedemann Kleint
c86d14a380 Fix file browser in qmlvideofx example.
Similar to de9092389f for qmlvideo.
Use QUrl::fromLocalFile() to get Windows drive handling
right. Emulate its behavior in QML code. Fix up() to terminate
correctly.

Task-number: QTBUG-32139
Change-Id: I36bafaa608ff054190dc76694f6254a74f3b513e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2013-08-19 10:07:19 +02:00
Friedemann Kleint
2838a99c5a Remove left-over debug output.
Task-number: QTBUG-32139

Change-Id: I52843ca104e422fb02112949191dbcd4642905a5
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2013-07-31 11:26:18 +02:00
Friedemann Kleint
de9092389f Fix file browser in qmlvideo example.
Use QUrl::fromLocalFile() to get Windows drive handling
right. Emulate its behavior in QML code. Fix up() to terminate
correctly.

Task-number: QTBUG-32139

Change-Id: Iec6d9f96fbe2181c939e9dbbe6aa042eac630918
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-30 16:38:48 +02:00
Frederik Gladhorn
17053a450b Merge remote-tracking branch 'origin/release' into stable
Change-Id: I0361cbb4f5398bb13e675c3de04519c414daea43
2013-06-20 16:23:34 +02:00
Sze Howe Koh
09fea23419 Doc: Fix some broken links and quote paths
The correct paths are relative to:
- <reporoot>/examples/<module>, or
- <reporoot>/src/<module>

Removing the module specifier fixes these links/quotes.

Change-Id: I6be4f28c44bd26361b60a394158b0e6cc46b1ec0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-06-13 16:43:33 +02:00
Christian Strømme
ccc4138304 Fix for url bug in the qmlvideo examples.
In the FileBrowser paths where being prepended with file:///, since all
the paths already starts with a forward slash, navigating away from the
initial directory was therefore not possible.

To make the examples work on Android, QT += multimedia was added.

Change-Id: Iff96729d476c4292999b022bdd6d5770b6b011e7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-06-13 14:15:36 +02:00
David Fries
46bf67b7dc qmlvideo example, add missing #ifdef PERFORMANCEMONITOR_SUPPORT
This usage of PerformanceMonitor needs to be protected by the same
preprocessor check as the header include that makes it available.

Change-Id: Ie8a1b6e99a61c333ceedcf2e9751235fc2efb415
Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-05-08 06:58:45 +02:00
Topi Reinio
c34910a22f Doc: Fix example paths referred in documentation
qdocconf files for both Qt Multimedia and Qt Multimedia Widgets already
define the correct example path. This change fixes also the example
documentation to use the correct path, as well as the link to examples
in Multimedia Overview.

Change-Id: I72d75027ee18f6398eb76dc40bcc3d122541b1c9
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-04-30 08:59:32 +02:00
sanevala
3d4980312f Loop video infinetely on qmlvideofx.
Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:45 +01:00
sanevala
7f19343623 User cannot press cancel after folder up.
Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:41 +01:00
sanevala
c42e7baac9 User is not able to select file from FileBrowser and play it.
When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:36 +01:00
sanevala
5b57edae2a Video has ended UI say tap to stop.
Loop video infinetely so tap to stop & start state is correct.

Change-Id: I56af6eb00fcc7811cc25099df3c7fa47f429a3e6
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:32 +01:00
sanevala
7518489a2b User cannot press cancel after folder up.
Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:22 +01:00
sanevala
6812ff79d9 Fix qrc references on qmlvideo example.
Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:17 +01:00
sanevala
73859f6ec3 User is not able to select file from FileBrowser and play it.
When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-02-19 13:50:13 +01:00
Sze Howe Koh
28ee5b12ff Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-29 01:28:50 +01:00
Venugopal Shivashankar
51334d2995 Doc: Fixed random QDoc warnings
- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-15 10:48:20 +01:00
Sergio Ahumada
399500f87e Update copyright year in Digia's license headers
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-10 17:56:01 +01:00
Venugopal Shivashankar
85faa55780 Doc: Moved the qdocinc and image to the sourcedirs
QDoc parses the \input command relative to the sourcedirs
and not exampledirs. So I had to move the qdocinc file and
the corresponding image to the sourcedirs.

Task-number: QTBUG-28727
Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-02 15:28:47 +01:00
hjk
416168db8a Polish and fix qmlvideofx example
Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-20 19:28:19 +01:00
Kai Koehne
d13a7a1f89 Examples: Remove qmlapplicationviewer template.
Fix shadow-builds for qmlviewer examples by using qrc files instead.

Task-number: QTBUG-28614
Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-17 16:56:00 +01:00