summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Remove old configure-related filesJoerg Bornemann2021-06-172-221/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ic49fc29fa36c98d15385d8c94542d5cdc5598520 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix qSwap(QMediaFormat, QMediaFormat)Ulf Hermann2021-06-171-1/+6
| | | | | | | | | | | | | | | | | | You need to swap all members. Fixes: QTBUG-94565 Pick-to: 6.2 Change-Id: I0decfb3ea033bc358c39618a36d77ca9e0972e84 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Rename QCameraImageCapture to QImageCaptureLars Knoll2021-06-1776-475/+474
| | | | | | | | | | | | | | | | Fixup the backend class and file names while we're at it. Change-Id: Ib0928dfebb6f127b7a43683b2907420c95af6599 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Remove QCamera::StatusLars Knoll2021-06-1721-241/+30
| | | | | | | | | | | | | | | | The enum is not really useful. Instead isActive() and error() provide all the information required. Change-Id: I2856c833745e79f74bb2a9d95f0ef65eafd24413 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Android: Fix for content Uri issue on AndroidMediaMetadataRetrieverPekka Gehör2021-06-171-1/+1
| | | | | | | | | | | | | | a QFileDialog return file path as content://com.android.providers.media.documents Change-Id: I0ceba5d8cd592c4e7323fdb10aec90d653290932 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| * Add ${QtBase_VERSION_MAJOR} to multimedia jar fileAssam Boudjelthia2021-06-173-5/+5
| | | | | | | | | | | | | | Follow the existing pattern for jar files in Qt 6. Change-Id: I0db5435e71743615ff6f4f7f850d0a57504346b6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Make setOutputLocation behavior consistent across supported platformsPiotr Srebrny2021-06-1618-208/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outputLocation is always set regardless of whether is it valid or not, unless platform does not support encoding. If the output location is not writable an errorOccured signal is emitted. QNX and Android stored outputLocation in the capture session object. This has been removed and instead a recording(QUrl location) call is used to provide location information for the recording session. Reset m_mediaRecorder after deleting in QAndroidCaptureSession::start Change-Id: Ib1048410945aaf36532eb8606a4f9eb47460daf7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Windows: Fix active camera set in media device sessionAndré de la Rocha2021-06-161-1/+4
| | | | | | | | | | | | | | | | | | Resets the active camera in the media device session when a null camera is set in the capture session. Change-Id: Id843ac556e98dab880720be13beed1bb9c621e0c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Add metadata to captured media on WindowsAndré de la Rocha2021-06-166-23/+245
| | | | | | | | | | Change-Id: I41957e8f8ba2d8ab59e206e14db349d6fbf13a6c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Fix media codecs resolver when switching between audio and audio/videoPiotr Srebrny2021-06-164-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | Removing isSupported condition as it is true when audio only format is selected while flags indicate that video codec is required. The same occurs when going from audio/video format to audio format. Reset format if it does not support video while required. Change-Id: I2c056d935351cfc7a471a7376fa51da320cdb353 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
* | Remove old configure-related filesJoerg Bornemann2021-06-172-221/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: Ic49fc29fa36c98d15385d8c94542d5cdc5598520 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0bd8c0a36e8ccff03af7f6990298238455443ec4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Fix qSwap(QMediaFormat, QMediaFormat)Ulf Hermann2021-06-171-1/+6
| | | | | | | | | | | | | | | | | | | | You need to swap all members. Fixes: QTBUG-94565 Change-Id: I0decfb3ea033bc358c39618a36d77ca9e0972e84 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit acc8628c3b4725170a1d6444f4c24118be49779d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-171-1/+1
| | | | | | | | | | Change-Id: I0a61526c3b273b1e255dea700c44c412a4ad8005 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-171-2/+2
| | | | | | | | | | Change-Id: I3261e70ee0dc7edc5d78e5acfa3ba868263c7d6a 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-161-2/+2
| | | | | | | | | | Change-Id: Ibb4889c2cd772056bb8c9a45faf0be1aad40c8df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/dev' into 6.2Lars Knoll2021-06-1681-1908/+845
|\| | | | | | | Change-Id: I84ab4bc68611159d8e0d211a509e328319b7cb96
| * QMediaPlayer API cleanupsLars Knoll2021-06-165-53/+39
| | | | | | | | | | | | | | | | | | | | Remove the autoPlay property, and split up the setSource() method into setSource(QUrl) and setSourceDevice(QIODevice) for more clarity. Change-Id: I3e973fb5b6aa50f192af898f1b07769a201c6845 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| * Rename shutterSpeed() to exposureTime()Lars Knoll2021-06-166-38/+43
| | | | | | | | | | | | | | | | | | | | That's really what it is, and how all other frameworks name it. Shutter speed is a name that really only works for old analog cameras. Change-Id: I52fc5619dd9a853cabd3abef2ddec2e2b8cba119 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| * Rename QCamera::cameraInfo to cameraDeviceLars Knoll2021-06-1622-110/+110
| | | | | | | | | | | | | | | | And take the opportunity to clean up variable naming as well. Change-Id: I510cc8295b8d35554534a3c2ac9d83bf6f5a9d65 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| * Add a QAudioDevice property to QSoundEffectLars Knoll2021-06-162-0/+19
| | | | | | | | | | | | | | | | | | Without it, the QML SoundEffect can't target a non default device. Change-Id: I114a1e712cdc4ff1bfdc4b131db97cbe4d6eb90f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
| * The volume property should use floatLars Knoll2021-06-162-7/+7
| | | | | | | | | | | | | | To be consistent across Qt Multimedia Change-Id: Id0cea5bc1c844e43448107d1cf2a2b22ad297109 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Get rid of QAudio::RoleLars Knoll2021-06-1628-413/+7
| | | | | | | | | | | | | | | | | | This was only ever implemented to some extent for Android. Remove for now, as it's not really an important feature and can't be implemented properly on many of our platforms. Change-Id: Idc4d21c857380088ca6d10d59a0e05d192899534 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Make QAudioDevice::Mode accessible from QMLLars Knoll2021-06-161-0/+1
| | | | | | | | | | Change-Id: Idad1154f0b4ae5d0737d04ed02a890952ed70b10 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Get rid of QMediaEncoderSettingsLars Knoll2021-06-1630-1287/+619
| | | | | | | | | | | | | | | | | | | | As per API review, fold this class into QMediaRecorder as that's the only place where it is being used. This removes one level of indirection from the API and also makes it possible to use from QML. Change-Id: Id9157df04512382cce28e89b082433ec67d36b28 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-06-161-8/+2
| | | | | | | | | | Change-Id: I0309bb4d4dd40655914e9d3be0ad2edc5faeb5af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/dev' into 6.2Lars Knoll2021-06-16201-3165/+3573
|\| | | | | | | Change-Id: I0f29cdfa94948a39a895a7678bcfe3a631d2d4ed
| * Rename QMediaEncoder to QMediaRecorderLars Knoll2021-06-1661-542/+536
| | | | | | | | | | | | | | | | As per API review, this is the better name. Since we removed the old QMediaRecorder class, the name is free as well. Change-Id: I1ec9af3876af8b6957e20c13f9e225bf1e5032d5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Kill QMediaEncoderBaseLars Knoll2021-06-1626-117/+107
| | | | | | | | | | | | | | | | | | | | The class was only needed because of QMediaRecorder. Now that that class is gone, we can move the enums into QMediaEncoder. Also rename the State enum to RecorderState as per API review. Change-Id: I2e0811e2c29f922265ac5a719226b647236e52b9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Kill the current QMediaRecorder classLars Knoll2021-06-1627-811/+90
| | | | | | | | | | | | | | | | The class provides only minimal convenience over using QMediaCaptureSession directly. Change-Id: I706bb6821fbf8a7cc79a86819001ee1fd669733e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Get rid of QImageEncoderSettingsLars Knoll2021-06-1625-476/+287
| | | | | | | | | | | | | | | | | | | | | | Move the API for setting file format, quality and resolution into QCameraImageCapture and get rid of the separate QImageEncoderSettings class. This simplifies our API and makes the QML integration easier. Change-Id: Iaac2a6e3ff50c7379c44d70001db7c52d8cb0c90 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Move the QAudio::Mode enum inside QAudioDeviceLars Knoll2021-06-1646-156/+148
| | | | | | | | | | | | | | | | QAudioDevice is the only class using that enum, so it makes more sense for the enum to live there. Change-Id: I11e6768d1114d63e68d1956f7d6e62786524c291 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Implement QPlatformAudioDecoder for macOS/iOSDoris Verria2021-06-146-2/+685
| | | | | | | | | | Change-Id: I43fa28f43f6717ea408d677b021db7a90ec1df1d Reviewed-by: André de la Rocha <andre.rocha@qt.io>
| * Android: Fix for content Uri issuePekka Gehör2021-06-141-16/+6
| | | | | | | | | | | | | | a QFileDialog return file path as content://com.android.providers.media.documents Change-Id: I2c10548b5314aba38f3affdb68e7fa0c1f5bb78c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| * AudioDecoder example: Don't start event loop in case of errorDoris Verria2021-06-143-0/+9
| | | | | | | | | | | | | | | | | | | | If an error is set on the decoder before starting the application's event loop, this will cause the application to hang. Check for errors and return if there are any. Change-Id: Ib2d96559f8712db43973612f0e428f6d71438f02 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Add test case for invalid source file/device to audiodecoder testDoris Verria2021-06-141-0/+94
| | | | | | | | | | | | | | | | | | Check that the appropriate errors are set on the decoder when media sources can not be resolved. Change-Id: Ie9bcc1298bf561a4ee4a90e4d6d74869541a1c6e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-141-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: Iaa611889722d46e10b20dd566c2030a21f3e025a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Use QAudioOutput in QMediaPlayerLars Knoll2021-06-1140-572/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust QMediaPlayer to the new audio output architecture. One now needs to explicitly add a QAudioOutput to the media player to get audio playback. While this requires two more lines of code to set up the media player, it does make the API consistent between audio and video and also consistent with what we have in QMediaCaptureSession. Adjusted auto tests where required and ported all platforms. Change-Id: I247e915e4862dee6d6bce367b83664b1d1d69726 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * Add audio output selection to the capture sessionLars Knoll2021-06-1110-76/+112
| | | | | | | | | | | | | | | | | | | | | | | | Make it possible to select an audio output in the capture session. This gives an audio monitor channel to monitor the recording. Currently only implemented on gstreamer. Change-Id: I1da3d80c71253364c99ee49c770f8665527d01a0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:34:55 +0000