summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.2' in qt/qtmultimediav6.2.26.2.2Qt Submodule Update Bot2021-11-241-1/+1
| | | | | Change-Id: Ibc0149cc922a4b98e8615e4bb68a8db6b209c7a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-241-3/+3
| | | | | Change-Id: Ibb4c4905fa0ad52673ad149b84c87b719bdbcef9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-231-1/+1
| | | | | Change-Id: I70eba78107a044795b5abe02700e26e3b3a3ce87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-221-3/+3
| | | | | Change-Id: Ifb4040257fb0469007406ab2b40082bb17d36948 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-181-3/+3
| | | | | Change-Id: I29b657958dfd0d576be5043c46a3b3045d0fed71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Implement QAndroidImageCapture::captureToBuffer()Samuel Mira2021-11-156-67/+182
| | | | | | | | | | | | | Implemented the captureToBuffer based on the current implementation. Found that the image was not created on the right orientation. Fixed that by correcting the orientation after the picture was taken. Small refactor on cameraandroidsession because of different arguments. Fixes: QTBUG-97587 Change-Id: Ieb0c07f3b397df789f3f43d033ced76c01e8f33f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 60f9c575c2e21f5dfc08386e537ea56d5759b826) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Put Windows audio utils into namespace and add two utility functionsPiotr Srebrny2021-11-156-84/+91
| | | | | | | | | | | | | This patch moves two audio utility functions into qwindowsaudioutilis and puts them into the QWindowsAudioUtils namespace. The existing qt_converFormat function is renamed to better reflect the conversion type. Change-Id: I85ca2c0254710b588203fa811a20781a03b2f9ea Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e17df019ecdd5897d9d5b050ae648617e5e5f60a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use the Windows headers as Mingw supports now WMFPiotr Srebrny2021-11-153-128/+4
| | | | | | | | Change-Id: Ib16ac7d5048f04f74f8cb566c3113082a60e8019 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 75ebc69de0d350c9cebdeb63834ebdafeb9a46f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation of the pulse audio backendLars Knoll2021-11-121-6/+1
| | | | | | | | | | By removing some unused symbols Change-Id: Ic6e628626d90b55a9a319c379ca785e7bc3a8faa Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit a02b59e48b90729e33c2d026edec442139c079b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix 'devices' example to build with MinGWAlexandru Croitor2021-11-101-1/+4
| | | | | | | | | | | | | | | | | | | src/gui/kernel/qwindowdefs.h #defines main to qMain and qtentrypoint_win.cpp expects qMain to have 2 parameters in its signature: argc and argv. The 'devices' example was missing the parameters, which caused the app to fail at link time with qtentrypoint_win.cpp:97: undefined reference to `qMain(int, char**)' Add the parameters to the example signature. Task-number: COIN-762 Change-Id: I8baa4e84abf4c08f462f041a30d261023282a0b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 10f303b85d56069116b2c6ad362aeee48da79624) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix potential crashes if we do not find any audio/video devicesLars Knoll2021-11-091-0/+6
| | | | | | | | | | Don't derefence elements in an empty array. Change-Id: I30d99a95ce9570dc73bf585b1010b8df833f4692 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6e754229f49e3368394eb545f48ed107d8eaf932) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: Fix crash while reloading QMediaPlayerAndré de la Rocha2021-11-092-1/+5
| | | | | | | | | | | | | | | MFStream uses an event for reading data that used a pointer to an externally owned object that due to a race-condition could dereference the pointer after the pointed object had already been deleted, resulting in a crash. This patch changes it to use a weak reference and test if the object is still valid. Fixes: QTBUG-97992 Change-Id: I4ef37ad49036f9fa33e5f4f753c07c37398996c0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 2e857dd4b2d0b7564422b2d99ae8cad77c10cc5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix for crashes issue of the Spectrum examplePekka Gehör2021-11-094-5/+51
| | | | | | | | | | | The Spectrum app does not crash anymore after the fix. Fixes: QTBUG-96953 Change-Id: Ia555bdd21c3bc1ab0ada585c49441d6f8f548f8d Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit b9d508b7bb15d067c50ed6fbee8cae2cd6ee3cd0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid implicit conversion to pointer from QWindowsIUPointerPiotr Srebrny2021-11-095-21/+21
| | | | | | | | | | | | | | When converting from QWindowsIUPointer<T> to T* we can accidentally leak pointer when doing assignment operation such as: var_a = var_b. If var_a is T* and var_b is QWindowsIUPointer<T>, the pointer is set on var_a without any warning but the reference counting is incorrect. Change-Id: I8e770185856f5c1d84dac610fe7f95631dcf4308 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 0a86e3e2778dfe7860aa4712ff94069e78648586) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix for Content uri issuesPekka Gehör2021-11-094-11/+43
| | | | | | | | | | After fix file name and file extension will pass as a initial name to the file name field of the QFileDialog. Fixes: QTBUG-96957 Change-Id: Iea97b1249195fee1021163beb23130141093c3a4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 24d80c6a7856547036c36b719ca9aba6bb59b815) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change Android MediaPlayer SeekTo to the Closest FrameSamuel Mira2021-11-091-2/+7
| | | | | | | | | | | | | | | | | The default behavior for seekTo in Android is to seek the previous Sync Frame (the previous I-frame), disregarding the provided time. Depending on the video file, this can be a 5-second difference. This patch will change this behavior for the closest frame of the provided time. It is still not the exact time, but it will be closer than before. This change is only possible for Android API > 26. Below that will continue to seek to the previous Sync Frame. Fixes: QTBUG-97415 Change-Id: I9e698b023d30c0e527180198970430f39fda1f93 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Pekka Gehör <pekka.gehor@qt.io> (cherry picked from commit 0c1bb90691780703eabc7ed1954d6b49fe5da580) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-091-3/+3
| | | | | Change-Id: Ib724907a98e5c0922bce537c2c7cbfe870c8e05c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Warn when setting a new audio input/output device failsPiotr Srebrny2021-11-082-2/+10
| | | | | | | Change-Id: Ied8fb709e9bcc3003f54c807ea83dca0a924eb78 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 663dc4ee5ce1a4b76617a7c9545d1f13820fcefe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix for return value of mimeTypeForFormat issuePekka Gehör2021-11-081-2/+2
| | | | | | | | | | | After the fix mp3 and flac types are also in the right place in the list. So, saved file types are correct. Fixes: QTBUG-98023 Change-Id: I7c89f6482a074e0b9f2af654c7cab25f62960473 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a69b60f0b6d79086d459f20a3ab7c4d111901319) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-051-3/+3
| | | | | Change-Id: I1027c47f871749d8ca39a437607fd6d1e2ef0a8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-041-3/+3
| | | | | Change-Id: I54e252b90f49e0b1de6411f5e655e089e54b6853 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve error signaling when starting recordingPiotr Srebrny2021-11-036-78/+74
| | | | | | | | | | | | | | The boolean return value is insufficient to provide the correct indication to the user of the cause of an error. This patch replaces the boolean value with QMediaRecorder::Error to signal errors that occur when starting recording. Fixes: QTBUG-97952 Change-Id: I9d22ecfa81c53d1a53536d4f46bcd06b466f74f9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 1ac4126efc38d5066b4c3ab35476574a56786541) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* GStreamer: Fix black preview window on capturesessionsLars Knoll2021-11-033-11/+14
| | | | | | | | | | | | | | | | Properly render the video frames we receive in capture sessions. The pipeline for capturing should never be in a stopped state and not deliver any video frames. As a drive-by, convert some commented out debug output to use proper logging. Fixes: QTBUG-97911 Change-Id: Ie318925fa6bb9ef705b3d996f878da0bda8bf315 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit ed857e84f3c0ab90ac6dfff1aecce460f56e1a9a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Generete correct local file name from input QUrlPiotr Srebrny2021-11-031-5/+1
| | | | | | | | | | | The recorder can only write to local files. Thus, it should always try to translate the incoming QUrl into the local file name. Fixes: QTBUG-97832 Change-Id: I779a62686021dda251b2159f2d8f679f8e3af46e Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 1cf6905c15c6a6b3e45219d39933f6abff1a2a51) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use system clock on the pipeline instead of audio device clockPiotr Srebrny2021-11-031-0/+2
| | | | | | | | | | | | | | By default the pipeline uses the audio output device clock. When changing the audio output, the clock is lost and the pipeline must be paused and then put to the play state again. However, this process results in a complete stop of the pipeline. To avoid the clock switching problem, we can enforce the system clock on the pipeline that will never be changed. Change-Id: I00542060d14aa546f5945d863c59831caacf9fdc Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 0e259b5a0b90544d706594e581befaedcf914bdb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-031-3/+3
| | | | | Change-Id: I268242ce1810d89af60e3d2e492e563027da7d56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.2Jani Heikkinen2021-11-031-1/+1
| | | | | Change-Id: I7575786f25a006cd8a2529f262df993f21ce7e89 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Remove some dead codeLars Knoll2021-11-031-10/+0
| | | | | | | | | | WinRT doesn't exist anymore as a platform we support. Change-Id: I85ebb73b5c24d5415847925b0f3462b29232c6c9 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit ca324670ef3dcc03deb8d53420ba06865f297ac6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update the matching formats in the audiorecorder and camera examplesLars Knoll2021-11-034-38/+99
| | | | | | | | | | | | The combo boxes should show a list of matching formats/codec that we can handle give the constraints from the other combo boxes. Fixes: QTBUG-97839 Change-Id: I1a3f66c27f3ede06f188b9320600dde7c561a409 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit eaad981c0bd2de5f74114295d47a8893382a6a7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Expose the loops property of MediaPlayer in the Video elementLars Knoll2021-11-031-0/+10
| | | | | | | | | | | | | | Fix an API oversight, where we forgot to expose this property from the MediaPlayer in the Video element. Amends 23333fb4be2293ceaf129fec134ea687a30596d9. Change-Id: I4061c0d0f82d50799eb6991afcb7be88c5ab32e9 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e40cdef88e0a8e9f25160a326ba29e4c422de8e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QVideoWidget::setFullScreen()Lars Knoll2021-11-032-0/+9
| | | | | | | | | | | | | | | | | | | | | | setFullScreen(true) would always cause the video widget to be shown on the primary screen instead of the current screen the app is being shown on. The reason for this is that setting the Qt::Window flag on the widget will cause its position to be interpreted as relative to the screen instead of its parent. This position is usually on the first screen, so showFullScreen() will show it there. Fix this by moving the video widget to the physical position on the screen that it had inside its widget hierarchy before calling showFullScreen(). Also restore that position on setFullScreen(false), so that its position is correctly restored even without layouts. Fixes: QTBUG-97895 Change-Id: I5207afb276e9369938d1c3d8814d9878367c6895 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d6cef755f6874190d144d4d574c3c0d78f38dec4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove debug outputLars Knoll2021-11-032-33/+0
| | | | | | | | | | | Remove debug output that made it in by accident. Change-Id: I7bc7fc3a44fade10eacb3c2931573767f85fdf4b Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 0964df62a9d6e1b2cdeeb201f4e06481c3f5a760) Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Enable QAudioDecoder backend tests for WindowsPiotr Srebrny2021-11-024-11/+8
| | | | | | | | | | | | | | | | The patch enables the QAudioDecoder backend tests for Windows with minor adjustments. The expected duration time of the resampled file has been reduced as the Windows resampler produces slightly shorter audio after resampling. Additionally, the expected error code when reading invalid file is changed to ResourceError, which is better suited for this case than AccessDeniedError that relates to lack of permission. Change-Id: Iaf905a66c6e03d6ba6d5c9afd4fc8e88b9cb7840 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit fad168fcbc13bb3ab4c110cf3734f3e5cd83e3b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Force subtitles to get laoded when selecting a subtitle trackLars Knoll2021-11-021-0/+27
| | | | | | | | | | | | | | | | | | AVFoundation by default tries to apply user specific selection citeria when selecting audio and subtitle tracks. Unfortunately, this meant subtitles would not get rendered at all if they were initially disabled. This change ensures we enable them in the player when the user selects a subtitle track. In addition, we make sure they are disabled by default when you first load the media file. Fixes: QTBUG-96447 Change-Id: Ibfeb96ef54728324395f7d4bac4d035b8ee1d212 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 82c70bce11abea285a5e06a357da4c9434db0529) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove QT_QML_SOURCE_VERSION source propertyKai Köhne2021-11-021-3/+0
| | | | | | | | | | | | | | This is not needed anymore, since PAST_MAJOR_VERSIONS already get applied to the source versions now. Also fixes a CMake warning about QT_QML_SOURCE_VERSION being deprecated in favor of QT_QML_SOURCE_VERSIONS. Change-Id: I09cf21fe35d06893847c3f1adba73cbdde469afa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Craig Scott <craig.scott@qt.io> (cherry picked from commit 9c2a312558d4c3e6007f33e2fd079e3eea5dc210) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set captured image path to enable image previewPiotr Srebrny2021-11-021-0/+1
| | | | | | | | Change-Id: I048e211a8e05a5640fa69b319c68db032d6f9a48 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit bfee0f9398afddd27a522102c73ee5327a388b25) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
* Properly detect whether a stream is seekableLars Knoll2021-11-022-5/+13
| | | | | | | | | | | | | Don't make assumptions about the gstreamer source element, the rtspsrc is for example not a regular GstBaseSrc. Instead use a query on the pipeline to determine whether our stream is seekable. Fixes: QTBUG-97121 Change-Id: I935ea9fe399172a26b0fef6879d491cadadc47f3 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 9bb626d19f001ab7cf7719555f80ffe9837cd6b9) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Avoid nullptr dereferencingPiotr Srebrny2021-11-021-1/+1
| | | | | | | Change-Id: I987b85a935929cef90650500c13386b42ff62844 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit f94241cc98e2222c1567bbdef05a3dbd0eb12686) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Do not hide playback control bar since HoverHandle is brokenPiotr Srebrny2021-11-022-2/+2
| | | | | | | Change-Id: Ia67ba3c0611cebd49a9e5ed072c2bb07739312fa Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1e97d96ab0647005dd655961874f640984d66134) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Refactor Windows QAudioDecoder to conform to tst_qaudiodecoderbackendPiotr Srebrny2021-11-025-456/+345
| | | | | | | | | | | | | | | | This is a cleanup of the QAudioDecoder backend for Windows. The patch enables the decoder to work without the resampler, if it could not be instantiated. It adds warning messages and error signals to notify a user about issues. The decoder passes tst_qaudiodecoderbackend with minor adjustments that will follow. Fix QWindowsIUPointer self copy operation. Change-Id: Ie962ac7615b957746f85dcc4ec49af38bbda2373 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 6d908018ec1e8295dbd29e5bc7602219ed9c0dac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Skip broken cameras on macOSLars Knoll2021-11-021-0/+5
| | | | | | | | | | | | | | | | We can't handle a camera that doesn't provide us any valid vode formats, so skip those and don't enumerate them. One such example is the Snap Camera, that doesn't provide a valid encoding for the video data they are supposed to deliver (CMVideoFormatDescriptionGetCodecType() returns 0x18 which is not any valid FourCC code). Task-number: QTBUG-95186 Change-Id: I19f8500f3ed48ccb689436af10b59ec12c6d26fa Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 8a7e5ac48156ef2d872f3f27e3cf72379dd7ab0a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Camera example: Don't crash is the system doesn't have a cameraLars Knoll2021-11-011-8/+10
| | | | | | | | | | Don't assume the list of camera formats is non empty. Change-Id: Id64772b8db165357d350456df9174a6659f7c8d8 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 315dff497c78526888121c7f84e0074208261129) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Compile on systems that do not support eglCreateImageLars Knoll2021-11-014-7/+34
| | | | | | | | | | | | | Systems that do not support eglCreateImage also can't support DMA buffer transfers of decoded video, so that's the feature we want to test for and disable if eglCreateImage is not found. Fixes: QTBUG-97440 Change-Id: Ie65a21407aae74bc1b4325d3ffc5b833f34d3b2a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 2fb1985c6be885d4c2443eca5e61a5006757d68d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* player example: Use msec precision on the position sliderLars Knoll2021-11-012-6/+6
| | | | | | | | | | | Improves look and feel of the position slider significantly for short videos. Change-Id: I3b2cf3e66317cffcb1ffaec26bf3f5787b4264b4 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8a9998061dc1121348a6297705937d2839441dde) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add test for multiple sourceSamuel Mira2021-11-016-14/+104
| | | | | | | | | | | | | | Two tests added to verify for QTBUG-96456 issue. One on unit and other on integration (tests against emu). Also fixed tst_QMediaPlayerBackend to work on android. Before it did not worked, because the test files were not copied to apk file. Change-Id: Ie6c3c1ca16092ab377ca96e122a24131dfdc2335 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 83502faf856ecf2cde0d79cfac80a03088732d2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Consume videoframes in sync with clock on fake video sinkPiotr Srebrny2021-11-011-0/+2
| | | | | | | | | | | | | | Fake video sink should consume video frames in sync with the pipeline clock. Otherwise, when no video output is connected to the media player the audio and video streams are out of sync and the pipeline position that is primarly based on the video stream position is incorrect. Fixes: QTBUG-97730 Change-Id: Ia940254ac6289bbe47c64f4294cb8f9c8b714527 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a95ff0c8b84d770ea46b712d52c04eb5114e3b9f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix missing active track changeSamuel Mira2021-11-011-0/+2
| | | | | | | | | | Added emit to missing signal Fixes: QTBUG-97402 Change-Id: I1487b9d888aea8c3f994645d2441279d9e53f857 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit d67d2d6ded1fd2613107649f70c2f2b9d37f7a7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing "We mean it" disclaimerKai Köhne2021-11-011-0/+11
| | | | | | | | | | | | Fixes QtMultimedia: WARNING: c:/dev/qt/dev/src/qtmultimedia/src/multimedia/platform/android/common/qandroidaudioinput_p.h does not have the "We mean it." warning Amends 665060d740b370 Change-Id: I90015ed609901b7db79001922db9e709842c8b11 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit cc65e25d6e10a1161b514389b9a3492d42c7db2d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-11-011-3/+3
| | | | | Change-Id: I98fcd14192ed0bad7b93ddcb96b013334f079f35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: detect encoders/decoders based on MediaCodecListAssam Boudjelthia2021-10-293-45/+164
| | | | | | | | | | | | | | | | Instead of hardcoding the values, depends of the list of encoder/ decoders reported by MediaCodecList from the Android API. Note that WebM format still might not work with the Android Camera API even though its encoders are found, for that reason, it's explicitly not included in the list of supported file formats. Task-number: QTBUG-96945 Change-Id: I53eeb12a645c1b3b004970a288650f93e962e90a Reviewed-by: Pekka Gehör <pekka.gehor@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 91662e2aaa4d89c557912e7bc99a1d489e01be81) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status