summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* WavFile example: drop needless includesRolf Eike Beer2019-01-171-3/+0
| | | | | Change-Id: I26033a3d853dca8023fe4ec5f1eb7c53ef5d013f Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* WavFile example: fix indentationRolf Eike Beer2019-01-171-1/+1
| | | | | Change-Id: Ibc117caf24daef75cf2e71f04b058ffadd30c273 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Move shared example folder to examples/multimedia/sharedFrederik Gladhorn2018-08-076-5/+53
| | | | | | | | | | | | The root examples directory should not contains shared folders. In the past multimedia was the only module installing things there, now the qtdoc module started doing the same. Let's clean up both. Task-number: QTBUG-69784 Change-Id: I8ff9d1b899fd589c1f3ec83e11b603431c2e4950 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* Doc: Add missing dots (qtmultimedia)Paul Wicking2018-06-191-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: Ieed8aba484c17aa56bb688fdcc9cafdb8e638fa2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-0615-120/+134
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
| * examples: use Qt5-style connects where possibleJochen Seemann2017-12-1914-120/+123
| | | | | | | | | | | | | | | | | | 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>
| * winrt: Store output to cache locationMaurice Kalinowski2017-12-121-0/+11
| | | | | | | | | | | | | | | | | | By default sandboxing does not allow to store a file outside the package. Task-number: QTBUG-60904 Change-Id: I586616713315eadafd6bb24a8f8c12eb794557f6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-2/+12
|\| | | | | | | Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
| * Fix outdated BSD license headerLiang Qi2017-11-161-2/+12
| | | | | | | | | | Change-Id: I5b952a41be87f250810419674f52486acad34e07 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-2778-234/+914
|\| | | | | | | Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-2778-234/+914
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimedia/declarative-radio/view.qml src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
| | * Fix outdated BSD license headerKai Koehne2017-10-1868-205/+885
| | | | | | | | | | | | | | | Change-Id: I386d30a54819bae016cb50cf5892a5ac380288f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-1810-30/+30
| | | | | | | | | | | | | | | Change-Id: I9cd7043058352ba2aeded74f86d863fca29bd37d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1915-535/+414
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
| * | Modernize the Declarative Radio exampleVaL Doroshchuk2017-10-054-101/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added responsive UI. Added Button type. Task-number: QTBUG-60627 Change-Id: I69d10ad735706538b31c7bf1810e90d5a884a382 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Recorder exampleVaL Doroshchuk2017-09-285-75/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreach to for. Changed initialization style. Renamed QAudioLevel -> AudiLevel. Changed connection signal/slot style. Task-number: QTBUG-60627 Change-Id: I3538433680086a2c4ee52ee22a5180c6d824b897 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Output exampleVaL Doroshchuk2017-09-282-165/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed initialization style. Recoded toggleMode. Removed unneeded defines, function members. Changed signal/slot connection style. Changed foreach to c++11 style. Fixed bug with wrong duration seconds. Task-number: QTBUG-60627 Change-Id: Ib62f7979f2a32d629482026e0d954612b2665d66 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Input exampleVaL Doroshchuk2017-09-282-133/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded defines. Removed unneeded members. Removed using QScopedPointer where is not needed. Changed some member functions to lambdas in signal/slot. Changed initialization style. Recoded toggleMode. Task-number: QTBUG-60627 Change-Id: Iaf6bb297bc0b87509fcda956bfd082e80a3226c4 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Devices exampleVaL Doroshchuk2017-09-282-61/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the style of member initialization. Provided small cleanup. Changed 0 to nullptr. Changed to new signal/slot style if possible. Task-number: QTBUG-60627 Change-Id: I995d62b8d3741c719565f5b203b1046e8701d238 Reviewed-by: Christian Stromme <christian.stromme@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.9' into devLiang Qi2017-06-075-3/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
| * iOS: Add Info.plist files to indicate camera and microphone usageAndy Shaw2017-04-285-3/+5
| | | | | | | | | | | | | | | | | | | | Since iOS 10 the Info.plist file needs to indicate that it requires the usage of the camera and microphone in any application that requests them. So this adds Info.plist files to be used by the examples in that capacity. Change-Id: I16c6607366f57f4e950e53e1de1fbc0ac224df10 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | io-audio based audio management for QNX 7.0.0James McDonnell2017-03-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to setup and handle io-audio based audio management notifications. Add InterruptedState to QAudio::State. Indicates that this stream is in a suspended state because another higher priority stream currently has control of the audio device. Playback cannot resume until the higher priority stream relinquishes control of the audio device. Adjust the documentation for QAudio::State SuspendedState to reflect the fact that audio management events can also put the stream into this state. Add InterruptedState handling to the spectrum example. Change-Id: Ie8616af03ae4c503de1d0571a222e5853035cc0e Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Propagate audio category into the QNX audio output objectJames McDonnell2017-03-272-0/+20
|/ | | | | | | | | | | For QNX 7.0.0, set the QNX stream type to the audio category. 6.6.0 doesn't support stream types. Add a -category command line argument to the spectrum example so that the audio category can be specified. Change-Id: I6a81210ce07dc4bd2f6cf81983c2f3e4c480ef0d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devYoann Lopes2017-01-268-15/+15
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimediawidgets/videographicsitem/videoplayer.h src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
| * Examples: Add missing overrideAlexander Volkov2016-12-128-15/+15
| | | | | | | | | | | | Change-Id: I54529fdc8013497edb98ee97863fe4a141bdbf1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-124-1/+47
|\| | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
| * Move qtmultimedia over to the new config systemLars Knoll2016-11-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-113-0/+45
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-043-0/+45
| | |\ | | | | | | | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | | * iOS: add Info.plist to declarative-camera exampleRichard Moe Gustavsen2016-11-022-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains 'NSCameraUsageDescription', which is needed for the app to have access to the camera. Change-Id: I9843524f8eff84450156dfa7a9d6000c19c8ff8d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * 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>
* | | | Fix binding loop for declarative-cameraJochen Seemann2016-08-241-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | qrc:///VideoCaptureControls.qml:112: Error: Cannot assign [undefined] to QString qrc:///CameraListButton.qml:65:5: QML CameraListPopup: Binding loop detected for property "currentValue" Change-Id: I93105fb33f65654492faaefc0d9109851e353e59 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Use logarithmic volume scale in examples.Yoann Lopes2016-06-142-4/+4
| | | | | | | | | | | | | | | | | | | | | Sounds much better than a cubic scale. Change-Id: I4daaa333a5e1f24b93443d624b024a1263979538 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Use new volume conversion API in examples.Yoann Lopes2016-06-032-6/+23
|/ / | | | | | | | | | | | | | | Volumes sliders are now scaled cubically so that loudness changes are perceived linearly. Change-Id: Ibf00d6a97d872063d92457493417be5eb42f79ac Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-107-3/+16
|\| | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * fix example installsOswald Buddenhagen2016-04-286-0/+16
| | | | | | | | | | Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * winrt: Remove capability specificationMaurice Kalinowski2016-04-211-3/+0
| | | | | | | | | | | | | | This is handled with 34e0e908c896126138a95abdeba7456499d0fb68 in qtbase. Change-Id: I41cf27690189aefb3000de90df4a518d8dd449f0 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-085-0/+0
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I2ac34243ebe39c93860c5ac595c2f1eca4322eb8 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-222-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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-212-9/+10
|\| | | | | | | Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
| * Reinitialize audio when changing device in examplesMaurice Kalinowski2016-03-112-9/+10
| | | | | | | | | | | | | | | | | | Different devices might have different audio formats supported. Always relying on the format of the default device can cause the audio endpoint to not start/initialize. Change-Id: I4d05949fd023f2cc7eb1f75db3577242e0e66680 Reviewed-by: Oliver Wolff <oliver.wolff@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>
* winrt: add capabilities to launch app out of the boxMaurice Kalinowski2016-01-131-0/+3
| | | | | Change-Id: I1cb8a589ee61f1dbc53bfd70eb25e7d2000af13e Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Doc: Fix documentation warningsTopi Reinio2016-01-0810-41/+41
| | | | | | | | | | - 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>