summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtmultimediav6.2.0-beta1Qt Submodule Update Bot2021-06-301-4/+4
| | | | | Change-Id: I9f944e5542a1b321ec74e53552a5973b7b32f28d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* macOS/iOS: Support setting audioOutput device to the capture sessionDoris Verria2021-06-298-3/+84
| | | | | | | Change-Id: I4bdc5c0120a1ab26906c05d854fb66d71fab4efe Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit f63d082503138ba8fa40ec05fdc1702758cc34d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-291-4/+4
| | | | | Change-Id: I42274f0da574c053cb08ee5f85d17bb7b3700f05 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-261-2/+8
| | | | | Change-Id: Ifea71550c87c62cda6d9599191dd2c7c8232b1b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge "Merge remote-tracking branch 'origin/dev' into 6.2"Lars Knoll2021-06-2570-631/+1342
|\
| * Merge remote-tracking branch 'origin/dev' into 6.2Lars Knoll2021-06-2574-637/+1348
| |\ | | | | | | | | | Change-Id: Id03ceec99c0810798b0fa673cf9d45d245322a6e
| | * Fix QPermission::PermisionType's mis-spelling of permissionEdward Welbourne2021-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on upstream change in qtbase to fix the declaration there; is a prerequisite of a subsequent removal of an alias for the typo'd name. Task-number: QTBUG-94407 Pick-to: 6.2 Change-Id: I4f58653483be96c9462ae4f6a189cb88e4de9c7c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| | * Update dependencies in qtmultimedia/devLars Knoll2021-06-251-4/+4
| | | | | | | | | | | | | | | Change-Id: I7c7f05ece37a735efee488fe06931e2ee56e22af Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Move decls in relation to #if'ery to get the code to compileEdward Welbourne2021-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup for commit 634894a8a83b021386da8c2672628b0b26185ef3 which looks like it only really meant to suppress the role-related part of the initialization. Moved one declaration out of the new #if-ery to before it; and one from before it to within it, the only use of which was commented out further down. Change-Id: I595679eda5ccd848de16a7aa2dc7c39fdc3f329c Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
| | * Add stubb for QPulseAudioIntegration::formatInfo()Edward Welbourne2021-06-252-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This way the code at least compiles ! Change-Id: Ic5d006d1bcab0e95408df2bdb8c7cb03cf899e8b Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
| | * Clean up file format and audio profile handlingLars Knoll2021-06-2515-72/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ALAC file format as it is actually always stored in an mp4 container. While the same is true for AAC, keep the format, as it's often used with it's own extension. Rename ASF to WMV and add WMA as a file format as those usually have different extensions. Add WMA and WMV codecs, as the corresponding file formats make little sense without supporting the codecs that are being used. Clean up the gstreamer implementation and test that audio only recording works for all combinations. Change-Id: I7c76add8f02eba646741c6c2a870e8af9b9fc51b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Avoid (bogus) MSVC warnings (that are now errors)Edward Welbourne2021-06-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two instances of warning C4723: potential divide by 0 where the numerator is bytesPerSample(); which the code, at least, consistently assumes is non-zero. Pick-to: 6.2 Change-Id: I70630735d631e99b064fab9ec8752ca3d4677bfd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| | * Make C++ QML MediaRecorder naming consistent and expose MetaData enumsPiotr Srebrny2021-06-241-1/+8
| | | | | | | | | | | | | | | | | | Change-Id: Ie9cd7d65015aa7a43fe62ce84a9ff166f763b3d0 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Streamline some translatable messagesFriedemann Kleint2021-06-2312-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some repeated messages as helper functions into private classes. Pick-to: 6.2 Change-Id: Ief16110731d0534427e67b42d2672f02f265bba4 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Give translated messages of QMediaMetaData the class contextFriedemann Kleint2021-06-231-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QObject::tr() should be avoided. Pick-to: 6.2 Change-Id: I0736383c24a8aac6c9cccafcdae1fa40d2c67348 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Add metadata to audio and video capturing on darwinDoris Verria2021-06-239-145/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add and retrieve common and format specific meta data. Pick-to: 6.2 Change-Id: I3e3f0ffdff52b8cf6e2079fdc1536b130c65773f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Overhaul documentation for Qt 6 Release, First blockNicholas Bennett2021-06-2217-295/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See list of modified files, main changes were: -Adding links to external references. -Fixing grammar and punctuation usage. -Adding images and video for explanations. -Changes to conform to Qt documentation style.. -Renamed QCameraImageCapture to QImageCapture, added to changelog. -Changed module description to Add-ON. -Updated the qml type include statment. Task-number: QTBUG-94646 Change-Id: Ic543823242caf6d9b7de5a2947ba8b0bdf98777d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * Add the 'Private' suffix to the internal module namesAlexey Edelev2021-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename internal modules to adjust their names to the internal module policy. Pick-to: 6.2 Fixes: QTBUG-94613 Change-Id: Icb0d7c63f405ea10cb31471f58bd3d82a76f8cb3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Add warning comment to private header to fix configure warningVolker Hilsheimer2021-06-221-0/+11
| | | | | | | | | | | | | | | | | | | | | Change-Id: I3187d3610916b56b640accabaaa15394c96d3b45 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Make git ignore build artifactsAndré de la Rocha2021-06-211-0/+5
| | | | | | | | | | | | | | | | | | Change-Id: Ia585011f99893151a233a4fd2866d3c253a8254c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Update dependencies manuallyVolker Hilsheimer2021-06-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since qtmultimedia does still have "ignore" status in qt5.git, this is not done automatically yet. Get on top of recent qtbase/qtdeclarative before un-ignoring the module. Change-Id: Ibccb26f9ec6035ef4d1d3c208240860b2aefeaf8 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
| | * CMake: Rename conflicting targetAlexandru Croitor2021-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test of the same name exists in qt3d. Pick-to: 6.2 Fixes: QTBUG-94609 Change-Id: I496c658e7705e0f428f8eee2ada5f639dcbfd86c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Windows: Fix Windows Media Audio encoding bitrateAndré de la Rocha2021-06-211-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, encoding would fail. WMA/WMV support still needs to be enabled elsewhere. Change-Id: If12a1054a5b525c160da8597453d09fd2f488fb9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| | * Windows: Handle error condition when finalizing media captureAndré de la Rocha2021-06-216-3/+33
| | | | | | | | | | | | | | | | | | Change-Id: I025a94e6cf0478654719ec7a5b32b9ed0a52be37 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| | * Windows: Adjust the recording pipeline when devices changeAndré de la Rocha2021-06-215-4/+40
| | | | | | | | | | | | | | | | | | Change-Id: Iaa12d4f28c7ede788f59f430de7fb6ca1bb5bc6b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| | * Add positioning information for channels to QAudioFormatLars Knoll2021-06-196-138/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just having a list of x channels without knowing where they are spatially positioned is missing the most important part. Reworked the QAudioBuffer access API to allow accessing data with a specified frame layout. Change-Id: I2aba20e62e97d80ca8873c97aa00f234ea210cd2 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Put media format enums in class scope and make it available in namespacePiotr Srebrny2021-06-184-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The media format enums have conflicting names thus must stay in thier respecitve namespaces when exporting to QML. The dependencies are updated as declaring the namespace and gadget on the same object is not supported with the selected qtdeclarative component. Change-Id: I6c113512128af4c60b431523c5322f77b879bc30 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Remove brightness and related properties from QVideoSink and QVideoWidgetLars Knoll2021-06-187-93/+15
| | | | | | | | | | | | | | | | | | | | | | | | We currently do not support those on all platforms and most native APIs do not offer those kind of controls neither anymore. Change-Id: Ifa58d206796fba3b10dfa111be1c6f79a996539a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Remove QMediaPlaylist from QtMultimedia for nowLars Knoll2021-06-1814-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API needs a redesign. As the class is not used anywhere in Qt Multimedia, move it to the player example for now. For 6.3, we should have a good look at how to best implement playlist support again. Change-Id: I5a225b69e2cd0f5c88531fdcee80c99f34255efd Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Partly fix support for audio only formats in gstreamerLars Knoll2021-06-181-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we detect encoding/decoding capabilities for mp3, flac and wave. This needs a bit more work to clean up the file formats that are actually MP4 (cross-platform), and ensure encodebin in gstreamer handles this correctly. Change-Id: If7027bd94195ba3f795da598a67c42172070aad6 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* | | Fix QPermission::PermisionType's mis-spelling of permissionEdward Welbourne2021-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on upstream change in qtbase to fix the declaration there; is a prerequisite of a subsequent removal of an alias for the typo'd name. Task-number: QTBUG-94407 Change-Id: I4f58653483be96c9462ae4f6a189cb88e4de9c7c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 61c7d0c2e400b54d68763f28bc841232e81937fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-251-2/+2
| | | | | | | | | | | | | | | Change-Id: I0ab971e2d4cae16d0d71fe564f1a0ad674e4c8ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Avoid (bogus) MSVC warnings (that are now errors)Edward Welbourne2021-06-252-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Two instances of warning C4723: potential divide by 0 where the numerator is bytesPerSample(); which the code, at least, consistently assumes is non-zero. Change-Id: I70630735d631e99b064fab9ec8752ca3d4677bfd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 76be6a37a211435f2e69d240a1b25b353eba2c11) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Streamline some translatable messagesFriedemann Kleint2021-06-2312-13/+48
| | | | | | | | | | | | | | | | | | | | | | Move some repeated messages as helper functions into private classes. Change-Id: Ief16110731d0534427e67b42d2672f02f265bba4 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4f169505f806a678313204b6849a46f786cf525f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Give translated messages of QMediaMetaData the class contextFriedemann Kleint2021-06-231-28/+29
| | | | | | | | | | | | | | | | | | | | | | QObject::tr() should be avoided. Change-Id: I0736383c24a8aac6c9cccafcdae1fa40d2c67348 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9290bf892a36fe1bfd5970630527c46eb1851f32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Add metadata to audio and video capturing on darwinDoris Verria2021-06-239-145/+488
| | | | | | | | | | | | | | | | | | | | Add and retrieve common and format specific meta data. Change-Id: I3e3f0ffdff52b8cf6e2079fdc1536b130c65773f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c91afc21c068d8c68d51bf3acb98e8a385b7db8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-221-2/+2
| | | | | | | | | | Change-Id: I728bcf376944279cb28179aa6a2a30878a2f5843 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add the 'Private' suffix to the internal module namesAlexey Edelev2021-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | Rename internal modules to adjust their names to the internal module policy. Fixes: QTBUG-94613 Change-Id: Icb0d7c63f405ea10cb31471f58bd3d82a76f8cb3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 5ea9d1d5a3bae959ffb77544a18d0fd22db1d27a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Update dependencies on '6.2' in qt/qtmultimediav6.2.0-alpha1Qt Submodule Update Bot2021-06-211-2/+2
| | | | | | | | | | Change-Id: Ib4070a8a9b93c7106bc882719d80f126ba61b0bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | CMake: Rename conflicting targetAlexandru Croitor2021-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | A test of the same name exists in qt3d. Fixes: QTBUG-94609 Change-Id: I496c658e7705e0f428f8eee2ada5f639dcbfd86c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 49f8de39c1604c51e42fd6522377a608f52cb5c0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-211-2/+2
| | | | | | | | | | Change-Id: Ib3402b2c9c137e9f201eae7922ff43ed44568601 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-181-2/+2
| | | | | | | | | | Change-Id: I139cdff5e7790204153861b46937e189e7524eeb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/dev' into 6.2Lars Knoll2021-06-18135-1693/+1139
|\| | | | | | | Change-Id: I9935d2bbed480bed7056f6c8257362b27f7c13ec
| * Fix qmediarecorder autotestLars Knoll2021-06-171-1/+1
| | | | | | | | | | | | | | | | Regression after change 00f89c1ab92ffb9c2c61bcb5e89b813214f45ac7 Change-Id: I4de35b3abac582b37956e7fec94d562ee274e847 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Get rid of QMediaCaptureSession::isAvailable()Lars Knoll2021-06-172-10/+1
| | | | | | | | | | | | | | | | We expect some basic capturing support to be there on all our platforms. Change-Id: I913f98562fdd47cf887c98edbefba6976ff211ba Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Fix parameter namingLars Knoll2021-06-171-2/+2
| | | | | | | | | | | | Change-Id: I23e0820dbf5a46a00c52f67ac58866741b79d07d Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Mark some methods on QMediaFormat as invokableLars Knoll2021-06-171-4/+5
| | | | | | | | | | Change-Id: Ia2aac9b59458c99aaf3ee34a480e52f9f425576b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Fix compiler warning about unused variableLars Knoll2021-06-171-1/+1
| | | | | | | | | | | | Change-Id: I7379a4addd1cb1f1f13befb44a513423ddd05f95 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Fix parameter naming after API reviewLars Knoll2021-06-172-10/+10
| | | | | | | | | | | | | | | | | | microseconds is a lot clearer than duration. Change-Id: I9e3aa5b60cac8c16cb7466ed68bd98d4e6f1bc9f Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| * Fix the QAudioDecoder APILars Knoll2021-06-1719-709/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust API after code review. Remove the audioFormat property. QAudioDecoder will now always decode to the native format used in the encoded file. QAudioBuffer will have the correct format set, and it's up to the app to handle this correctly. Remove state() and replace by isDecoding(). Change-Id: I6f2ac375d98b2d7c36aebaa729599f78699b1c7b Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 17:39:00 +0000