summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2533-677/+677
| | | | | | | | | | | This reverts commit 80d46e3a5f64ff2456c40bdba63b6d5c69a32cdd. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I5c64ffa120f916711e5cf01c828774f8456dec06 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2733-677/+677
| | | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtmultimedia. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reaso for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4171 Change-Id: I86ebf7c3653b55983cefff246c0cb019cbcda8c4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Deprecate Camera::error() signal in favor of errorOccurred()v5.15.0-beta2Alexander Akulich2020-03-102-2/+14
| | | | | | | [ChangeLog][Deprecation Notice] Camera::error() signal is deprecated in favor of errorOccurred(). Change-Id: Id80a3c72eec0529ef2f1e293e0afb503202a6d38 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Add flushMode to Video QML elementVaL Doroshchuk2020-03-061-1/+18
| | | | | | Fixes: QTBUG-82299 Change-Id: I3516bb8bacd0df497ba4c76acd4e71d7b82ec9db Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QCamera: Deprecate 'error' signal, use 'errorOccurred' insteadAlexander Akulich2020-03-032-3/+3
| | | | | | | [ChangeLog][Deprecation Notice] QCamera::error() (the signal) is deprecated; superseded by errorOccurred() Change-Id: Ie3214689db7f46cf36ac696339ac42beb5b921d4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-271-3/+33
| | | | | | Task-number: QTBUG-82253 Change-Id: I31080d4fcfeb3c955a503164327eb9b548381f70 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Introduce MediaPlayer::videoOutput propertyVaL Doroshchuk2020-01-223-0/+66
| | | | | | | | | | | | | | | | | This property holds the target video output, and allows to render video to multiple items. MediaPlayer { videoOutput: [videoOutput1, 1, "ignored", videoOutput2.videoSurface] } Incorrect inputs are ignored. The property also accepts single either QAbstractVideoSurface or QDeclarativeVideoOutput objects. Task-number: QTBUG-32939 Change-Id: I41fc557dcac60be6d70b3889036ff4ae75734cc0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-211-182/+127
|\ | | | | | | Change-Id: I0bc0e3caceaca0def467237983d9c611c46c5d7a
| * Doc: Fix QCamera and Camera docsLeena Miettinen2020-01-171-154/+105
| | | | | | | | | | | | | | | | | | | | | | Use \value for \qmlproperty enumeration instead of \table. Move some docs around. On C++ side, add leading sentences to \enum docs and remove empty lines from \value commands. Fix some language issues. Change-Id: If682c0a52d72babae563b075ed9ff987fdf16bd0 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Doc: Explain that the camera consumes power in Camera.LoadedStateLeena Miettinen2020-01-171-28/+22
| | | | | | | | | | | | | | | | | | | | Fix the QDoc code to use \value for \qmlproperty enumeration. Remove empty lines within \value on the C++ side, because they break the docs. Fixes: QTBUG-81364 Change-Id: I5b26e4ec9d86292d63d70c3751865ca26ff13fa0 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Expose video surfaces in rendering componentsVaL Doroshchuk2020-01-051-0/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Currently QVideoWidget, QGraphicsVideoItem and QML Video Output tightly depend on QMediaPlayer, QMediaService etc. Since QMediaService is deprecated and will be removed from Qt6, its usage must be removed from rendering components. * Also it is a part of a task to make all components independent, e.g. without dependencies to another components, like the media player, or video producer. These video consumer components should be reusable without QMediaPlayer too, which today is not possible, and should have responsibility for a single part of the functionality. * It is a part of a task to allow users to decide how to render video, using either video surface or native windows. Introducing QVideoWidget::videoSurface() QGraphicsVideoItem::videoSurface() QDeclarativeVideoOutput::videoSurface() that create a surface, if necessary, and returns the underlying video surface which provides a possibility to render video frames without knowledge of any services and controls. Can be used like: QMediaPlayer->setVideoOutput(QVideoWidget->videoSurface()); or QMediaPlayer->setVideoOutput(QGraphicsVideoItem->videoSurface()); This allows QMediaPlayer to get video frames from a backend, without using QVideoWidget/QGraphicsVideoItem, and to present these frames to provided surface. Moreover, now it is possible to render video frames without QMediaPlayer: QVideoSurfaceFormat format(img.size(), QVideoFrame::Format_ARGB32); videoWidget->videoSurface()->start(format); videoWidget->videoSurface()->present(img); [ChangeLog] Introduced videoSurface property to QVideoWidget, QGraphicsVideoItem and QDeclarativeVideoOutput. Task-number: QTBUG-80431 Change-Id: I49641750537160832e29c297279e72b8288e974c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-151-4/+1
|\ | | | | | | | | | | | | | | Conflicts: src/multimedia/video/qvideoframe.cpp src/plugins/directshow/player/directshowplayercontrol.cpp Change-Id: I00840245e35861cf4fe1d62789815ca125b2052a
| * Create QML camera.viewfinder eagerlyRatchanan Srirattanamet2019-10-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeCameraViewfinder connects to QCamera's statusChanged() to update its chached settings when the status becomes LoadedStatus or ActiveStatus. However, it's updated after QDeclarativeCamera has signaled cameraStatusChanged because QDeclarativeCameraViewfinder connects the that signal after QDeclarativeCamera, making those connected to cameraSignalChanged still receiving old values despite camera.cameraStatus already changed. This commit moves the creation of QDeclarativeCameraViewfinder into the constructor of QDeclarativeCamera, before the later connects to signals. This make values in camera.viewfinder reflects the correct value by the time cameraStatusChanged is signaled. A side effect of this change is that camera.viewfinder.resolutionChanged and similar signals will be signaled before camera.cameraStatusChanged. This might not be as bad as it seems; if the user of resolutionChanged checks camera.cameraStatus, the value will be correct anyway as it's not cached. Change-Id: Ief0c3d55e441cc872d37de937ba54fed0f2b877d Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Deprecate QRadioTuner and QRadioDataVaL Doroshchuk2019-10-011-0/+1
| | | | | | | | | | | | | | | | [ChangeLog] QRadioTuner and QRadioData classes are now deprecated. Task-number: QTBUG-75943 Change-Id: I54023ad344c494f4cddb62503ab47612a8b367e9 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | Update plugins.qmltypes for 5.14Kai Koehne2019-09-301-1/+275
| | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I50424fa744d13dbd9417d4bbd4752a30f7197ff0 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-0/+10
|\| | | | | | | Change-Id: Ic16cafaf6df356e430db4d60ad95610c855e1042
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-201-0/+10
| |\ | | | | | | | | | Change-Id: Ic46475146abe7b8493ae343e8332736fa6dcc3af
| | * GStreamer: Add docs for custom pipelinesVaL Doroshchuk2019-08-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The feature was added in 5.12.2. And it is relevant only for GStreamer backend. Change-Id: I87e22e506158dc61bb7f111e74806e7eb8c28d7a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-181-1/+1
|\| | | | | | | | | | | Change-Id: Ic3ac3515666576046ac1ec5342c5b06aadbc18ac
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-151-1/+1
| |\| | | | | | | | | | Change-Id: Ib819180a25ceedfb072362d55d30f94e40a44f9b
| | * Doc: Use correct property name for videoRecorderPaul Wicking2019-06-041-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-75623 Change-Id: I9a072d1d3056f58657b8b44e9350ae3506139117 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Deprecate canonicalUrl and canonicalRequest in QMediaContentVaL Doroshchuk2019-05-131-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | Since QMediaContent can contain only one content and media resources are already deprecated, canonicalUrl and canonicalRequest are a bit confusing and outdated. Deprecated and replaced by QMediaContent::request() which already contains the url. Change-Id: I418006e112f49466b0129bf1e6e1ae629c714538 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Doc: Fix multiple documentation issuesv5.13.0-beta3Topi Reinio2019-04-167-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-02-281-2/+12
| | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Ib9489bd9af646bcbf296d88dd3bc9664dc2bd284 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | Add a revision of QML VideoOutput flushMode property to 5.13VaL Doroshchuk2019-02-251-0/+3
| | | | | | | | | | Change-Id: Ie7982232af45fd09a46854c96d7c7d6672857a97 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-053-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace trUtf8() by tr() and implement QAbstractItemModel::roleNames(), fixing: multimedia.cpp:76:5: note: in expansion of macro ‘Q_OBJECT’ multimedia.cpp:143:77: warning: ‘static QString QMultimediaDeclarativeModule::trUtf8(const char*, const char*, int)’ is deprecated [-Wdeprecated-declarations] from multimedia.cpp:40: .... qdeclarativecamerafocus.cpp:403:23: warning: ‘void QAbstractItemModel::setRoleNames(const QHash<int, QByteArray>&)’ is deprecated [-Wdeprecated-declarations] setRoleNames(roles); Change-Id: I2648551a1b2774c45101ab1cad9e0ea3ab79ccbc Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* | Return default camera with not empty nameVal Doroshchuk2019-01-281-2/+2
|/ | | | | | | | | | QCameraInfo::defaultCamera() should not return empty name. QCamera() uses first found camera service. QCamera(QCameraInfo::defaultCamera()) uses the service which supports provided camera's name. Change-Id: I7a18b111997a605881eb6ec9788cb6e1d324c011 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Update plugins.qmltypesKai Koehne2018-09-241-14/+37
| | | | | | Task-number: QTBUG-70264 Change-Id: I41144db999c4d68c12ba8ded21092bea8b59f20e Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Automatically register the latest import versionKai Koehne2018-09-061-0/+3
| | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 2.11 in Qt 5.11) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: Ib14052fdf2a4cfa7b71f739fe00ce9a95dadb0a0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-2/+2
|\ | | | | | | Change-Id: I2442bd4b49e0a322c26d178fdb57d4a51b7a8835
| * Doc: Add missing dots (qtmultimedia)Paul Wicking2018-06-192-2/+2
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Ieed8aba484c17aa56bb688fdcc9cafdb8e638fa2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Idd5115528d9eadce89e4308ed43824c53154fe22 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* add missing capability properties to CameraImageProcessingJochen Seemann2018-02-013-0/+77
| | | | | | Task-number: QTBUG-45336 Change-Id: Iac47212b0a73b275795bd3051a2141f8089b7dc5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* add property supportedExposureModes to CameraExposureJochen Seemann2018-02-013-0/+34
| | | | | | Task-number: QTBUG-45336 Change-Id: I9b4f3271f7f56b88f2484f56dd1d37e2e97f5118 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* add supportedFocusModes and supportedFocusPointModesJochen Seemann2018-02-013-1/+71
| | | | | | | | | | This patch adds two properties to QML type CameraFocus, to gain feature parity with the C++ interface of QCameraFocus. Additionally, it deprecates the older, comparable functions. Task-number: QTBUG-45336 Change-Id: Iffc5c805409ed605dba5d4bc3fa2f05122b58b9e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-271-7/+19
|\ | | | | | | Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
| * Update plugins.qmltypes for 5.9Christian Stromme2017-10-201-7/+19
| | | | | | | | | | Change-Id: I3969c6e91438b9e411b8e93a304c666c2c36bf21 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Propagate customAudioRole into the QML classesJames McDonnell2017-10-234-1/+91
|/ | | | | | | | | | | | Propagate customAudioRole into the Audio, MediaPlayer and Video classes. [ChangeLog][Audio/Video/MediaPlayer] Added customAudioRole string property to enable use of audio roles beyond those available via the audioRole enum property. Change-Id: If3c4ec20f014653d31d1fa0d1ad925084f446478 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Prevent m_runningCount from eventually overflowingAlbert Astals Cid2017-06-161-1/+1
| | | | | | | | | | | | When m_loopCount is Infinite (i.e. -1) m_runningCount would go from -2 and down, eventuall wrapping and reaching 0 and thus stopping. This is a theorical problem since even if we had a 1 second video it would take lots of years to trigger but i guess it's better than having the value of m_runningCount be unbounded Change-Id: I340ec2157ece3334e58ab4afd77c34b478a256e9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* QtMultimedia: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-131-1/+1
| | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I42426cf89c328db73dc307f9f587654a048047ba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add missing override and remove redundant virtualAlexander Volkov2016-12-126-14/+14
| | | | | Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-121-1/+1
|\ | | | | | | Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
| * Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-111-1/+1
| |\ | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| | * Doc: corrected reference to parameter "end"Nico Vertriest2016-10-041-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia4c521b4eee8efd7afe6efd1f00f3c15fd138d9b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-111-3/+0
|\| | | | | | | | | | | Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-231-3/+0
| |\| | | | | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-221-3/+0
| | |\ | | | | | | | | | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | | * Remove unnecessary import statement in QML snippetYoann Lopes2016-09-201-3/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f34e52c4a8f72a91b1c673fe7e152335d8a0ade Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-215-16/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/multimedia.cpp Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-7/+7
| |\| | | | | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 09:12:33 +0000