summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
Commit message (Collapse)AuthorAgeFilesLines
* GStreamer: Add docs for custom pipelinesVaL Doroshchuk2019-08-141-0/+12
| | | | | | | | | The feature was added in 5.12.2. And it is relevant only for GStreamer backend. Change-Id: I87e22e506158dc61bb7f111e74806e7eb8c28d7a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix crash in player example when close the window while playingVaL Doroshchuk2019-02-081-0/+3
| | | | | | | | | | | | | When it is playing and close the window: 1. The player object will be destroyed first (all QString's). 2. Next parent QWidget will be destroyed with all children. 3. While destroying QMediaPlayer from Player object, the playback will be stopped. 4. The status will be changed and Player::statusChanged will be called. The connection still exists. And since all string members are already freed, it produces a crash. Change-Id: I2c2fdca97f0ff4b300527b550ecc0c12b04e5b4e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QMediaPlayer: remove else after returnAndre Hartmann2018-04-301-2/+3
| | | | | | | | The else was also missing the curly braces, but as we usually omit else after return, let's just remove it. Change-Id: Ia91261bbe6edf4e9b0d454d1fdf91c5cfa62e4cc Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Doc: Remove space that causes QDoc warningPaul Wicking2018-04-181-1/+1
| | | | | | | | Remove one space that is the cause of a QDoc warning with Clang. Task-number: QTBUG-67790 Change-Id: Iad60c6b4bdf9570c8c30e5acd641463807f3b416 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-061-1/+11
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
| * Update player state after QMediaPlayer::EndOfMediaVal Doroshchuk2017-12-201-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Return up-to-date player state if mediaStatusChanged() with QMediaPlayer::EndOfMedia is already received but stateChanged() is not. mediaStatusChanged() is always emitted first which could cause the player to keep outdated state before stateChanged() is received. Task-number: QTBUG-57197 Change-Id: I0706069d2f4875076442fdf8ac7e938272ab843c Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+3
|\| | | | | | | Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
| * Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-032-3/+3
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-271-1/+2
|\| | | | | | | Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-271-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimedia/declarative-radio/view.qml src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
| | * Fix loading remote m3u filesVaL Doroshchuk2017-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a case where it was not possible to load remote m3u files as the parser would start, and fail, before the file was received. Task-number: QTBUG-62255 Change-Id: If730539dbfd25c9ef2ab97a05af3a50c685a304b Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-273-8/+8
| | | | | | | | | | | | | | | Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Update customAudioRole Qt versionJames McDonnell2017-09-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The change missed the Qt 5.10 release. Change-Id: I25bc345ac8262966ca31e63f4f87584983fa0bae Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Add custom audio role API to QMediaPlayerJames McDonnell2017-09-062-2/+95
|/ / | | | | | | | | | | | | | | | | | | | | | | Allows use of audio roles beyond those known to Qt. [ChangeLog][QMediaPlayer] Added customAudioRole string property to enable use of audio roles beyond those available via the audioRole enum property. Change-Id: Id7ed5d7bc1af0c15910e699f25c97cfed2d48243 Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* / Use QRandomGenerator instead of q?randThiago Macieira2017-06-302-3/+5
|/ | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix build for -no-feature-temporaryfileStephan Binner2017-05-081-0/+4
| | | | | | | | | If a backend does not support streaming then playing from qrc is impossible for -no-feature-temporaryfile case. Change-Id: Ibb0518c4afe0598c6f3a1c03b75cc00e76b8eead Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add missing override and remove redundant virtualAlexander Volkov2016-12-127-42/+42
| | | | | Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Improve the playlist parserChristian Strømme2016-12-124-176/+312
| | | | | | | | | | | | | The main goals of this change is to make the parser more lightweight, e.g., by removing unneeded QObject allocations, and make it possible to stop the parsing more quickly. In addition, support for the same resources as the media player was added, that is, support for QMediaContent, QMediaResource, and QIODevice. The combination of these changes should make it easier and faster to use the parser internally. Change-Id: I1f25d6529fa9bab0c6c3c9d9de35b7f8b4a708e0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Add proper global headers for QtMultimediaLars Knoll2016-11-234-4/+4
| | | | | | | And deprecate the old qtmultimediadefs.h Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-111-10/+10
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-10/+10
| |\ | | | | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | * Reduce size of QMediaPlayerPrivateChristian Stromme2016-10-191-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Rearranged the data members to reduce the object size (-16 bytes on 64 bit systems). Change-Id: I0f285fafc42633fff42eba1ddc68c6f9bee2cec8 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-112-3/+3
|\| | | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-042-3/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
| | * Doc: Add comment about stream requirementsChristian Strømme2016-09-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I92e16722dc5cc8df23cf4ed0d048a0d2a23956eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Remove useless castChristian Strømme2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Casting to same type. Change-Id: I93935b75edac56c958d0669eff216b9dcf16a153 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-191-2/+4
|\| | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-2/+4
| |\| | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | * Optimize QMediaPlaylistPrivate::readItems()Yoann Lopes2016-08-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading playlist items from a file, pass them to the playlist backend all at once rather than one by one. This might be faster depending on the implementation. Task-number: QTBUG-54849 Change-Id: I57acdc68604ee56fe5d7615ba0a72655e668443f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Improve audio volume documentationYoann Lopes2016-08-221-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Added information about volume scales. Change-Id: Ica8367396147e3e1c814b3575faa5cf0503be031 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-7/+9
|\| | | | | | | | | | | Change-Id: Ib8d05d6e21c7beb19f618cd1edc52d248b1e43b8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-7/+9
| |\| | | | | | | | | | Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161
| | * Fix playing a playlist containing an invalid media as first itemYoann Lopes2016-08-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a playlist contains an invalid media, QMediaPlayer normally continues to the next media. If an invalid media was first in the list, the backend would never go into PlayingState, which would then cause the media player to never start the next item in the list (thinking it's stopped). We now always transition to PlayingState when starting playback of a playlist, regardless of the backend going into that state or not. Change-Id: I4227f937e7a619afbd8adbe2fccedfa5d43ad89a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+1
|\| | | | | | | | | | | Change-Id: I0e74582a735dd8fd169ac928a32143ab80a2d2a0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-041-1/+1
| |\| | | | | | | | | | Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
| | * QPlaylistFileParser: fix QUrl::resolved+QUrl::fromLocalFile misuseDavid Faure2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl::resolved can be used to resolve relative paths, but not by passing them via QUrl::fromLocalFile (8a33077 in qtbase made QUrl more strict). To resolve both relative and absolute local paths against a local directory, QUrl::fromUserInput(3 args) does the job. Change-Id: Ifc01bbd590978f939f9538e70d12f2f3704d7b5d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-061-3/+7
|\| | | | | | | | | | | Change-Id: I8027e798d85ae60dbcb4fbc8592e3992af7546d4
| * | Add missing implementation for QMediaPlaylist::moveMedia().Yoann Lopes2016-04-271-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | QMediaNetworkPlaylistProvider, which is the default playlist provider, didn't have an implementation for that new function added in 5.7. Change-Id: I1ec8cdd60a1429addd47d0b37131f724e8d4b748 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Fix unused variable warningChristian Stromme2016-04-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Caused by a Q_D macro in QMediaNetworkPlaylistProvider::moveMedia(). - warning: unused variable 'd' [-Wunused-variable] Change-Id: I43518366153ddabc7a8401ee112abec78640b992 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-082-9/+9
|\| | | | | | | | | | | Change-Id: Ie1331c18854bea488c773807597f8ad209437657
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
| | * Add explicit and make public headers compile with ↵Marc Mutz2016-03-032-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Cleaned up placement of * and & in parameters as a drive-by. Added explicit where it was missing as a drive-by. This is not a source-incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: If81ed0c71393aee21d347f5ade4bf3fcc07cd82f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Pass by QUrl by const-ref, it's non-trivial.Sergio Martins2016-03-021-2/+2
|/ / | | | | | | | | | | | | [-Wclazy-function-args-by-ref] Change-Id: Iac68ca2d3d53951190db6d24ebbbcb60e8bbd789 Reviewed-by: David Faure <david.faure@kdab.com>
* | Updated license headersAntti Kokko2016-01-1919-266/+380
| | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I324f65c61171f36641472964d095d72e452afb3a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devChristian Strømme2016-01-152-8/+68
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/android/src/mediacapture/qandroidcamerasession.cpp src/plugins/wmf/mftvideo.cpp Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
| * Change the way a playlist is bound to a media object.v5.6.0-beta1Yoann Lopes2015-12-112-8/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behavior was to simply switch from the internal control to the service's control, discarding anything that was added to the playlist before binding. We now carry over the changes made to the playlist when switching controls. This means the switch is now transparent to the user. When the service's control is read-only, we cannot transfer the items, which means the user must be notified of the items that might have been "lost" during the switch. Auto-test modified to reflect this change. Change-Id: Ibf80b650b06425ddbaeb320b72ac5d3082a25960 Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Video, Playback: replace foreach with range-based forAnton Kudryavtsev2016-01-152-4/+7
| | | | | | | | | | Change-Id: I46031547447669925cdd747f5ac6259acab9a410 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | fix expensive iteration over QMap::keys() and QHash::keys()Anton Kudryavtsev2016-01-141-3/+3
| | | | | | | | | | Change-Id: I244aa1ecf006774ebe5fb9bb5b22d37142186e39 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-186-0/+41
|/ | | | | Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-242-14/+30
|\ | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:09:26 +0000