summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add 'resourcepolicy' to MODULE_PLUGIN_TYPES of multimedia.pro.v5.6.0-alpha1Friedemann Kleint2015-09-031-1/+2
| | | | | | | | | Fix warning: WARNING: Project ERROR: No module claims plugin type resourcepolicy discovered when running lupdate to create the translations. Change-Id: I9fdde3e86219164cabbfe10672899eb2984f06d2 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Fix MediaPlayer::playlist documentation.Yoann Lopes2015-08-242-0/+6
| | | | | | | Added missing '\since 5.6' tag. Change-Id: I46e0ea8bad85fb1f51f5502766c13549c6dad9d5 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Fix QCamera::lockStatus() documentation.Yoann Lopes2015-08-241-1/+1
| | | | | Change-Id: I1f7c063ef1e465ba658f637754b10b7af44b8373 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-08-2456-1968/+2408
|\ | | | | | | | | | | | | Conflicts: src/imports/multimedia/qdeclarativeaudio.cpp Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
| * Android: minor refactor of the camera frame callback.Yoann Lopes2015-08-205-123/+121
| | | | | | | | | | Change-Id: I6b281c9b2d02cf223e66e04e31fdd0268aa277fc Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Android: fix video probes when recording the camera.Yoann Lopes2015-08-203-12/+30
| | | | | | | | | | | | | | | | | | The preview frame callback is cleared by the Android Camera whenever a MediaRecorder is set up. We need to reset the callback after starting the media recorder. Change-Id: I604320b11eb3a7f6f8d7d3167d5aae371999be14 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * QMediaPlayer: clear current playlist on deletion.Yoann Lopes2015-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | Makes sure the current playlist is unbound when QMediaPlayer is destroyed. Change-Id: If25efa67bf79af0326f6125d9615165a2c7dd6bb Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com> Reviewed-by: Loïc Molinari <loic.molinari@canonical.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * GStreamer: refactored widget and window control.Yoann Lopes2015-08-1811-446/+707
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of always using xvimagesink as GStreamer backend for the widget and window control (works only with X11), we now try to pick a video sink that fits the current configuration. It first tries a set of known video sinks that can work with the Qt platform plugin in use. If none is available, it dynamically picks a video sink available on the system that can be used with our backend. Even if the video sink is now picked in a smarter way, xcb is still the only supported platform plugin. The reason is that it's the only Unix plugin which can provide a valid native window handle. Additional work is needed to support other plugins like wayland or directfb. Change-Id: I3843dea363d6a0b85a6cc1f2952783b743e48ac6 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix QCamera viewfinder capabilities functions..Yoann Lopes2015-08-185-6/+462
| | | | | | | | | | | | | | | | | | | | | | | | - Filtering the results for a specific pixel aspect ratio would return wrong values. - Correctly sort the frame rate ranges returned by supportedViewfinderFrameRateRanges(). Added missing auto-tests for all viewfinder capabilities functions. Change-Id: Idfb40d4139cc48a5996ce2ddd98131a2f5be76bb Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Avoid races when sending EOSRicardo Salveti de Araujo2015-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | In order to avoid races when sending EOS, we need to make sure that the pipeline is in playing state first. Task-number: QTBUG-45707 Change-Id: I518e89badf38bea8ab8e2cead9a1ca09659af8b2 Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * GStreamer: added convenience function in QGstUtils.Yoann Lopes2015-08-135-8/+18
| | | | | | | | | | | | | | -> qt_gst_element_get_factory_name(GstElement *elem) Change-Id: Icf806488b49fbcdecdd605b6316bd1ef8796a883 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * Fix camera plugin selection.Yoann Lopes2015-08-121-8/+3
| | | | | | | | | | | | | | | | When requesting a camera plugin for a given device id, it should fall back to any available plugin if that device id is not found. Change-Id: I685294c7fdcaa72bce70178b0aae2ec92e79e107 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Remove obsolete check in QMediaServiceChristian Strømme2015-08-121-2/+0
| | | | | | | | | | | | | | The macro QT_NO_MEMBER_TEMPLATES was removed eons ago. Change-Id: Ifc4f3ac8bcf1e9b42fad5dcfb101e3446a254abc Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Bind the playlist connected to a player.Loïc Molinari2015-08-121-0/+2
| | | | | | | | | | Change-Id: I3c2e00773c88f671bdffcfe8c8175330ca405d4a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Doc: Corrected a typo.Venugopal Shivashankar2015-08-112-3/+3
| | | | | | | | | | Change-Id: I53ab7ddf0a8c0416dce19bf2b642e7e294f3c868 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Fix documentation for QML metaData property.Yoann Lopes2015-08-113-1231/+139
| | | | | | | | | | | | | | | | | | For Audio, Video, MediaPlayer and Camera types. Group the sub properties as a \qmlproperty group, which makes the doc much clearer. Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix qdoc warnings.Yoann Lopes2015-08-118-26/+70
| | | | | | | | | | Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: update qml module version to 5.5.Yoann Lopes2015-08-1120-82/+6
| | | | | | | | | | | | | | | | | | And remove import statements from snippets. Change-Id: I109beabd445186f96f0750b6f23fb623c125181e Task-number: QTBUG-47620 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Improve documentation for mediaObject property.Yoann Lopes2015-08-112-19/+26
| | | | | | | | | | | | | | In Camera and MediaPlayer types. Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Emit mediaAboutToBeRemoved() before mediaRemoved() in QMediaPlaylist.Loïc Molinari2015-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | When a new playlist's mediaObject is set, the content is cleared and the mediaRemoved() signal is emitted without a former mediaAboutToBeRemoved(). This is an issue for QAbstractItemModel implementations, like the coming QDeclarativePlaylist, which call beginInsertRow() and endInsertRows() in the respective signal handlers. Change-Id: I7ec512ff2736e92858df94d9479741e05162e1f0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Check and fix up bounds in QMediaPlaylist methods.Loïc Molinari2015-08-102-6/+133
| | | | | | | | | | Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Clean up QMediaPlayer documentation.Loïc Molinari2015-08-101-7/+7
| | | | | | | | | | Change-Id: I2d744542270f283ccd8ba0160aeda7faa56b2b86 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix 2 more tr()-contexts of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-2/+2
| | | | | | | | | | | | | | Use QPlaylistFileParser instead of QObject. Change-Id: I5dd4b56f7f580ca4089db67bbfabdd58ef7e2778 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix tr()-context of messages in QPlaylistFileParserPrivate.Friedemann Kleint2015-08-191-1/+2
| | | | | | | | | | | | | | Use QPlaylistFileParser instead of QObject. Change-Id: I83f6b0384fc60b356a8ae8b316d2aaa768e7ac4d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Make QWinRTImageEncoderControl a Q_OBJECT.Friedemann Kleint2015-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix lupdate warning: qtmultimedia/src/plugins/winrt/qwinrtimageencodercontrol.cpp:60: Class 'QWinRTImageEncoderControl' lacks Q_OBJECT macro when parsing the tr() in QWinRTImageEncoderControl::imageCodecDescription(). Change-Id: I004c05c8cea620e30bff7a2b35b83eed01b7ed4c Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | winrt: Fix aspect ratio deviation between preview and encoding streamsSamuel Nevala2015-08-182-70/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source texture size from camera was wrong due to a missing IMediaDeviceController::SetMediaStreamPropertiesAsync call for the preview media type. Therefore Viewfinder and StillImage capture modes behave tha same from QCamera point of view. By default, the camera takes the lowest capture resolution and the lowest preview resolution with a matching aspect ratio. If the capture resolution is set, the preview resolution is set to the lowest possible resolution with a matching aspect ratio. Until viewfinder settings are implemented for WinRT, there is no way for user to change the viewfinder resolution. Change-Id: I4b76ceb46bd4c366561f5206d913b97c0d0df211 Task-Id: QTBUG-47465 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Add audio role API to QMediaPlayer.Jim Hodapp2015-08-1018-6/+722
| | | | | | | | | | | | Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d Task-number: QTBUG-41054 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | winrt: Add camera video probe controlsPeng Wu2015-08-107-13/+271
| | | | | | | | | | | | | | | | | | [ChangLog][multimedia][winrt] The WinRT backend now supports QVideoProbes on camera objects. Task-number: QTBUG-46228 Change-Id: I7850c5ec6f61e5824064d4be8afc8a0b55d05806 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | winrt: Add camera focus and focus lock controlsPeng Wu2015-08-1010-27/+1003
| | | | | | | | | | | | | | | | | | [ChangLog][multimedia][winrt] The winrt backend now supports camera focus and focus lock for Windows Phone. Task-Id: QTBUG-46120 Change-Id: Idb222798284d887a6e90a4986c69274e0ef765f5 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | Blacklist failing test in tst_qsoundeffect on OpenSuse.Yoann Lopes2015-08-101-0/+1
| | | | | | | | | | Change-Id: Iccf3e295fb79f043b2e64cb02528ac12e15a0ab6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Added new playlist QML type.Loïc Molinari2015-08-108-3/+897
| | | | | | | | | | Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-0924-140/+117
|\| | | | | | | Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d
| * Add new property to QVideoSurfaceFormat.Yoann Lopes2015-08-074-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | The 'mirrored' property indicates the QVideoFrames need to be mirrored along their vertical axis. This is typically needed for video frames coming from a front camera on a mobile device. This is implemented as a string-based property. In Qt 5.6, this should be replaced by a new public function. Change-Id: Ideb7de81e83f66826f4efb5f2951c4beec13546b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Fix warnings about unused private fieldsThiago Macieira2015-08-068-9/+5
| | | | | | | | | | | | | | avfaudioinputselectorcontrol.h:68:23: warning: private field 'm_service' is not used [-Wunused-private-field] Change-Id: I5722a2d1bf592862af3a4d36554419a653662892 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * Don't list avfcamerainfocontrol header and sources twiceThiago Macieira2015-08-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This produces Makefile warnings Makefile.Debug:351: warning: overriding commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:337: warning: ignoring old commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:514: warning: overriding commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:506: warning: ignoring old commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:351: warning: overriding commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:337: warning: ignoring old commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:514: warning: overriding commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:506: warning: ignoring old commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Change-Id: I2ec77cb92b4d218e5b07d895fdb96497061b527b Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * GStreamer: use QMediaStorageLocation to generate capture file names.Yoann Lopes2015-08-042-70/+14
| | | | | | | | | | Change-Id: I2111eb8e28f60ca6305a48a8ee9299bc14ab0df9 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * GStreamer: fix possible integer overflow in comparison.Yoann Lopes2015-08-041-1/+1
| | | | | | | | | | Change-Id: I6cf4349f89320f72cce4d04cdf909476e583d11f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * winrt: Fix crash during certain video operationsPeng Wu2015-07-281-27/+10
| | | | | | | | | | | | | | | | | | | | | | The abstract video buffer pointer was being reused and (improperly) deleted when its reference count went to zero. As QVideoFrame utilizes an explicitly shared pointer which also tracks the video buffer, simply reuse the QVideoFrame instance instead. Task-number: QTBUG-47373 Change-Id: Idadae205cb520a0a1d752aa20256c0567b3be699 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * Fix video nodes material comparison.Yoann Lopes2015-07-203-0/+11
| | | | | | | | | | | | | | | | | | Don't consider a material equal to another when their texture IDs are not available yet. Change-Id: Id4127d71abb2db33950a206dc722b24ab626e960 Task-number: QTBUG-47205 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Doc: replace Mac OS X with OS XNico Vertriest2015-07-153-3/+3
| | | | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I11b3aa74d35064371cbbbeba660114e086b16aea Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * GStreamer: fix supported values returned by CameraBinImageProcessing.Yoann Lopes2015-07-141-11/+22
| | | | | | | | | | Change-Id: I5a4db9c055495714943421742dd237b6abf7daee Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| * WindowsAudio: Fix compiler warnings by g++/MinGW.Friedemann Kleint2015-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace NULL by 0 for parameters of type DWORD_PTR. qwindowsaudiodeviceinfo.cpp: In member function 'bool QWindowsAudioDeviceInfo::testSettings(const QAudioFormat&) const': qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR); ^ qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR); ^ qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]# ==[ Please wrap at 72 characters ]===================================| Change-Id: Ie8f65e0e1f4f1274a1b634f3701ae0103e716d97 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Exclude failing tests on RHEL and UbuntuSimon Hausmann2015-07-233-0/+10
| | | | | | | | | | Change-Id: Ifbfb36f47da5f826c94777286fde27d5edd29d01 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Extend test exclusion for this test on OS XSimon Hausmann2015-07-232-0/+5
| | | | | | | | | | | | | | | | | | | | The test doesn't work on OS X 10.9 and 10.10. It also doesn't work on OS X 10.8, but the current CI system doesn't actually run tests on 10.8. In the (future) event of us running tests on 10.8, this change is required. Change-Id: I6cbe6249aee2460353322d6f1254858238af3711 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Prospective fix for building QtMultimedia on Android against installed QtBaseSimon Hausmann2015-07-231-1/+1
| | | | | | | | | | | | | | | | | | We try to link in Qt5PlatformSupport, which depends on libqtfreetype, which in turn is not installed. However we don't really need Qt5PlatformSupport, only QtCore private headers for the JNI bridge. Change-Id: Ic6d577081327eda7b80ce03c6fb7fd5cf024d05f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Unit test qaudiodecoder: Do not rely on qCompare(bool, int,...).Friedemann Kleint2015-07-171-4/+4
| | | | | | | | | | | | | | | | | | The overload was added for NokiaX86 and RVCT and is bound for removal. Task-number: QTBUG-47260 Change-Id: I8eb0333e0e20323ab20f361186d9a47fd3ab9f24 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Blacklist failing part from tst_qsoundeffectJani Vähäkangas2015-07-062-2/+5
| | | | | | | | | | | | Task-number: QTBUG-46689 Change-Id: I195d5cea8a588afcdefae5a91acb511fadbb839c Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devLiang Qi2015-06-3030-84/+561
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-2930-84/+561
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 07:39:06 +0000