summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add meta-data accessors to the QML Camera type.Andrew den Exter2014-07-074-46/+447
|/ | | | | | | | | | | Add write accessors to the properties of QDeclarativeMediaMetaData as well as additional properties for previously unmapped image keys and add a metaData property exposing this to QDeclarativeCamera. [ChangeLog] New metaData property for the QML Camera type. Change-Id: I4456b7b6120842f7ad9a1b175e42b9fb332adf13 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Make multimedia QML types available for the 5.3 import version.Yoann Lopes2014-06-101-0/+5
| | | | | | | | At least one type needs to be registered with the 5.3 version number to make it known to the QML engine. Change-Id: Iacfe62650b4194fbb89135fef7cb148309227ce2 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Improve documentation for the QMediaPlayer::bufferStatus property.Yoann Lopes2014-05-151-4/+16
| | | | | | | | The corresponding properties in the Audio and MediaPlayer QML elements are also updated. Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-121-0/+4
| | | | | | | | | 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 some MediaPlayer properties returning wrong values.Yoann Lopes2014-04-091-22/+22
| | | | | | | | Once the QML component is complete, don't cache any value anymore and always ask the backend for the actual value. Change-Id: I2c3ad55618e0532f713cfcc8258a70a1114fc975 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Doc: fix two typosZhang Xingtao2014-03-262-2/+2
| | | | | | Change-Id: I5f417384ce75d8dc2063f92d0116f516f261e4aa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix enums for QML camera types.Yoann Lopes2014-03-246-41/+98
| | | | | | | | | | | | | | CameraExposure, CameraFlash and CameraFocus had signals and functions using enum-type arguments declared in QDeclarativeCamera. This doesn't work since an enum and a function using it both need to be declared in the same class in order to work from QML. The relevant enums have been duplicated (not moved, in order to preserve QML source compatibility) from QDeclarativeCamera to QDeclarativeCameraExposure, QDeclarativeCameraFlash and QDeclarativeCameraFocus. Change-Id: Ib307d7c6c9dbc59b1b82782913397160be38d4cd Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Tidy up Audio documentation.Mitch Curtis2014-03-191-3/+3
| | | | | Change-Id: I864ba13375d7b8b035686c11687e76fbf672c431 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-187-36/+92
| | | | | | | | | Append the handler names to the end of the corresponding signal doc. Task-number: QTBUG-35846 Change-Id: I325cdab75ef18a19c9f29d6333039c31baa8daf6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add missing documentation for Audio and MediaPlayer loops property.Yoann Lopes2014-03-101-0/+24
| | | | | | Task-number: QTBUG-35306 Change-Id: If0e9784ede5db887d3756972e8db54b5485d6cdd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-032-3/+3
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-2015-2818/+2
| | | | | | | | | Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools library to make the QDeclarativeVideoOutputBackend interface implementable by a plugin. Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix recording settings being discarded by the Camera QML type.Andrew den Exter2014-01-132-0/+11
| | | | | | | | | | Query existing settings from the recorder instead of locally cached settings as some other agent may have applied some settings separately and those would otherwise be discarded. Change-Id: I0ebeaf06c6f7306c5987aa269032842b538a6a8b Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fixed some documentation for VideoOutput qml type.Yoann Lopes2014-01-061-2/+2
| | | | | | | | mapPointToSource() and mapPointToSourceNormalized() were documented with the wrong name. Change-Id: Ia128f698a02f1c865bc27443ef2c6cef8fc7a720 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix version availability for VideoOutput's autoOrientation property.Yoann Lopes2013-11-303-3/+3
| | | | | | | | | This new property is available since 5.2, not 5.1. Change-Id: Ie3b5cd3c5d909f6d4ba662a2eaf03f1e6bb8b21b Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* iOS: Remove duplicate class name from qmldirAndy Nichols2013-11-191-1/+0
| | | | | | | It was added twice, which breaks the build when using Multimedia on iOS Change-Id: I0b5f08bc57d5d558fb060b00d5bdeb4149499a0d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Add classname entry to qmldir file.Morten Johan Sørvig2013-11-071-0/+1
| | | | | Change-Id: Id2351ddd151ca917ba5d6f032a2bd7c2d62acd79 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add classnames for QML plugins.Andy Nichols2013-11-041-0/+1
| | | | | | | Needed for static builds on iOS Change-Id: I2e16353a50661ac5b65a80fd37363b6e29c8b4a7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Correctly clear the current media in Audio and MediaPlayer qml elements.v5.2.0-beta1Yoann Lopes2013-10-182-7/+9
| | | | | | | | | | When setting the source to an empty string in these elements, pass an empty QMediaContent to the backend rather than an empty URL. The former is the correct way to clear the current media. Task-number: QTBUG-34125 Change-Id: I3dd7b07abc0bd23a1253c8c0e075b174c17a4d3f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Doc: Removing version number from the QDoc comments.Jerome Pasion2013-10-0212-271/+271
| | | | | | | | | | The version is not needed anymore and QDoc handles them as a different module, causing errors. Task-number: QTBUG-32172 Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated usage of \qmlmodule and \inqmlmodule.Jerome Pasion2013-10-0213-14/+14
| | | | | | | | | | -\qmlmodule denotes the import statement "QtMultimedia 5.0" -\inqmlmodule shouldn't have the version number and this commits removes it because it is confusing. Task-number: QTBUG-32172 Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Android: refactor video renderer.Yoann Lopes2013-10-011-0/+7
| | | | | | | | | | | | | Removed the overhead of having to create a shared OpenGL context in the GUI thread and pre-render the frame into a FBO. We now directly render the GL_TEXTURE_EXTERNAL_OES in the QtQuick render thread, using an Android-specific QSGVideoNode. We also use a callback from the render thread to create the texture from there and not have to create a separate shared OpenGL context. Change-Id: I6c8eb94b47d0a03329c912701b8af3fb5ebd1876 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* VideoOutput: take the video format's scanLineDirection into account.Yoann Lopes2013-09-271-0/+6
| | | | | | Task-number: QTBUG-30442 Change-Id: Ic950d66cb35a937ccf3862089e0060819b6d6f34 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix "conversion from 'double' to 'float'" warnings on MSVC2010.v5.2.0-alpha1Mitch Curtis2013-09-241-12/+12
| | | | | Change-Id: I209d76fa2d87ad2eb540c750b8c4efb865441aae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-0/+13
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-0/+13
| | | | | | | | | | | | | | Task-number: QTBUG-31388 Change-Id: Ia65490a262417f98fe69a89637ec2f9e7c0d0095 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-239-30/+94
|\| | | | | | | Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
| * Fixed signal not being emitted in QDeclarativeCameraFocus.Yoann Lopes2013-05-171-1/+4
| | | | | | | | | | Change-Id: If504ec5ecc59c46edeac24442181eedaacc7e5d8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-141-0/+1
| | | | | | | | | | | | | | | | 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>
| * VideoOutput: Take the surface's viewport into accountThomas McGuire2013-05-076-14/+74
| | | | | | | | | | | | | | | | Task-Number: QTBUG-30410 Change-Id: I480ce0bcd7ec136e54b5bfc5fec0e901141b72d8 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Fix missing element name in VideoMasaya TAKAHASHI2013-05-061-15/+15
| | | | | | | | | | | | Change-Id: I2237bf4a1da632f0528cfb9e6b32ea88f3930350 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-291-2/+0
|\| | | | | | | Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
| * remove pointless LIBS pathOswald Buddenhagen2013-04-261-2/+0
| | | | | | | | | | | | | | QT+=multimedia handles that already. Change-Id: Ifc3be513be10d89de3ea03f11f9d41d7d56d432b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-121-2/+2
|\| | | | | | | Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
| * Doc: Fix minor typosSze Howe Koh2013-04-101-2/+2
| | | | | | | | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add autoOrientation property to QDeclarativeVideoOutputTobias Koenig2013-03-193-1/+59
|/ | | | | | | | | | | | The autoOrientation property is a flag to switch on/off automatic rotation of the video output, depending on the current screen orientation, to always show the output upright. This is useful when the VideoOutput is used as viewfinder for a Camera. Change-Id: I72753888592dc59c9adaa3343bfec8b168343229 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1939-53/+78
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Fixed a connection to a slot that doesn't existsTasuku Suzuki2013-02-131-1/+1
| | | | | | | | | | Change-Id: I7f94bab4e230996ace46d1c04d9d5a66ad9443d5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Fix module name formatSze Howe Koh2013-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * WMF: enabled HW-accelerated video decoding for the QML video item.Yoann Lopes2013-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It also applies to QGraphicsVideoItem when used on a GL viewport. We now have a new video sink that is based on Microsoft's EVR sink, we just replace the default Presenter with our own. Frames are rendered into D3D surfaces using DXVA, then copied into a shared D3D/EGL surface and finally bound to a GL texture to be used by the video surface. The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt must be compiled with ANGLE for this new video sink to be compiled and used. Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fixed QSGVideoNodes not deleting their materials.Yoann Lopes2013-01-153-0/+3
| | | | | | | | | | Change-Id: Ia7597ade3066c23c54354e2cc36c907e6bf0dfea Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-152-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Added seek() function to QML Video item and updated documentation.Yoann Lopes2013-01-151-3/+26
| | | | | | | | | | | | | | | | | | | | The Video item inline example was wrong, changing read-only properties. Task-number: QTBUG-28741 Change-Id: Ia1f6c1110a301a96743e7ebfec51731fcaf6a862 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1038-38/+38
| | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Make QtMultimedia an identified moduleOleg Shparber2013-01-041-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-28376 Change-Id: I7b27dc52b3085eb50695e559029f2533aa743d4f Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2813-52/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Update plugins.qmltypesKai Koehne2012-12-071-224/+63
| | | | | | | | Run with option nonrelocatable. Change-Id: I689d5d745dac9325aeb5db81484054b0dcdb9d24 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix compilation with -no-rtti.Friedemann Kleint2012-11-191-1/+4
| | | | | | | | Availability of dynamic_cast should be checked. Task-number: QTBUG-27939 Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix the bufferProgress property of QDeclarativeAudioAndras Becsi2012-11-071-1/+1
| | | | | | | | | | | | The bufferProgress property of QDeclarativeAudio is documented to hold how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full) and should be declared to be of type qreal instead of int. The implementation was correctly normalizing the buffer status percentage to the [0, 1] range but the returned value was truncated to int in QML because of the faulty property declaration. Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0611-38/+38
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 21:10:14 +0000