summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.1' in qt/qtmultimedia6.5.1Qt Submodule Update Bot2023-05-161-4/+4
| | | | | Change-Id: I11769a3b26a3ef1c54835b6826fa2f60f1df00b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Docs: Add note about YUV420P format with FFMPEG backend on AndroidNicholas Bennett2023-05-151-2/+17
| | | | | | | | | | | | Being a generic format, we can receive either a fully planar 4:2:0 - YUV420P or a semiplanar NV12/NV21. That will depend on the codec implemented in the device, so device-dependent. Fixes: QTBUG-112454 Change-Id: Iebebca8d3d2bb5b540f92ec87b536dcb49ec7e4f Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> (cherry picked from commit 954053c17cb53b41c8ecf8cb794898c89fdef5e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtmultimediaQt Submodule Update Bot2023-05-141-4/+4
| | | | | Change-Id: I3042a5b8f64b11d3c1e7cac42a2022365c67177d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtmultimediaQt Submodule Update Bot2023-05-111-4/+4
| | | | | Change-Id: I0600363024bc522b1e62eb1347d713f5166c9115 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* pffft: Fix invalid format in qt_attribution.jsonTopi Reinio2023-05-081-1/+1
| | | | | | | Change-Id: Ieb948fd0eff8f10af10aab20268961e9b41de18c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 04b4b08bc6bfb7d6afa6e729c01ae1bf50389904) Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on '6.5.1' in qt/qtmultimediaQt Submodule Update Bot2023-05-051-4/+4
| | | | | Change-Id: Ia2c3e4af6bc2653a26f460a6c3c89bab1029be66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Upgrade pffft to the latest versionLars Knoll2023-05-052-4/+3
| | | | | | | | | Fixes: QTBUG-113355 Change-Id: Ib7f7c45fe89f6516d136406eb068ea740cff11fe Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 54c2bd33eddc96ac7268ca43773e98b4cd7433f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFVideoSink: Set pixel format even when rhi is not setVladimir Belyavsky2023-05-011-24/+22
| | | | | | | | | | | | | QVideoSink::setRhi() is new and not documented. One may still use default constructed QVideoSink as an output for QMediaPlayer. In this case we still need be able produce valid video frames into the sink. Amends 2e43d29e1d5d50b44b8f6d4f000968e3933c279a. Fixes: QTBUG-113286 Change-Id: Ib4632e66e8df78af44178af611604aac5e797b53 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit aa2b9b0474b3bd268f01f0d0e8f6e6c9b681ba3f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-05-011-4/+4
| | | | | Change-Id: I2c566a8ca231893b713cc9630e025ece6e387d4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Docs: Fix "Can't link to" example warningsSafiyyah Moosa2023-04-282-4/+4
| | | | | | | | Task-number: QTBUG-113160 Change-Id: I0187a0f9ab419694b6e801d1f44cbb59394ec7c7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 494cdc948ccceea37cdc25ae3f6ba32768d73635) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-281-4/+4
| | | | | Change-Id: I4b7dc1cd4fd741ef7328535d1b6ca2a4aa379cc8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add IMPORTED_LINK_INTERFACE_LANGUAGES to WMF::WMF targetAmir Masoud Abdol2023-04-261-1/+2
| | | | | | | | | | | | | | To make sure that CMake sets and uses the `CMAKE_C_IMPLICIT_LINK_DIRECTORIES`, we need to specify the `IMPORTED_LINK_INTERFACE_LANGUAGES`, otherwise, if user projects don't enable C, CMake might not know where to look, as seen in the bug. Fixes: QTBUG-112832 Change-Id: I5f26563cbbe4532b39933b4ffdec44bbccaf4062 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 148cf063e4efb87fc1ff07429b5723ff35ad0ef0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-261-4/+4
| | | | | Change-Id: Ic65d65db2fe8819a9e2bd33c4298fd03f35f3a4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android-example: add missing properties in AndroidManifest.xmlBartlomiej Moskal2023-04-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | After changing android target SDK version to 31, some missing values has to be defined in AndroidManifest.xml. AndroidManifest.xml template was updated in qtbase in: 56dee3de5e4ac1c4d37a2c5e27361e7ddbdea1a7 commit. In case when example uses its own AndroidManifest.xml file, it need to be updated separately. * android:exported="true": because the manifest sets an intent-filter, and it then has to explicitly to avoid the warning [1]. * android:allowBackup="true": this has to be explicitly set, we set it to the default value here [2]. * android:fullBackupOnly="false": SDK 23+ use this to deteremine to user auto backup or not, we set it to the default value here [3]. [1] https://developer.android.com/guide/topics/manifest/activity- element#exported [2] https://developer.android.com/guide/topics/manifest/application- element#allowbackup [3] https://developer.android.com/guide/topics/manifest/application- element#fullBackupOnly Fixes: QTBUG-113008 Change-Id: I5199dd70641a51e7e4bcf0c2abe7ea60d4a0eca9 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit ad9d22d6791a7c327031b3790b5826ad5a8c0d65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFVideo: Set color range to video frame formatDoris Verria2023-04-261-0/+18
| | | | | | | | | | | Set the color range based on the pixel format. This ensures the correct color matrix is chosen. Task-number: QTBUG-108083 Change-Id: I6b599d702384f479d8efee0673fe3eadcf9c12c2 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 8262be7eda8a4f72418e3e0d527936505de073fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QMediaDevices::videoInputs returning an empty listPavel Dubsky2023-04-261-0/+4
| | | | | | | | | | | | | | When QMediaDevices::videoInputs is called without prior call to QMediaDevices::audioOutputs the returned list is empty but if the latter call is present everything works as it should. The reason is a missing call to CoInitialize inside internal Windows-specific implementation. Task-number: QTBUG-112702 Change-Id: I462d3cf15f65329415539eb1bdde6be65ab9a407 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 1689940a061235545d6cc316fcc924284e7c3f1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix unused variable warnings with Android NDK 25Ville Voutilainen2023-04-263-4/+1
| | | | | | | Change-Id: I3393a873ac1a5bf5d2c289c54e5fa83941725fb8 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 642da396197821103dd6c6a6cfdf26791432cb7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QVideoTextureHelper: Fix color matrix calculationDoris Verria2023-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | The color matrix for BT709 video (limited) range, had a small mistake. From calculations based on the BT709 standard and for video range (16 - 235) values, the conversion equations are: R = Y * 1.1644 + V * 1.7928 + (-248.100994) G = Y * 1.1644 + U * -0.2132 + V * -0.5329 + 76.878080 B = Y * 1.1644 + U * 2.1124 + (-289.017566) So there was a missplacement between two of the coeficients in the matrix. Fixes: QTBUG-108083 Change-Id: If58c7df8a9ad4d975a2ac0c90cd3692232210995 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit bd1487b17d0806a79cc74b911008a533e1ec3036) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude files including EGL/egl.h from Unity BuildAmir Masoud Abdol2023-04-252-3/+7
| | | | | | | | | | | It seems that when <EGL/egl.h> is included, we get conflicting symbols between QUrl, and X11 symbols. Task-number: QTBUG-109394 Change-Id: Ided106a6b07f4a2d8c85419f86a5220f4cb77a23 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 3c2ea40bbe5327ce6a56dcef64ff3a8fb263705c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Highlight third-party modules that are security criticalKai Köhne2023-04-253-0/+3
| | | | | | | | | | | | | | | Mark any modules listed as 'processing untrusted content' in https://wiki.qt.io/Third_Party_Code_in_Qt also in the qt_attribution.json files. For reasoning, see also https://lists.qt-project.org/pipermail/development/2023-February/043667.html Change-Id: Ibb81617addfc972c46bf2223c54fa18173c9af4f Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit b1221e421459d261f67e03bb40c8ce36e95f0704) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qt_attribution.json format cleanupKai Köhne2023-04-253-45/+49
| | | | | | | | | | | - Do no use JS array for only one entry - Add DownloadLocation field - Use shorter SHA's for the version number, which is displayed in the generated documentation. Change-Id: Iaaf377432cc5189f42a87645c57308435edaf770 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit f97403b0f4b28f85145cc0d690ed28a31d01ed71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Fix capturesession snippet in mediarecorder type documentationNicholas Bennett2023-04-251-0/+1
| | | | | | | | | | | | Added "active: true". Task-number: QTBUG-112714 Change-Id: Ic122efcd8a8e742d7edefc54fdf443c758259b19 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit fd64f3a8a3d418617ae793b8f5287430c0b45bd2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove an unused private variableAmir Masoud Abdol2023-04-241-1/+0
| | | | | | | | Task-number: QTBUG-109394 Change-Id: I9a2292d042315d997593c2521a008ece533d7e93 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1c6cc5edf078c5d12c04d637b7e539264b6efce9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude a file from Unity BuildAmir Masoud Abdol2023-04-241-0/+6
| | | | | | | | | | | | | | If not excluded, - `rwLock` will collide with `wrappers/jni/androidmediaplayer.cpp`, - and `notifyFrameAvailable` will be confused by the one defined in `wrappers/jni/androidsurfacetexture.cpp` Task-number: QTBUG-109394 Change-Id: I50a891449f4631caceb088a79e26c709df063931 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d6dffee9592a198669c7284a0a10179143d69654) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove mentioning of Spatial Audio being in tech previewAndreas Eliasson2023-04-241-3/+2
| | | | | | | | | | Spatial audio is out of tech preview in 6.5. Fixes: QTBUG-112601 Change-Id: Ia7a5158608ab5a8a5f1a597792dbb42aa0e50bde Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 7485af9756854a11cb95764cd08e1bcc0ec8cde2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash with sequential QIODevice as media source on WindowsJoerg Bornemann2023-04-242-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sample in QTBUG-110005 uses a QNetworkReply as source for QMediaPlayer. This is a sequential QIODevice. As such, it doesn't have the concept of size. The sequence leading to the crash is - BeginCreateObjectFromByteStream() is called - MFStream::GetLength() return zero - that's why MFStream::BeginRead() is not called, and m_currentReadResult stays nullptr - QNetworkReply::readyRead() is emitted - MFStream::doRead() is called, because of the latter signal - MFStream::doRead() accesses m_currentReadResult, which is still nullptr (see above), and we witness the crash The desirable sequence is (as one can inspect by playing a video from a qrc:// URL): - BeginCreateObjectFromByteStream() is called - MFStream::GetLength() returns the video stream's size - MFStream::BeginRead() is called and initializes m_currentReadResult - MFStream::BeginRead() posts a custom event to the MFStream object - MFStream::doRead() is called when handling that custom event - MFStream::EndRead() tears down m_currentReadResult There is never a situation where QIODevice::readRead() should trigger a MFStream::doRead(). Calling doRead() outside of the BeginRead()/EndRead() pair cannot work. Therefore, this patch removes the handling of the stream's readyRead() signal. Note that this patch only fixes the crash in favor of an error code that's written to the program's console. Handling sequential QIODevice streams will require some more work. See further comments in the issue. Fixes: QTBUG-110005 Change-Id: I2fc70f873a2e3a257e8e081d83862c53dabb6cac Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit d7c1429b5515c38288e3a33992bf2582c243df5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* screencapture example: Make the screen model dynamicFriedemann Kleint2023-04-204-15/+29
| | | | | | | | | | | Use QGuiApplication::screens() to obtain the screens and connect the changed signals to model reset. Make the description a bit more verbose. Change-Id: I92c0be712196aa7be475c08305ef6f8a20e603d3 Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit 004c18bb572329778a3e85fe436e0b216cf1f287)
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-201-4/+4
| | | | | Change-Id: I4413e45248be536ab2d740dae6eb3057a97fc153 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix playing of video files with Chinese namesPavel Dubsky2023-04-201-1/+1
| | | | | | | | | | | | | | | | The old implementation was using QUrl::toEncoded in order to retrieve a filename from a URL, but it uses toLatin1 internally which substitutes all non-ASCII characters with question marks that leads to ill formed path. The new implementation uses QUrl::toString with a subsequent call to QString::toUtf8 and it basically leads to the same results while preserving non-ASCII characters. Task-number: QTBUG-111951 Change-Id: I0ad32143bc4afbdaec34511d7910ff106cb3cf45 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit d4f99bdfc22c7f4edb26877a5912a9d5dbb55cfb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: fix crash when camera is not yet readyLorn Potter2023-04-194-38/+38
| | | | | | | Change-Id: I38b27c2295827f7319d9c45f7a12bd45c98bd7d6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 6394ca0ee85695754fe687cd8f1d77e4e5f07283) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-191-4/+4
| | | | | Change-Id: I948d86ec655544cc958309d42f887acf69f34d23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix qmediaplayer tests flakyness with QSignalSpyArtem Dyomin2023-04-191-1/+5
| | | | | | | | | | | | | QSignalSpy is not safe if signals are emitted from another thread, on windows the collision of removing QSignalSpy and receiving a new frame occurredpretty often (around 20% of running attempts). Catching the signal in the main thread fixes the problem. Change-Id: Id9630a5ee32e261b308ea61dc0a61b424f5239c0 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 587fb48167cf57d1612338ac0e91ae8136cd76aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix auto tests running on linux CIArtem Dyomin2023-04-181-0/+9
| | | | | | | | | | | Some CI linux tests have been moved to separate targets without env var FFMPEG_DIR. the current patch applies the same approach as for macos. Change-Id: I131473c419e0cb302192ca6d4203bd9ad81769e5 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 8783dc08547b030be1505b8501ad79b58c765dc5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-181-4/+4
| | | | | Change-Id: Ibda7a860f34624f51d4836db9e89390ffd6588c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Exclude wasm/qwasmaudiosink.cpp from the Unity BuildAmir Masoud Abdol2023-04-171-0/+3
| | | | | | | | | | This is to avoid symbol collision with wasm/qwasmaudiosource.cpp. Task-number: QTBUG-109394 Change-Id: I42ba81e675db788db20fed940eeb94f8c01be5b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bdd905abf8c1d95d907407ee2c6817eb3e00c4b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: assign the stalled callback to the stalled eventLorn Potter2023-04-171-1/+1
| | | | | | | Change-Id: Id93fe26883f3f3afb70ac18b40da0c9cd715f704 Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 265cb20bc6e2b6895ff006f04e97722f44a03fca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* wasm: use double as duration data typeLorn Potter2023-04-171-10/+10
| | | | | | | | | Fixes a crash in certain circumstances. Change-Id: Ia4c9e9c7a5fb94863f48f32eca13bb6832a3eefc Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> (cherry picked from commit 51b0aa48169a2db839368b9785600fb802756b1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSampleCache: Wait for load thread to finish before restarting itMikolaj Boc2023-04-161-1/+5
| | | | | | | | | | | | | One cannot rely on QThread::isRunning for checking whether the thread hasn't finished yet, as the thread might be quitting and still return true from isRunning. In that case, the thread won't process the sample load request that misses the start() call in this case. Fixes: QTBUG-109167 Change-Id: I33382ad3d8a19ceb86857c51227e81a86a88eea7 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit cb5f13e766cade954ffea4f6a62d7b9c81b5fb90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Brush up the screencapture exampleFriedemann Kleint2023-04-154-30/+26
| | | | | | | | | | | | | | | | - Fix compiler warnings about unused parameters - Fix spacing - Reorder includes by module - Translate user-visible texts - Use QList::size() instead of deprecated count() - Fix clang warnings about else after return - Streamline some code Change-Id: Ic7640d72018b59f05c84224ca006a3f60a26f7ea Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit c259c052594c33ac304f7103333b596fd024e673) Reviewed-by: Lars Sutterud <lars.sutterud@qt.io>
* Fix threading problems of QVideoSinkArtem Dyomin2023-04-153-42/+112
| | | | | | | | | | | | | | | - change notification signals should be emitted out of the mutex since it causes a deadlock if the user connects directly and call QVideoSink getters. - currentVideoFrame should be under the mutex since frames assignment is not atomic. - minor clean up with moving to cpp file. Change-Id: I07a7e54108c100cd18dc71c88acd93a5622bd2f5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 1b5249d1186064cd320b36ef6df7128e2e9937f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude multimedia/windows files from the Unity BuildAmir Masoud Abdol2023-04-141-0/+16
| | | | | | | | | | | | The `ksmedia.h` shipped with LLVM/MINGW seems to also have symbols that are generally found in `strmif.h` and `ddraw.h`; and that results in double definition of them when doing unity build. Task-number: QTBUG-109394 Change-Id: I8f59cdf39edc8ea5b0b55d9df2eff6778b72204d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit baf7cdc0a14cdb73dfc73a6dd6c0ac6d91cce213) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android-Tests: Skip few tests from tst_qmediaplayerbackendBartlomiej Moskal2023-04-141-0/+9
| | | | | | | | | | | | | | | There is known issue with creating hardware frame context for video renderer (QTBUG-108446). Because of that, frame.toImage() method returns invalid qImage object. Tests should be skipped until QTBUG-108446 is fixed. Task-number: QTBUG-112173 Task-number: QTBUG-108446 Change-Id: Ia6d0d5dd2b005e3312d94d1dbe62f0b6d173217a Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 519dbbc4cfa8edbfc9817fd53de649b7280d62ee) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Silence a few compiler warningAmir Masoud Abdol2023-04-141-10/+11
| | | | | | | | | Unused parameter, and initialization order. Change-Id: I7833420daab132266930aa68fb43a1483941c2a8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0e3439d35917c61da016a94a4904ab7668486d0b) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix a few memory leaksArtem Dyomin2023-04-135-20/+35
| | | | | | | | | | | - avcodec_open2 doesn't take ownership of options - fix not deleted surface in tests Change-Id: Ia410792b27af4ef5ccaf1c6774344d3b6571952a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 5e36c05dac20a997c5be7a8445daf78758fb275b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-131-4/+4
| | | | | Change-Id: I1807e8fa2dfc2b4bf547c9fe82787fc392cb4460 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android-tests: Remove QEXPECT_FAIL from tst_qmediaplayerbackendBartlomiej Moskal2023-04-131-12/+0
| | | | | | | | | | | | | Android is using now ffmpeg backend by default. That is why all QEXPECT_FAIL macros can be removed from tst_qmediaplayerbackend. All of them were related to android-backend (QTBUG-96952). For FFmpeg this QEXPECT_FAIL is not valid. Task-number: QTBUG-112173 Change-Id: Ic36f8de9852d501837e3459ae8cdb133545075c1 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 74e5bf5dae4e23f24e1e50fd78465bad7bbfed61) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtmultimediaQt Submodule Update Bot2023-04-121-4/+4
| | | | | Change-Id: Ief7a148c98d4180b1725810e75026dc4276ee21a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Implement seamless ffmpeg playback loopingArtem Dyomin2023-04-1216-119/+447
| | | | | | | | | | | | | | | | | | | | | | | | Users need seamless looping, in other words, looping without little delays on jumping from the media end to the start. The only way to make it seamles and smooth is to intrude into the playback engine. As result, we have just a regular delay between frames on shifting. Also, a bunch of adjuscent small improvements have been introduced: - simplify criteria of the demuxer's buffer size, it was more complex and a bit not relevant before. Actually, we need to check only max buffering time. - Improve handling of media with streams of different length. - Fix setting of the playback rate before opening sources. - Add new auto tests for looping. - Add debug logs. Task-number: QTBUG-112305 Change-Id: Ic9073d77535f5aae19f9ea48d4e745c9f2fa9ea3 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit 57ebebae16d9b4d984709541a1b37e711f48b14d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qtmultimedia built with alsaShengfeng Zhou2023-04-111-2/+2
| | | | | | | Change-Id: I8229fa1c3111d6b164176d731a12ec0e1faf8e55 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 5e0e2bbafb807922399e352bb7d9c022cb404c1e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* screen capture example: Remove the 6.6 bits from the documentationFriedemann Kleint2023-04-111-17/+13
| | | | | | | | Amends f0e8d1943dae4a2374866371a975bd8317c555e6. Change-Id: Iffec8fd6df3e2608fc002efaf221dcd282185cec Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no>