summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Fixed: Streams information is not updated properly for RTSP streams.Lev Zelenskiy2012-03-282-1/+21
| | | | | | | | | | | Changes to QGstreamerPlayerSession: Handle video-changed, audio-changed, and text-changed signals. Call getStreamsInfo() to update streams information. Change-Id: I8bfead3268771245635424b5f1debff624bbe038 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Build fix on WindowsYuchen Deng2012-03-271-1/+1
| | | | | Change-Id: I2666a81837dc78342b03a7cb5a33b406fd917661 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Minor improvements on resource-policy interfacesLing Hu2012-03-261-1/+1
| | | | | | | Change-Id: I3e9c7c4d1fca90e0fb97b0058e9b5a5e34940025 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Make gstreamer player backend reserve/release video resource.Ling Hu2012-03-232-1/+28
| | | | | | | | Use request/release of various video related controls as an indication for the decision. Change-Id: I3a2a288c7c46ca62459896745bbdda26961bb181 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Implemented availability control for gstreamer player backendLing Hu2012-03-237-2/+151
| | | | | | Change-Id: I6d736b90ad59e258eb6f20befea8cfe1afce423a Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added resource policy support though internal plugin systemLing Hu2012-03-235-277/+12
| | | | | Change-Id: I374be17d49b6a5eed0b1ed94d0b9ca5f9a2caa9b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QMediaPlayer: GStreamer backend changes for playlist support.Lev Zelenskiy2012-03-212-14/+69
| | | | | | | | Register type find function to check if unrecognized media is a playlist. Emit MediaIsPlaylist error and let frontend handle playlists. Change-Id: Ib17da1c46014ac3c0f2f48b75ea9de2f0428b573 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated IID, services, and controls to use qt-project URLJonas Rabbe2012-03-2012-12/+12
| | | | | | | | | Instead of com.nokia.qt we should use org.qt-project.qt. All the identifiers have also been updated to use pure lowercase, and where used the version numbers have been updated to 5.0. Change-Id: Ib209327f5205f5a086a5932394504a8a52e1f712 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Updated plugins to use new plugin architectureJonas Rabbe2012-03-2025-123/+51
| | | | | | | | | | | | | | | | | | | Changed QMediaPluginLoader to use QFactoryLoader instead of QPluginLoader and used metadata to get keys. Removed QAudioPluginLoader and changed audio classes to use instead use QMediaPluginLoader. The plugins must include the Q_PLUGIN_METADATA macro, and no longer use the Q_PLUGIN_EXPORT/Q_PLUGIN_EXPORT2 macros. A json file has been added for each plugin which can contain metadata which is available to the plugin loader before the plugin is actually loaded, and is used to read the keys for the plugin, e.g. supported services. QFactoryInterface will be deprecated and has been removed from all plugins. Change-Id: I035b82f9c9c65717bebf704d560ea8f891df21da Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Compile on WindowsMarius Storm-Olsen2012-03-202-5/+5
| | | | | | | | | | | | | Conversion of WId to HWND requires reinterpret_cast. Comment out RatingOrganisation for directshow as it is commented out in the gstreamer plugins too. (Note that both directshow and gstreamer plugins spell it incorrectly. It's spelled "RatingOrganization" in qtmedianamespace.h) Change-Id: I4cbcecfeb62ad795facf498d1c3d84a776d2ca35 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Handle more errors from GStreamer.Michael Goddard2012-03-162-11/+11
| | | | | | | | | Corrupted etc files can throw GST_STREAM_ERROR_DECODE and those should generally stop playback. So now any error is fatal, not just the recognised ones. Change-Id: I7b6dd2a460d94f70c459a313a9d4dc84028f8002 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Move most of playlist API to private.Lev Zelenskiy2012-03-066-6/+6
| | | | | | | Moved objects either not needed to be public or require API review/redesign. Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Don't reset saved playback position if playback resource is denied.Michael Goddard2012-02-272-1/+15
| | | | | | | | | | | | Resource denied and resource lost should be handled differently, on resource lost the current playback position should be preserved, while on resource denied player state should be changed to paused with pending position unchanged. (from qtmobility, SHA1 4e457432ef0f50cb91a1043f0390427cafcaef0d) Change-Id: I5ce755409c430598d68ee6a6a90f9d0858ea9da9 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Changes to GStreamer backend for audio decoder.Lev Zelenskiy2012-02-244-21/+124
| | | | | | | | | | | | Removed WaitingState. New signals: finished(), positionChanged(), durationChanged(). New methods: position(), duration(). A parameter removed from read() method. Unit tests updated. Change-Id: Ie9d8a2804285c5542e592cce69963adbdf6ebfb8 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARMBradley T. Hughes2012-02-221-1/+1
| | | | | | | | | | | Use Q_PROCESSOR_ARM instead of QT_ARCH_ARM. On maemo6, don't use QT_ARCH==armv6 to conditionally include egl code. Instead check for opengles2 in QT_CONFIG, which is detected by the configure script. Change-Id: Ib3062fbd81c3a3acd318df32c49ad133a5b0d07c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-223-3/+0
| | | | | | | | remove assignmets which are defaults or bogus Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a few audiodecoder things.Michael Goddard2012-02-213-73/+99
| | | | | | | | Beef up the autotest a little, and check the conversion. Change-Id: Ifffca118e092eb6c388db50a6eb12810a87aa32a Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend for audio decoder service.Lev Zelenskiy2012-02-173-73/+182
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a partial gstreamer based audio decoder service.Michael Goddard2012-02-1712-11/+916
| | | | | | | Doesn't work yet. Change-Id: Iebd085d68346cb73af8df59c84e8e52a17de2a52 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QMediaRecorder: GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-163-0/+113
| | | | | | | | QGstreamerCaptureSession: Using GStreamer buffer probe to access media data. Change-Id: I2ee38e864fbd69fcba9efe90d4dcf138528e00c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-168-3/+593
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some compiler warnings.Michael Goddard2012-02-142-2/+4
| | | | | | | | | As it turns out, we had an overloaded virtual from an earlier era, with the extra parameter never used. So cleaning that up was a bonus to remove the compiler warning. Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-065-5/+5
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-061-2/+8
| | | | | | | | | | Do not display prerolled frames in stopped state. Instead store prerolled frame and display it only after switching to pause or playback state. Added new unit test with a sample video file to check this functionality. Change-Id: I3fd159a199b65ca10fdf9843af5675c5ae9dad05 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added metaDataChanged(key,value) signal to metadata controls.Dmytro Poplavskiy2012-02-063-25/+35
| | | | | | | | | | | | | | It may be more efficient and convenient for application to use this signal instead of metaDataChanged(). metaDataChanged() signal is emitted for compatibility, backends should emit both signals. Signal added QMetadataReader/WritterControl, QMediaObject and QMediaRecorder. Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-017-17/+17
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30227-227/+227
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-252-0/+110
| | | | | | | | Only implemented for PulseAudio so far, but the API does explain that it's optional. Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix some static analysis defects.Michael Goddard2012-01-254-10/+14
| | | | | | | | | A few silly errors, a few unlikely errors, a few changes that should not have resulted in a problem but makes the code clearer. Change-Id: Id2c82e9317d53822e4da13c94dec9595ea33b07a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix header changes for wmfLing Hu2012-01-243-3/+3
| | | | | Change-Id: I9d06dd9a39f26851589b1c1f259db8de2ee992a0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Disable wmf for nowLing Hu2012-01-241-1/+1
| | | | | Change-Id: I4d28741a6546dfafc5c60c7ccdc34d814276b518 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Disabled CameraBin2 based camera backend.Dmytro Poplavskiy2012-01-231-3/+4
| | | | | | | It's not currently tested enough to be enabled. Change-Id: I3c8eb7a81af982b6c98b733755d19c78f2f1c5ed Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed camera simulator backend.Dmytro Poplavskiy2012-01-2325-2963/+0
| | | | | | | It's not used on any Qt5 platform. Change-Id: Ia5a97523c84fe273a265355cc51a1cfa68701085 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23249-249/+249
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-2017-420/+281
| | | | | | | | This allows to combine metaData and extendedMetaData and simplify metadata handling on both backend and application sides. Change-Id: I136eedc86c215be3485db101c43069ca7c82101b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use US spelling for organization.Michael Goddard2012-01-194-4/+4
| | | | | | | | Since it seems it was never implemented, don't keep the legacy spelling. Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed compile of quicktime pluginRohan McGovern2012-01-1817-56/+42
| | | | | | | | | | | | | This code was including the qmacdefines_mac.h header from QtWidgets, which has recently been removed. Using the header is no longer necessary. Note that the qmacdefines_mac.h contained a workaround for some mac system headers declaring variables named `slots'. Replace that workaround with the standard no_keywords method. Change-Id: Icd47a562d64953692e50a9fea8bb4a9c8424375c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-1712-37/+37
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix build for the camera support of QtMultimedia GStreamer plugin.Alexis Menard2012-01-142-17/+1
| | | | | | | | | Include the correct header file (it was renamed) and also remove duplicate declaration. Change-Id: I2683851e9fd0978427273c4739f47b54e1af743b Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-12221-221/+221
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-118-12/+12
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add the spot for spot metering mode.Michael Goddard2012-01-062-1/+19
| | | | | | | 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-0630-101/+135
| | | | | | | | | | | | | | | 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-0628-28/+28
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-051-1/+1
| | | | | | | | | | | - 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>
* Fix readyChanged signal emit in gstreamervideorendererMithra Pattison2011-12-211-6/+5
| | | | | | | | | | Modified handling of source update in gstreamervideorenderer as the existing logic meant that it would never emit the readyChanged signal. Change-Id: I0a1488cfc151388fe0145d231001e502e9f45f0e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-1310-50/+38
| | | | | | | | | The X11 buffer pool was using outdated APIs, and as the 'qpa' configuration value is being removed, it caused the X11 code to be pulled in, and therefore cause compilation failures. Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed QtMultimedia core namespace compilation.Toby Tomkins2011-11-2533-38/+108
| | | | | Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* If we fail to connect to pulse, don't enumerate sinks or sources.Michael Goddard2011-11-241-3/+5
| | | | | | | | Otherwise the pulse client library dislikes having methods called with a null context. Change-Id: I96629065b7a0e36e0d10402526cb167e65458e27 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add cap on internal read/write buffer for QAudioOuput(PA)Ling Hu2011-11-151-1/+1
| | | | | | | cap set to no more than 5x period size Change-Id: If3ae244993a8929832f6724c386dac6f12ef0f03 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>