summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | GStreamer: port to 1.0.Yoann Lopes2014-11-271-1/+1
|/ | | | | | | | | | | | | | | 0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter <andrew.den.exter@qinetic.com.au> Ilya Smelykh <ilya@videoexpertsgroup.com> Jim Hodapp <jim.hodapp@canonical.com> Sergio Schvezov <sergio.schvezov@canonical.com> Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Doc: Added the missing screenshot imageVenugopal Shivashankar2014-11-032-0/+2
| | | | | Change-Id: Ifcef698bd735b7fe7e5f4a92984be07a01f283fb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Updated the \brief statementsVenu2014-10-2411-44/+38
| | | | | | | 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>
* Improve audiorecorder example.Yoann Lopes2014-09-262-24/+34
| | | | | | | | | | | | | - Show actual recording location - Update control buttons depending on the recorder state instead of the status - Create audio levels using the actual audio format from the audio buffers. The format from the QMediaRecorder might not always contain the value actually used. Task-number: QTBUG-36154 Change-Id: I418b4472b0d984f47efb1a1813da6ef440ba9a40 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Use QCameraInfo in camera example.Yoann Lopes2014-09-262-16/+13
| | | | | | | To replace QCamera::availableDevices(), which is deprecated since 5.3. Change-Id: I0b1bd6286ec78d6d26ce309d224369989d4a5063 Reviewed-by: Christian Stromme <christian.stromme@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-2211-68/+2
| | | | | | | | | 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>
* | New camera selection API in QML.Yoann Lopes2014-07-1710-47/+281
| | | | | | | | | | | | | | | | | | | | | | | | Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-102-8/+10
|\| | | | | | | Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
| * Fix AudioOutput example when no audio devices are available.Yoann Lopes2014-07-081-6/+9
| | | | | | | | | | | | | | | | Don't try to generate audio data with an invalid QAudioFormat, which can happen when no audio devices are available. Change-Id: I4de82dbf64def55fee21cf63ef99888a8084bd95 Reviewed-by: Christian Stromme <christian.stromme@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>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-262-5/+12
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a
| * Improved audiooutput and audioinput examples.Yoann Lopes2014-06-162-5/+12
| | | | | | | | | | | | | | Always show the default audio device first in the drop-down box. Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-1474-1126/+828
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
| * 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-1414-76/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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>
* | Remove some Q_WS_MAEMO_6 instances from examples.Robin Burchell2014-05-125-307/+1
|/ | | | | | | | | Some of this stuff no longer worked (setGraphicsSystem..) and generally speaking it just doesn't make much sense: widgets on Harmattan were never really a supported platform. Change-Id: Ia853c6b3297075f32e51d68a05121f700509632d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Improved declarative-camera example.v5.3.0-beta1Yoann Lopes2014-03-212-20/+20
| | | | | | | | | - Fix setting the white balance preset, it was never actually set on the camera - Improved the zoom control style Change-Id: I95c2851e5ad8409dd79306492271f221a61cb10d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Correctly update record button in AudioRecorder example.Yoann Lopes2014-03-171-0/+1
| | | | | | | | The record/stop button should have a "Record" text when QMediaRecorder has the LoadedStatus. Change-Id: I677845382b24ecf1f2351fc8e1e2e182b2c8d548 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Make declarative-camera example show frames in the correct orientation.Yoann Lopes2014-03-071-1/+2
| | | | | | | | VideoOutput's autoOrientation property should be set to true in order to always have the video frames in the same orientation as the screen. Change-Id: I76ebb2979070e52d4f62972d63896eada1a208be Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-032-3/+3
| | | | | Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* whitespace fixesOswald Buddenhagen2014-01-305-13/+13
| | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* don't error out on static buildsOswald Buddenhagen2014-01-101-2/+0
| | | | | | | | | | commit daa8e22 made it actually work, but apparently forgot to re-enable it. Task-number: QTBUG-35843 Change-Id: Ib782634a4b1916e25e22f0b4c4f7bf42bf92b52f Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix binding loop in declarative-camera exampleTopi Reinio2013-10-101-4/+0
| | | | | | Task-number: QTBUG-33879 Change-Id: I6d584fcaa049fb5be650797348452b4086dd6df0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Improve audiorecorder example.Yoann Lopes2013-10-095-133/+227
| | | | | | | | | | | - Possibility to select channel count - Show audio level for unsigned integer samples - Show audio level for each channel - Correctly set output file location - Update controls depending on the recorder status (rather than the state) Change-Id: Ieb08c379bb01a11ce1aa52a9d92ea1f320c87d49 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove Q_PACKED from structs that don't need to be packedThiago Macieira2013-09-171-5/+5
| | | | | | | | | | | | | | Those classes don't contain padding, they don't need to be packed. The only reason to be packed was to deal with bad alignment of the WAV file. Since Q_PACKED wasn't present in all compilers, this might have been a latent bug. If that was the case, then force it to happen with more compilers. Change-Id: I8449b6bab5d62c1b7e08b9bc205b4b149ed55e28 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.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>
* fix build without quickOswald Buddenhagen2013-07-301-1/+1
| | | | | | | | | (gui && qml) is not a sufficient condition for the availability of quick (e.g., missing opengl support can disable it). Task-number: QTBUG-32682 Change-Id: I3b7fb005528cc99239f59d34c7f70abeebcfa75c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Moved declarative-camera example in the right directory.Yoann Lopes2013-07-2430-6/+2
| | | | | | | | | This example was in the multimediawidgets directory but doesn't depend on or use the QtMultimediaWidgets module. Moved to 'examples/multimedia' instead. Change-Id: Ic2fcc6576e95664e0002531ee378a4366daa56c1 Reviewed-by: Jerome Pasion <jerome.pasion@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>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-142-1/+2
| | | | | | | | qmultimedia.h is included in more places, but qmediametadata.h is larger. This patch should reduce unnecessary #include-ing. Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903 Reviewed-by: Yoann Lopes <yoann.lopes@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>
* Doc: Fix example paths referred in documentationTopi Reinio2013-04-3014-14/+14
| | | | | | | | | | | 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>
* Fix file path bug in audiorecorder exampleAndy Nichols2013-04-162-22/+0
| | | | | | | | | | | | | Default path and name of the output wave audio files were wrong. This means the files did not have the right name to be opened on Windows, and did not have the right path because they were being saved to the root folder. (C:/ on windows, and / on OSX). Now we fall back to the default filepath and name when we try to record without giving a path and filename. Task-number: QTBUG-28663 Change-Id: I8c782a31710cac65cd3c1ecd44de10b41c46e93d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+2
|\ | | | | | | Change-Id: I905886417147ceb529ded43896939f65e66d7424
| * Disable FFT when building in static modeDavid Faure2013-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | This is because fftreal's pro file says: static: error(This library cannot be built for static linkage) Found due to a CI failure on win32-msvc2010_static_Windows_7. Change-Id: I2a4630410fa7a1bb4e6ab158a4f7ae76d5cacd8a Reviewed-by: Holger Ihrig <holger.ihrig@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 14:56:56 +0000