summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Add the spot for spot metering mode.Michael Goddard2012-01-063-0/+53
| | | | | | | Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-063-3/+3
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0626-26/+26
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-055-7/+7
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adding hasAudio and hasVideo properties to QML MediaPlayerMithra Pattison2011-12-292-0/+37
| | | | | | | | | | Adding hasAudio and hasVideo to MediaPlayer QML object to allow users to determine whether the current media has audio and/or video streams. Also adding notifies for when these properties change. Change-Id: Ife7606e148f0c0ad558b4019c68c70973c199c08 Reviewed-by: Sergey Dubitskiy Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added Video.qml to QtMultimedia, Video componentAngus Cummings2011-12-233-1/+109
| | | | | Change-Id: I0f5707a7cae931988aaddced23ad157105d0643b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the module prefix from a number of includes.Michael Goddard2011-12-095-7/+7
| | | | | | | Since I get build failures due to other changes in lower modules. Change-Id: Iac6a814071c019de25db52daf941185337fad14a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Registered CameraFlash qml typeDmytro Poplavskiy2011-12-081-0/+2
| | | | | Change-Id: I0d05006dcfd690b2246bc0ccfea468168b207333 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Fix warnings about declarative/quick.Friedemann Kleint2011-12-056-8/+8
| | | | | Change-Id: Ic9323b222641e41dae05cb4b0dccb6531e845676 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Implemented QDeclarativeCameraCapture::setMetadataDmytro Poplavskiy2011-12-012-3/+9
| | | | | | | QMetaDataWriterControl is used if it's available. Change-Id: I18fd36c411b6d3c397ff22ebfea9b2c0e878cdeb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add orientation support to VideoOutput.Michael Goddard2011-11-254-11/+126
| | | | | | | | | Just uses an integer to represent the degrees rotation from standard. Only supports multiples of 90 - other rotation can be done with standard QML. Change-Id: Id4013169c5d9da473b6e5be94ba341da21c2f2a3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated I420 video node to be consistent with RGB node implementation.Dmytro Poplavskiy2011-11-242-94/+120
| | | | | | | | | | Don't keep the frame after it was uploaded to texture; Upload frame data during rendering (in material shader updateState) instead of updatePaintNode(). Change-Id: Ia6a4063bfa02d4d20f75735649fe4f777cf50494 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* VideoOutput: release video frames when the video surface is stopped.Dmytro Poplavskiy2011-11-223-0/+24
| | | | | | | | It's necessary to release video frames during media pipeline shutdown or reconfiguration. Change-Id: I386ad4d173b8731f257ec9272ef8c46a27769bd0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed qtmultimedia imports -qtnamespace issues.Toby Tomkins2011-11-214-0/+12
| | | | | Change-Id: Ie7896faf92b3cc5fdf2b6dbe885913c2669e6e36 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added support for non QMediaObject based VideoOutput sources.Dmytro Poplavskiy2011-11-152-8/+34
| | | | | | | | | | | | VideoOutput element checks first for mediaObject property of source object and if it's not available it checks for videoSurface property. It allows to implement video frames generator and connect it to optimized VideoOutput QML element. Change-Id: I8ee618cf61b9d9100f25e742c631ea8724c188dc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Change the order textures are bound.Michael Goddard2011-11-081-2/+2
| | | | | | | | Leave texture unit 0 active at the end, since the active texture unit is not restored by SG itself. Change-Id: I4970a955fea5c9342cc93c1d1b07ffbfb71e5f04 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Adapt to QtDeclarative api renaming (QSG --> QQuick)Kent Hansen2011-10-242-6/+6
| | | | | Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added RDS functionality to the QRadioTuner/QDeclarativeRadioSami Nurmenniemi2011-10-216-0/+315
| | | | | | Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Init mediaobject at classBegin rather than componentCompleteLing Hu2011-10-171-7/+9
| | | | | | | | | | | | Since we use an explicit backgroundaudio class, there is no need to wait for other property to determine the mediaobject type. So it is better to init the mediaobject at classBegin to prevent being accessed before mediaobject initialized. Change-Id: Ia55b8b4c1ab70cc0acbf6f49bcb3e20bdb813a88 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Make the C++ API of QSoundEffect public.Michael Goddard2011-10-171-1/+1
| | | | | | | | | The QML API already was. The C++ API still needs good documentation, though. Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Declarative VideoOutput: added support for more rgb formats.Dmytro Poplavskiy2011-10-145-163/+294
| | | | | | | | | | RGB 565, RGB 32 and BGR 32 formats added, all of them supported with OpenGL ES. Change-Id: I026628611c59575af5934bac0a5f95dfbc6770cb Reviewed-on: http://codereview.qt-project.org/6644 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Multimedia: Compile on Windows.Friedemann Kleint2011-10-123-7/+10
| | | | | | | | | | | MSVC is more strict about #include <> and #include "". Reviewed-by: Ling Hu <ling.hu@nokia.com> Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5 Reviewed-on: http://codereview.qt-project.org/6134 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-0715-192/+206
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update background audio element to use new service nameLing Hu2011-09-303-4/+6
| | | | | | | | Change-Id: I8f0480e4fb40b034f75dcd900f2d440fd0e7610d Reviewed-on: http://codereview.qt-project.org/4493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Merge branch 'camera' of ↵Michael Goddard2011-09-2616-963/+2322
|\ | | | | | | | | | | | | | | | | | | ssh://codereview.qt-project.org:29418/qt/qtmultimediakit Conflicts: src/imports/multimedia/multimedia.cpp src/imports/multimedia/multimedia.pro Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
| * QML Camera element redesign.Dmytro Poplavskiy2011-09-1216-960/+2320
| | | | | | | | | | | | | | | | | | | | Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* | Remove older QGLContext calls in favour of new QOpenGLContext.Michael Goddard2011-09-222-2/+5
| | | | | | | | | | | | | | Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877 Reviewed-on: http://codereview.qt-project.org/5339 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Don't re-set default properties in MediaBase::componentCompleteLing Hu2011-09-201-3/+6
| | | | | | | | | | | | | | | | | | This is to avoid conflicting with state restore from background playback. Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc Reviewed-on: http://codereview.qt-project.org/4397 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* | Build fix after refactorLasse Holmstedt2011-09-131-2/+3
| | | | | | | | Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
* | Fix some compiler warnings.Michael Goddard2011-09-051-0/+1
| | | | | | | | | | | | | | | | | | Mostly about deprecated ASCII casts. Change-Id: I70428913799c15f20a1a5f80be57848e1072e058 Reviewed-on: http://codereview.qt.nokia.com/4158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Add background audio element.Ling Hu2011-09-026-5/+244
| | | | | | | | | | | | | | Change-Id: I64c91beb7219cc148efc606e87e5f6e57b4b55ce Reviewed-on: http://codereview.qt.nokia.com/3574 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Added tune up and down methods, and changed name of scan methods.Jonas Rabbe2011-09-012-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of requiring developers using the radio API to read the frequency step, adding it to the current frequency and setting the new frequency, there has been added tuneUp and tuneDown methods. Also, the searchBackward and searchForward methods have been renamed to scanDown and scanUp which seem more logical. And cancelSearch has become cancelScan. Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e Reviewed-on: http://codereview.qt.nokia.com/4013 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* | Merge branch 'radio' into 'master'Jonas Rabbe2011-08-314-1/+375
|\ \ | |/ |/| | | Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
| * Added QML API for getting the limits for a specific radio band.Jonas Rabbe2011-08-302-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | Using properties for the frequency step, minimum and maximum frequency of the currently selected band. Also updated the declarative-radio example to use the minimum and maximum frequencies to show a tuner band for the radio. Change-Id: I9f28f10e98e008c14b10bdc12b0727086cd45f0b Reviewed-on: http://codereview.qt.nokia.com/3829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
| * Added first implementation of declarative radio elementJonas Rabbe2011-08-174-0/+359
| | | | | | | | | | | | | | | | | | | | | | | | Simply uses and mirrors radio tuner API directly. Also added an example which uses the new Radio element, the example should be functional, but cannot be tested on current setup (lack of actual radio tuner). Change-Id: I0f724ef239f65aef9c0640d4a3a9fa0d2e7242ed Reviewed-on: http://codereview.qt.nokia.com/2890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Initial implementation of QML2 VideoOutput elementDmytro Poplavskiy2011-08-1112-2/+1227
|/ | | | | | | | | Change-Id: I5ed00433fe5e993086ae1698b7344c8d60a5f0f6 Reviewed-on: http://codereview.qt.nokia.com/2727 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Temporarily removed include statements to disabled headersJonas Rabbe2011-07-211-2/+4
| | | | | | | Change-Id: I6810cadd68cb9567cb116242b32b3ae766d4aca6 Reviewed-on: http://codereview.qt.nokia.com/1916 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the QtQuick1 stuff from Audio.Michael Goddard2011-07-211-3/+3
| | | | | | | Change-Id: I82f0c62bc524d6e8903528ed673e0c4880c4b60d Reviewed-on: http://codereview.qt.nokia.com/1911 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed assert to match uri syntax for Qt 5 declarative modulesJonas Rabbe2011-07-201-1/+1
| | | | | | | Change-Id: I27e125694b1d1830db8039d1188c79cd8d6ccb29 Reviewed-on: http://codereview.qt.nokia.com/1861 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove most of the "mobility" references.Michael Goddard2011-07-198-8/+8
| | | | | | | | | Docs still need some fixing, but there are some legitimate usages of it there. Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162 Reviewed-on: http://codereview.qt.nokia.com/1736 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove some obsolete bits.Michael Goddard2011-07-181-10/+0
| | | | | | | | | They can be updated again later when things are more stable, if needed. Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27 Reviewed-on: http://codereview.qt.nokia.com/1724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Prepare for QtQuick2 based declarative elements.Michael Goddard2011-07-152-19/+19
| | | | | | | | | | | Disable the QDeclarativeItem based components until they are ported to scenegraph, and bump the revision to 4.0 (Once things are final, we can make it 5.0). Change-Id: Ib9c064722b80c38e711fbadc66966597c14a2b1a Reviewed-on: http://codereview.qt.nokia.com/1685 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fixed build breakJ-P Nurmi2011-07-144-4/+4
| | | | | | | | | | | QDeclarativeItem and QDeclarativeView was moved from QtDeclarative to QtQuick1, also added qtquick1 module to the .pro file for the declarative camera example. Change-Id: Iae0828871d94d5f424b5329664303e2c0b9539bf Reviewed-on: http://codereview.qt.nokia.com/1559 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update licenseheader text in source files for qtmultimediakit Qt moduleJyri Tahtela2011-07-0812-204/+204
| | | | | | | | Replace old license header with correct one. Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308 Reviewed-on: http://codereview.qt.nokia.com/1318 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-2914-0/+4912
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 20:54:59 +0000