summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-0611-238/+236
| | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-0514-76/+12
| | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now. note that in the qmediaserviceprovider test we must override that. also, TARGET munging is done automatically. Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add install path to ruleMaurice Kalinowski2012-10-221-0/+3
| | | | | | | | fix installation into prefix directory. Change-Id: I6838589e2e186d4f23d240e0e7c2772a46af3a9d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Fix for QuickTime 7 media player backendCaroline Chao2012-10-193-16/+33
| | | | | | | | | Fix build on Mac 10.6 (32bits) Task-number: QTBUG-27179 Change-Id: If0b83605650966bf801b5fbb06d02c113d0b4214 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Add MediaPlayer support to AVFoundation pluginAndy Nichols2012-10-1925-1/+3591
| | | | | | | | | | This plugin would be used on Mac 10.7+ where without the QuickTime C API our QT7 media player performance was crippled. Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Make QGstreamerPlayerSession 'VAAPI-aware'.Yoann Lopes2012-10-172-0/+86
| | | | | | | | | | | | | | | | At the moment the GStreamer player pipeline is not setup properly when the VAAPI plugin is available, resulting in no video being shown. Added 'video/x-surface' as one of the default raw formats for the decodebin. Don't use vaapidecode when the video sink is not compatible. This is a preliminary patch to support VAAPI. In the current state vaapidecode will never be used as none of our video sinks support the video/x-surface format. Change-Id: I39f339b483d4052dd1e29c2b0ef06343d5670224 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-10-171-1/+0
| | | | | | Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fixed AVF camera backend build with namespaced QtDmytro Poplavskiy2012-10-093-4/+6
| | | | | | | | Objective-C declarations may only appear in global scope, moved them out of Qt namespace Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Blackberry: Move the mediaservice plugin in a subdirectoryKevin Ottens2012-10-0815-32/+37
| | | | | | | | | Move the current platform plugin content in a subdir in order to make room for several plugins (at least an extra one will be needed for the audio type). Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24265-6359/+6359
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix gstreamer plugin build for platforms with qreal -> floatRomain Pokrzywka2012-09-141-1/+1
| | | | | | | | | | simple case of qFuzzyCompare with double and float. I kept m_volume as double rather than changing it to float, to mimic the behavior of the mute variable. Change-Id: Ife2f58f60738215ebd430ba94bef885c09994e72 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* remove references to qMemSet & qMemCopyOswald Buddenhagen2012-09-123-6/+6
| | | | | Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-1212-24/+0
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Blackberry: Add Q_DECL_OVERRIDE keywordsThomas McGuire2012-09-064-45/+45
| | | | | Change-Id: Ibd6cf76ac41e16cbf65182994d68eb81c315f0af Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide the video overlay when the QML element is hiddenThomas McGuire2012-09-061-0/+3
| | | | | | | | An display invalid rect is used for invisible QML items. Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* Blackberry: Use debug output for errors by defaultThomas McGuire2012-09-051-12/+4
| | | | | | | This makes diagnosing problems remotely a lot easier. Change-Id: I23434af5e88fb8dcdb154be34f12276eba652d4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* WMF Backend: Fix crash in MFPlayerService::releaseControl.Jason Barron2012-09-041-0/+2
| | | | | | | | | | | When releasing a video render control or a video window control, we were deleting the object pointed to by the 'control' pointer, but were not setting this pointer to 0 which left it dangling. Shortly after we tried to cast this dangling pointer to another type which crashed. The solution is just to return after deleting the control. Change-Id: I9ab672c8b86a13af889d87c76141e6b8db5b74a7 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Initial implementation of Mac camera backendDmytro Poplavskiy2012-08-2727-0/+3009
| | | | | | | Based on AVFoundation framework Change-Id: If4cfd105a592f50b42606624548b9ffc870e3e47 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Re-enabled CIImage based gfx video item on MacDmytro Poplavskiy2012-08-271-3/+3
| | | | | | | | | Also prefer CoreImageHandle to GLTextureHandle in QuickTime player backend, to avoid unnecessary copy via FBO. Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qt_module is deprecated, use qt_build_configOswald Buddenhagen2012-08-061-1/+1
| | | | | | Change-Id: Idbc3c1d35b859317ac1128c4dc3754996e816911 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Change the way camera format is selected.Lev Zelenskiy2012-08-061-20/+36
| | | | | | | | | | | Build list of supported formats before starting directshow graph. Select first available format supported by both device and surface. Force DirectShow to do color space conversion instead of using QImage. Change-Id: I8f946cc7c2693eea0135981e899003b453bd8784 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Use moniker display name for device string.Lev Zelenskiy2012-08-034-148/+92
| | | | | | | | Moniker names are unique, while device friendly names are not. Change-Id: Ic3e842e49d04c502cf5ad1fc40f89db657f0401a Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Use QStandardPaths instead of QDesktopServicesThiago Macieira2012-08-022-4/+4
| | | | | | | | | The use of QDesktopServices for getting paths is deprecated in favour of QStandardPaths. Change-Id: I93c4a15dd65962d668c90e78f3f33f357e2450bb Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Blackberry: Assert that we are in detached stateThomas McGuire2012-07-301-0/+3
| | | | | Change-Id: I744d542374c72318b548407cd3da084449822e92 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix spurious position udpates in playlistsThomas McGuire2012-07-301-1/+6
| | | | | Change-Id: I2652cab793034e55a4eb7e52bb534c22983d9517 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix playlists not advancing to the next track.Thomas McGuire2012-07-301-2/+4
| | | | | | | | | | The playlist watches for state changes to the EndOfMedia state, which wasn't used in the plugin yet. Change-Id: Ib2a014177df2273cd46baaef1392a73e54daf06c Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix playback from certain URLsThomas McGuire2012-07-302-27/+43
| | | | | | | | Previously, playback from URLs of the form "file:path/to/file" did not work. Change-Id: Iecd293d09f7c448438dbf259710c0aab218c2591 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed: use selected audio input device.Lev Zelenskiy2012-07-301-1/+1
| | | | | | Change-Id: I6bde75bff93160169f9c28ad658db40b03c266f4 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Audio probes for AudioCapture plugin.Lev Zelenskiy2012-07-306-3/+206
| | | | | | Change-Id: Iea37d455ee53c9d055af4f9ca62d8a9ea241d31f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Blackberry: Fix case of setting multiple media filesThomas McGuire2012-07-282-3/+12
| | | | | | | | | | Abort the singleshot timer when the media is changed, as otherwise continueLoadMedia() was called multiple times. Also, don't use a singleshot timer when setting a null media. Change-Id: I19d4838c9c70e7fcaa790c223cb19ac3e0246e6b Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix metadata reader for more recent OS versionsThomas McGuire2012-07-281-1/+6
| | | | | | Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix compilation issue with MinGW (disables the usage of strsafe.h).Lukas Geyer2012-07-251-0/+4
| | | | | | | | | | | Recent versions of MinGW include strsafe.h in dshow.h. strsafe.h undefines all non-safe string functions, including vsprintf and others, to prevent their usage. This causes QString and others to fail. Defining NO_DSHOW_STRSAFE before including dshow.h prevents this behaviour. Change-Id: I012fecbabc5c11900486c1dfdc970a00613ef6f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Blackberry: Compile with lastest event filter API changesThomas McGuire2012-07-242-69/+51
| | | | | | Change-Id: I4eb7ddf050cd8ef34df4547482f53f7372584221 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: David Faure <faure@kde.org>
* Replaced endpoint control with audio input and output controlsDmytro Poplavskiy2012-07-2416-84/+84
| | | | | Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume property to QMediaRecorderDmytro Poplavskiy2012-07-198-4/+63
| | | | | Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: removed fifo based stream playback fallbackDmytro Poplavskiy2012-07-193-137/+5
| | | | | | | | | | It was used on systems without appsrc element support, but since the appsrc is part of base elements for a long, thre is a very little value in fifo based fallback. Change-Id: I162233cbb55821443c892f00ebd29c0498ae7152 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Videoprobe implementation for wmf backend.Lev Zelenskiy2012-07-199-9/+1139
| | | | | | Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Camerabin camera service: configure default video settingsDmytro Poplavskiy2012-07-168-24/+107
| | | | | | | | | encodebin doesn't like the encoding profile with ANY container caps, if container and codecs are not specified try to find a commonly used supported combination Change-Id: Icbde042bd17d9682112fb8bbb8f0d506f6ddebe1 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated the camerabin2 based camera with QtMultimedia changesDmytro Poplavskiy2012-07-1643-190/+746
| | | | | | | | | | | | | | Moved it to the separate plugin as the rest of gstreamer based services; Updated with libqgsttools_p changes; Implemented QMediaRecorder::status property; Made gst_photography dependency optional, it's not always available on desktop; Added video recording case to auto integration test; Moved backend implementation into qt namespace Task-number: QTBUG-26046 Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Audioprobe implementation for wmf backend.Lev Zelenskiy2012-07-119-5/+610
| | | | | Change-Id: I63af91af870cb92c838c1ab5d4752815aa60a03f Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Added wmf implementation for QAudioDecoderControlLing Hu2012-07-1114-12/+1040
| | | | | | Change-Id: Ib6d5c93577bd55995a9ae51e757156149890f15d Reviewed-by: Jun Zhu <jun.5.zhu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed qaudioinput unit test with pulseaudio backendKurt Korbatits2012-07-111-0/+6
| | | | | | | | - notify signal wasn't being emitted enough. - range checking on processedUSecs extended. Change-Id: Icfa1f3b364a7e0f9d3f37abd8dc5ed0c1e22f923 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-104-23/+23
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Blackberry: Fix erratic video resize behaviourThomas McGuire2012-07-101-1/+1
| | | | | | Change-Id: I699e7f81abb73e75eca2ddda22c7e5f2e852fcd5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst capture: use QDesktopServices for default storage locationDmytro Poplavskiy2012-07-091-0/+6
| | | | | Change-Id: Icff46f2dc88572beab2eb835e24424f15ff05616 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a potential leak in wmfLing Hu2012-07-051-0/+1
| | | | | Change-Id: I4fc039aeaf00a02122d5e11867c73223cc2ebbc1 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst capture: report the actual media location to applicationDmytro Poplavskiy2012-07-041-0/+2
| | | | | Change-Id: I2ebc7b9607fe499e2465428118bff3fe98e58672 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed QML video playback on MacDmytro Poplavskiy2012-06-293-12/+141
| | | | | | | | | | | | Use the same CIImage based video frames as with QGraphicsVideoItem, but since CIImages can't be rendered directly in Scene Graph, the frame is rendered to FBO first. Task-number: QT-5423 Change-Id: I16f7e6351578bae21f8642a8028538c441e1f544 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst Capture: image capture fixesDmytro Poplavskiy2012-06-293-2/+25
| | | | | | | | | Report camera is ready to capture only in image capture modes; Emit capture failed if camera not configured for capture Change-Id: Ia2b92e2f8c760db948185a29c3e5ceae81dd3af4 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Gst capture service: capture mode fixesDmytro Poplavskiy2012-06-293-6/+22
| | | | | | | | | | Fixed reporting the current capture mode Set the correct default capture mode Allow viewfinder only and Video+Image capture modes Change-Id: Ib12504304bca22fe664631ff5ffbc0a392ba34a8 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
View Lorry Controller Status