summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Add PLUGIN_CLASS_NAME to qtmultimedia pluginsMiikka Heikkinen2012-12-1014-0/+14
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* WMF: Recreate the MFMediaSession when loading a new media.Yoann Lopes2012-12-078-47/+133
| | | | | | | | | | | | | | MFMediaSession doesn't seem to handle correctly the change of media source, causing the playback not to work afterwards. A single MFMediaSession was created and used for every loaded media, we now create a new one whenever we load a new media (releasing the old one beforehand). Task-number: QTBUG-26819 Change-Id: Id99c9dd54e161823d9580933e063f16240806529 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jason Barron <jason@cutehacks.com>
* WMF: Fixed shutdown sequence.Yoann Lopes2012-12-073-3/+4
| | | | | | | | | | | | A wrong shutdown sequence was causing a wait condition to never be met, resulting in a 5 seconds hang on shutdown. Also reduced the wait condition timeout to 100 ms. Task-number: QTBUG-28432 Change-Id: Ib415bf66634603d839be3e34e497e3a3c5a19ad9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jason Barron <jason@cutehacks.com>
* Fix includes to build on case-sensitive filesystemShawn Rutledge2012-12-072-2/+2
| | | | | | Change-Id: Ibd355256a5d2a60ee3a61ba2a2bf9f0f63c591cb Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix build for standard DirectX install pathsJoerg Bornemann2012-12-061-1/+1
| | | | | | | | | Evaluate the environment variable DXSDK_DIR at qmake time. This makes sure, the contents get properly quoted, even if the DirectX SDK is installed into a path that contains spaces. Change-Id: Id22f56448eef4d392af77e97f46308f1b486c7c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed build on MacOS with clang in C++11 mode.Erik Verbruggen2012-12-061-5/+5
| | | | | | | | | | avfvideowidget.mm:120:9: error: non-constant-expression cannot be narrowed from type 'int' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] x1, y1, zValue, ^~ Change-Id: I5a08bf8b53cf029dbdfaeaa03f4babd6d49d62ad Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* WMF: Disabled the video probe control.Yoann Lopes2012-11-302-52/+57
| | | | | | | | | Using the video probe cause unstability in the video playback. Disabled for 5.0 release. Should be fixed and re-enabled in the next version. Change-Id: I274212a0943ac098194ad59d6e07bed7740bc8a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* blackberry: fixed building without QtWidgetsOleg Shparber2012-11-291-7/+4
| | | | | Change-Id: I12103c5a4bd903b809e7db2ec8e1cbb60a37c429 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* tr()-Fixes.Friedemann Kleint2012-11-291-16/+16
| | | | | | | | Make WMF-player error message consistent (sentences, no exclamation marks). Improve wording. Change-Id: I876b26067fb374833037aa93dd9675ab556bf972 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix QGstreamerPlayerSession::availablePlaybackRanges()Andras Becsi2012-11-282-20/+15
| | | | | | | | | | | | | | | Since buffering information through buffering queries is only valid if progressive download buffering (on-disk caching) is enabled or local media is played and we explicitly disable on-disk buffering because of cleanup issues with gstreamer availablePlaybackRanges() always returns an empty range for online media. Seeking is also possible using http range requests therefore if valid playback ranges could not be determined we should return the [0..duration] range unless the source is a live stream or the duration is unknown. Change-Id: Idbebc0fdde5053c6f9c0b3794c6d122492c6239c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* QT7: Remove usage of QMAKE_MAC_XARCHAndy Nichols2012-11-231-7/+3
| | | | | | | | | Support for QMAKE_MAC_XARCH was removed in Qt 5.0, so it shouldn't be used in the QT7 plugin, as it causes build failures. Task-number: QTBUG-27180 Change-Id: I7d907a9afbcbc4989b794350c94d0f619e4d2b7d Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* AVFoundation: Enable QImage based frame fallbackAndy Nichols2012-11-213-21/+89
| | | | | | | | | | | QGraphicsVideoItem was not working because the QPainterVideoSurface was unable to paint BGR32 format OpenGL textures. Now if the QGraphicsView window has a QGLWidget viewport, we use the GLTextureHandle to render the video, otherwise we fallback to the software QImage rendered case. Task-number: QTBUG-28017 Change-Id: I9304e0a2536f15075ae34cdd509ef24fbc18604e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* AVFoundation: Fix broken requestControl logicAndy Nichols2012-11-201-6/+10
| | | | | | | | | | AVFMediaPlayerService::requestControl was returning the video output control after the video output was created, and this could result in unexpected behavior, as well as prematurely calling releaseControl on the video output. This should fix the "player" example on OS X. Change-Id: Ie23b1176272a1f9daa5edeec856141ac52a450c7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove nonfunctional mediaDownloadEnabled propertyAndras Becsi2012-11-203-24/+3
| | | | | | | | | | | | | | I suppose this was introduced after an API freeze to try to support on-disk buffering but since the code does not set the GST_PLAY_FLAG_DOWNLOAD flag on the player element the feature is not only undocumented but also nonfunctional. If on-disk buffering is needed we should add proper API to enable/disable it for all backends which might be possible with Qt 5.1 the earliest. Change-Id: I6b42a06166509db0023a3e0263ecc3a36f0d2bdb Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Clean up QGstreamerPlayerSessionAndras Becsi2012-11-202-18/+3
| | | | | | | | Remove dead code and fix compiler warnings about unused and uninitialized variables. Change-Id: I809d905e13234db1dbc1b9c2a0ac887c5c712fc7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Media is always set to be seekable with the gstreamer backendAndras Becsi2012-11-201-16/+9
| | | | | | | | | | | | | | Since the used mechanism for querying whether the media is seekable was unreliable the code has been commented out and the media always set to be seekable. Query for seeking capabilities after the duration is known in updateDuration() which retries to determine the duration multiple times if unsuccessful and use gst_query_parse_seeking to check if the media is seekable or not. Change-Id: I141dfb1616dc59f8c92a698ddb2867f63a2656b9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* WMF: Fixed color adjustment when using the EVR window control.Yoann Lopes2012-11-191-1/+1
| | | | | Change-Id: I007937b358f062cd9d3d3c02e3a0780d6b2539be Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-061-1/+1
| | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0617-30/+30
| | | | | | | | | | | | | | | | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:45:38 +0000