summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deliver GStreamer signals through Qt event loopqt-v5.0.0-alpha1Sami Rosendahl2012-03-271-6/+19
| | | | | | | | | | Emitting a Qt signal directly from GLib callback causes issues to clients. Queue the GStreamer signal and forward it to as a Qt signal from a handler that is invoked via the Qt event loop. Task-number: QTBUG-24927 Change-Id: I3c91efcce1261caf7b643fbff10663e1b093f2a8 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Make this unit test a bit more robust for qreal changes.Michael Goddard2012-03-271-5/+2
| | | | | | | It's not just ARM that has qreal == float (and sometimes not even then) Change-Id: Ic2fa890afd9f926c455442d04dc84e57dffe7787 Reviewed-by: Jonas Rabbe <jonas.rabbe@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-265-7/+16
| | | | | | | 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>
* Rename the daemon global static to pulseDaemonThiago Macieira2012-03-251-15/+15
| | | | | | | There's a daemon() function declared in unistd.h. Change-Id: I1063e71248a5236a5bb6b8f10804c469c8d1f788 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.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-2311-222/+419
| | | | | Change-Id: I374be17d49b6a5eed0b1ed94d0b9ca5f9a2caa9b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Don't delete video node factories owned by the plugin loader.Andrew den Exter2012-03-232-3/+10
| | | | | | | | | | | Make the fallback factories members instead of creating on the heap so there's no need to delete members of the m_videoNodeFactories some of which may be shared with other current and future video outputs. Change-Id: I3d2e32e52479b12ff64e31a2ed527336d94a191b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixes to qmediaplayerbackend integration test: use ogg video on Linux.Lev Zelenskiy2012-03-232-9/+38
| | | | | | | | | | Attempt to find supported video format before running tests. Tests are skipped if no video format is supported by the system. Change-Id: Iad5b26438b6407f0808e288c5e6184f220f30e36 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* resolving some warnings in qtmultimedia docsAngus Cummings2012-03-2214-31/+30
| | | | | Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added VideoLight camera flash mode.Dmytro Poplavskiy2012-03-223-4/+9
| | | | | | | | Unlike the torch mode, it's enabled only while camera is active. Change-Id: Ib92349ac190586c5aa8e49a8fddbdf937e757fd0 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed media service provider auto test on Mac OS XJonas Rabbe2012-03-221-1/+1
| | | | | | Change-Id: I424ef50188244b5f4232534f9088bdc0071ea63e Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* changing include from qdeclarativeinfo to qmlinfo in qdeclarativeaudio.cppThomas Senyk2012-03-211-1/+1
| | | | | Change-Id: I7244f6c7b3743dfe5532f1d13c2afef256a2cdbc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* QMediaPlaylist: Added ability to load from provided QNetworkRequest.Lev Zelenskiy2012-03-2110-23/+45
| | | | | Change-Id: I7d8fc8a432810ff87650808b9ca6af53f7356d4e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added integration test for new playlist functionality.Lev Zelenskiy2012-03-219-0/+167
| | | | | Change-Id: I9cc4a3d140003de737b81b4dcfa1e4a94d4a2ba4 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@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>
* QMediaPlayer frontend: changes to playlist support.Lev Zelenskiy2012-03-219-443/+407
| | | | | | | | | Allow to load playlists using setMedia(). Use QNetworkMediaPlaylistProvider for playlist parsing. Updated unit tests. Change-Id: If4dba07be8b2e8a9e9549d5bed58e552dfb958b7 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* New playlist parsers to support network playlists.Lev Zelenskiy2012-03-214-0/+1075
| | | | | | | | Added new playlist parsers for M3U and PLS. Added QNetworkMediaPlaylistProvider. Change-Id: I4c64018e44b8ae2401d6846a0c3c326d8c2ca5cc Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Marked media service provide test as insignificant on macJonas Rabbe2012-03-201-0/+2
| | | | | | | | Temporary measure to ensure that IID and plugin changes make it through CI, will be investigated once those changes have been integrated. Change-Id: Ie9313a0fa6081ebeff62a83f183ab2534c0469ee Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated IID, services, and controls to use qt-project URLJonas Rabbe2012-03-2099-143/+143
| | | | | | | | | 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-2061-745/+630
| | | | | | | | | | | | | | | | | | | 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>
* Fixed the qml Camera.imageCapture.imageExposed signal connectionDmytro Poplavskiy2012-03-201-1/+1
| | | | | | | | Trivial fix. Change-Id: I522e3186ce9284e3aa0fb84296bc3c1e663e8577 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Make QDeclarativeAudio use QMediaPlayer instead of the controls.Michael Goddard2012-03-1611-311/+341
| | | | | | | | | | Very minor changes in semantics due to previous differences: * negative positions are not supported any more (clamped to >= 0) * setting muted to the same value previously set to the control itself won't signal any more. Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.Michael Goddard2012-03-166-770/+559
| | | | | | | | | Since there is only one subclass of base. Next step is to clean up QDeclarativeAudio Change-Id: Ibda8c3006efa165b58372a011121f04a39458562 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@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>
* Add use of TESTDATA feature to integration testsKalle Juhani Lehtonen2012-03-1511-23/+15
| | | | | | | | Use TESTDATA and QFINDTESTDATA in integration tests. Also remove unused path defines from unit test .pro files. Change-Id: I46dc6a96b918e989acf79eb3bd23c53125c7c3d6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative components to use the QML moduleJonas Rabbe2012-03-1431-68/+78
| | | | | Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* gst video surface sink: start surface with correct handle typeDmytro Poplavskiy2012-03-142-5/+15
| | | | | | | The handle type should match one from the currently used buffer pool. Change-Id: I33f7856a742299ce0640f331898c3cbe5cfbdf97 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Made QRadioData bind to QRadioTuner to avoid using multiple servicesJonas Rabbe2012-03-1212-120/+321
| | | | | | | | | | | | | | | | | | | | | QRadioData has been updated to be a QMediaBindableInterface, and it will bind to a QRadioTuner instance, i.e. a QMediaObject that provides a service which implements the QRadioDataControl. This change is reflected in the declarative implementations of radio tuner and data. There is a new `radioData` property in the Radio element which will give access to the declarative RadioData element for the tuner. If a RadioData element is created in QML, it will have an anonymous tuner which communicates with the underlying media service (which is pretty much the same how the QRadioTuner and QRadioData classes work previously). Updated radio tuner and data test cases to use availability control and extended the mock media service to allow providing a number of controls rather than just one (needed for testing availability of all classes extending from or using QMediaObject). Change-Id: Id41dde66eee529decd828fd2dcdfe4a54c0e81f4 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCamera capture documentation fixesDmytro Poplavskiy2012-03-123-1/+33
| | | | | | | Added documentation for camera capture queue behavior. Change-Id: I4989f94c5de0edb3ac99135dcb3e11d76195a880 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use small-screen layout in qmlvideo, qmlvideofx examples on HarmattanGareth Stockwell2012-03-121-0/+5
| | | | | Change-Id: Ieaaca763630acfb81a1b5b5cfef2d08367a9e265 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated qmlvideofx to use MediaPlayer.autoPlay instead of playingGareth Stockwell2012-03-121-1/+1
| | | | | Change-Id: Iee9066a6c7fcddbe6054e9c505b24e478f63cb4d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update Qt Multimedia tests to use TESTDATAKalle Juhani Lehtonen2012-03-123-9/+14
| | | | | | | | | | Qt5 brought support for general for test data install and find. This change replaces old Qt4 time deployment supported in WinCE and Symbian with the new general solution using TESTDATA in .pro files and QFINDTESTDATA in source code. Change-Id: I5dbe3ca22e2259f249ebb4df570ea91f17d23526 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added playlist property to QMediaContentLev Zelenskiy2012-03-123-6/+100
| | | | | | | | | This is a part of changes to QMediaPlayer related to playlist handling. Updated unit test. Change-Id: Ic2460dc4d3121788cd5eb08df71e6d45aac032bc Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Don't request renderer control if null surface is set as video output.Dmytro Poplavskiy2012-03-124-2/+36
| | | | | | | | | | | | | QCamera and QMediaPlayer are likely to wait for valid surface to be passed to the renderer control before startup, so after player->setVideoOutput(nullSurface) player will not start playback. If the renderer control was already requested before for valid surface it should be released when the null surface is assigned. Change-Id: I3f78f2d82e61fae5f305874874c0ffbc4cb7dc1d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Move most of playlist API to private.Lev Zelenskiy2012-03-0629-180/+174
| | | | | | | Moved objects either not needed to be public or require API review/redesign. Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove unimplemented BG playback feature.Michael Goddard2012-03-059-484/+1
| | | | | | | Prototype that wasn't implemented should be removed for 5.0. Change-Id: I3b90658ad8dc0b64003a5bb741fc3c93c7d87dff Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix a few memory leaks.Michael Goddard2012-03-051-2/+6
| | | | | | | | XV Buffer pool was leaking, the sink delegate was leaking, and the sink wasn't chaining to parent class so GstObject stuff was leaking. Change-Id: I5d6b6fe59dfb2b3c5367dfde8331e5943167b55d Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove pin of qtbase for qtmultimedia.Sergio Ahumada2012-03-051-1/+1
| | | | | Change-Id: I2e57bab345b90943613466b4bc655af1d5a5b831 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some memory leaks.Michael Goddard2012-03-057-5/+18
| | | | | | | | Adjusted a unit test or two to make leaks easier to find, and then fixed a few leaks. Change-Id: I47a20df8de7cac113d34a2015f76a65ab957dedd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-03-021-1/+1
| | | | | Change-Id: I76a8727e12e3d19a2e2f5808080ee25b9af905c1 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Expose availability from the backend to C++ and QML.Michael Goddard2012-03-0241-155/+764
| | | | | | | | | | | | | | The availabilityError property was static based on the service, but it can change at run time, so add the plumbing to allow the backend to report it itself. Also make sure that both QML and C++ expose the availability. The radio tuner and data controls previously had properties (but no signals) for availability - these have been removed. Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-0241-498/+498
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iec1c616e0d9a915a31a661916805916e19495dc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Pin QtBase SHA1 until it's fixed.Michael Goddard2012-03-021-2/+1
| | | | | | | | Also remove QtSvg dependency that came from QtDeclarative a long time ago. Change-Id: Iac851e027a6a6f61896fecd36b43a4036dd1b717 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Expose the audio and video encoding modes through QML as well.Michael Goddard2012-02-293-4/+100
| | | | | | | They were missing. Change-Id: I0bb08c5e4721c27d2dcec818c0ee33f42c8df959 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Audio decoder example.Lev Zelenskiy2012-02-276-0/+647
| | | | | Change-Id: I0f9fb755ef8bc6f66696a06996ac7a9f13de69cc Reviewed-by: Michael Goddard <michael.goddard@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>
* Audio recorder example updated to display level using QAudioProbe.Lev Zelenskiy2012-02-246-4/+251
| | | | | Change-Id: I7d5aea306aeb3cd9109615f9ed4905c53125233a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 08:00:10 +0000