summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/video
Commit message (Collapse)AuthorAgeFilesLines
* GStreamer: Add support of Androidv5.14.0-beta2Val Doroshchuk2019-10-186-0/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since for Android GStreamer is distributed in archives, and should be staticlly linked, so by default it is not built and should be explicitly enabled within configuring by -gstreamer option. (currently it is auto and enabled if gstreamer exists) ("libs" of the gstreamer library in configure.json is empty to prevent any libs to be added while building any code that uses gstreamer library) Some base gst archives are fully included to Qt5MultimediaGstTools. Users would need to just use: QT += multimediagsttools-private Before building, GSTREAMER_ROOT_ANDROID env var should be set to point to gst binaries. Also all necessary plugins must be registered in user's code by GST_PLUGIN_STATIC_DECLARE/GST_PLUGIN_STATIC_REGISTER macros after QGstUtils::initializeGst(). and e.g. project file might contain: INCLUDEPATH += $$(GSTREAMER_ROOT_ANDROID)/armv7/include/ \ $(GSTREAMER_ROOT_ANDROID)/armv7/include/gstreamer-1.0 \ $(GSTREAMER_ROOT_ANDROID)/armv7/include/glib-2.0 \ $(GSTREAMER_ROOT_ANDROID)/armv7/lib/glib-2.0/include LIBS += -L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib/ \ -L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib/gstreamer-1.0 \ __here_list_of_plugins__ See video/android/gstreamer example Change-Id: Ie4e586fa8489f1bd23622763f5578abed1729272 Task-number: QTBUG-72125 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Doc: Fix multiple documentation issuesv5.13.0-beta3Topi Reinio2019-04-162-53/+39
| | | | | | | | | | | | | | | | | | | | | | | | - GstTools has some (internal) documentation, but was causing a number of warnings with QDoc's clang parser - exclude it from the documentation build. - Remove direct links from example documentation to individual example files; they no longer work. - Fix navigation for QML types; The main QML types pages did not list types for QtAudioEngiine. - Use \QtMinorVersion macro to make the documented import versions follow the minor Qt version. - Fix \since usage to be consistent throughout. - Fix linking issues for QML properties/methods - Minor language fixes Change-Id: I735cd13fa6dedd6bf06d6b6ef50ce2e0d69a545b Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* GStreamer: support video orientationAlexander Volkov2019-02-011-0/+4
| | | | | Change-Id: I233c45824f517c185cb245d8a7d77cab8551fc51 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-063-9/+9
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
| * examples: use Qt5-style connects where possibleJochen Seemann2017-12-193-9/+9
| | | | | | | | | | | | | | | | | | Additionally, remove obsolete CHECKED_CONNECT macro from the spectrum example. Change-Id: Id6fe01718679463c2b025d688c970583d64d60e9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-272-6/+6
|\| | | | | | | Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
| * Fix outdated FDL license headerKai Koehne2017-10-182-6/+6
| | | | | | | | | | Change-Id: I9cd7043058352ba2aeded74f86d863fca29bd37d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-4/+4
|/ | | | | Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-0/+2
|\ | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| * iOS: add NSCameraUsageDescription to Info.plist for qmlvideofxRichard Moe Gustavsen2016-11-021-0/+2
| | | | | | | | | | | | | | | | The 'NSCameraUsageDescription' key is needed for the app to have access to the camera. Change-Id: I8b98247993edd450772e5393551e4acb07dcf0a0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-103-0/+10
|\| | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * fix example installsOswald Buddenhagen2016-04-283-0/+10
| | | | | | | | | | Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-081-0/+0
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-221-0/+0
| | | | | | | | | | | | | | | | 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>
* | Remove AndroidManifest.xml from qmlvideofx example.Christian Strømme2016-04-052-53/+0
| | | | | | | | | | | | | | | | | | | | | | | | The manifest in qmlvideofx example is useless, and with the strict requirement of API level 16 or higher (585287d0@qttools), it means it's not working out of the box anymore. To avoid similar issues in the future, this change just removes the manifest (instead of bumping the min. version). Task-number: QTBUG-52374 Change-Id: I6c672bdbe23935852c87c93e425003b7b6827771 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-19122-2072/+4146
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I5b1b87239b21e4b57ca6c8648d69ba090d75c8a8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Doc: Fix documentation warningsTopi Reinio2016-01-082-33/+33
| | | | | | | | | | - 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>
* Fix for disallowed property bindings in qml effect filesPaolo Angelelli2015-11-0612-17/+106
| | | | | | | | | | | | 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>
* Update license header in qmlvideofx example.Yoann Lopes2015-05-051-7/+7
| | | | | Change-Id: Icb525176a8f00cc1a7414e68a7452452d1ef3da0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-052-0/+44
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/avfoundation/camera/avfcamerasession.h src/plugins/avfoundation/camera/avfcamerasession.mm Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85
| * Restore ContentCamera.qmlChristian Strømme2015-04-162-0/+44
| | | | | | | | | | | | | | | | | | | | The file was removed in 5c3a5cf8106e1b873924b296c792448c33ee4df1 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>
| * Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | Change-Id: I2c0a3ba90c3343b362cd756584979f1b08405d34 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix debug stream operators.Friedemann Kleint2015-04-072-4/+6
| | | | | | | | | | | | | | | | | | | | - 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>
* | Improvide device selection in the video filter exampleLaszlo Agocs2015-03-163-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add Linux and AMD support to the OpenCL filter exampleLaszlo Agocs2015-02-243-19/+45
| | | | | | | | | | Change-Id: I1ea91f93677c53322c3867db6069e4362c58cebd Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-12123-1203/+1027
| | | | | | | | | | | | | | | | | | 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>
* | Add video filtering support to VideoOutputLaszlo Agocs2015-02-036-0/+764
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Doc: Updated the \brief statementsVenu2014-10-242-12/+8
| | | | | | | Most of them were unnecessarily long. Change-Id: I8942254c2211adb268e399056435e6acc940616f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Updated snapshots for qmlvideo example documentationTomi Korpipää2014-09-295-2/+2
| | | | | | Task-number: QTBUG-36287 Change-Id: I9da63560ba92a572d6d3943cfdade0b609469ace Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* QMLVideo Example visual updateTomi Korpipää2014-09-2628-322/+290
| | | | | | Task-number: QTBUG-36287 Change-Id: I797a995c2ccd6f6fec40fbf50f93e297ae15a9b1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Make the multimedia examples less verboseAlex Blasche2014-09-227-29/+0
| | | | | | | | | 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>
* Remove QtSystemInfo dependency from Multimedia examplesAlex Blasche2014-09-195-93/+0
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-015-4/+12
|\ | | | | | | | | | | | | | | | | Conflicts: src/gsttools/qgstreamervideoinputdevicecontrol.cpp src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
| * Improve Magnify and Ripple effects on video shader exampleNiels Weber2014-08-185-4/+12
| | | | | | | | | | | | | | | | | | 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>
* | Update license headers and add new license filesAntti Kokko2014-08-2499-1872/+1080
|/ | | | | | | | | - 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>
* Doc: link errorsNico Vertriest2014-07-011-2/+1
| | | | | | Task-number: QTBUG-34749 Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-122-0/+2
| | | | | | | | | 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>
* Fix documentation of qmlvideofx examplev5.3.0-rc1v5.3.0Niels Weber2014-04-3012-18/+9
| | | | | | | | | | 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>
* Handle resizing of mainwindow betterNiels Weber2014-04-301-1/+2
| | | | | | | Task-number: QTBUG-38121 Change-Id: I877fd5c626418a91850d43de31e71351c14eef25 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Selecting something now closes menuNiels Weber2014-04-301-28/+48
| | | | | | | | | 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>
* Add missing background for effect selection list.Niels Weber2014-04-302-17/+22
| | | | | | | | | | 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>
* Rework qmlvideofx exampleNiels Weber2014-04-1847-1037/+723
| | | | | | Task-number: QTBUG-38121 Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Doc: Improved example documentationJerome Pasion2014-04-142-11/+11
| | | | | | | | | | | | | | | -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>
* Fix file browser in qmlvideofx example.Friedemann Kleint2013-08-192-13/+10
| | | | | | | | | | | Similar to de9092389f2e43370c2cfcd6759d08cc11da9a68 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>
* Remove left-over debug output.Friedemann Kleint2013-07-311-1/+0
| | | | | | | Task-number: QTBUG-32139 Change-Id: I52843ca104e422fb02112949191dbcd4642905a5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix file browser in qmlvideo example.Friedemann Kleint2013-07-302-8/+12
| | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-206-9/+9
|\ | | | | | | Change-Id: I0361cbb4f5398bb13e675c3de04519c414daea43
| * Fix for url bug in the qmlvideo examples.Christian Strømme2013-06-136-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-132-32/+32
|/ | | | | | | | | | | | | 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>
* qmlvideo example, add missing #ifdef PERFORMANCEMONITOR_SUPPORTv5.1.0-beta1David Fries2013-05-081-0/+2
| | | | | | | | 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>