summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.4' in qt/qtmultimediav6.2.46.2.4Qt Submodule Update Bot2022-03-041-3/+3
| | | | | Change-Id: I7ad1015644c656c14a338d7d2488e4fb89d4ffbc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.4' in qt/qtmultimediaQt Submodule Update Bot2022-03-011-3/+3
| | | | | Change-Id: Id68bbc6afa087369324ebb0dc1ceef269e2fbfa2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.4' in qt/qtmultimediaQt Submodule Update Bot2022-02-211-3/+3
| | | | | Change-Id: I1be86dee462df0bddd4d06c90f0d5e00c4463f3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-171-3/+3
| | | | | Change-Id: Ic1e2b25545dc8021afe9523b5102a1579e7acf82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve QSoundEffect URL through QML contextPiotr Srebrny2022-02-173-8/+94
| | | | | | | | | | Simiar to QMediaPlayer resolve the source URL using QML context URL resolver. Fixes: QTBUG-100638 Change-Id: I4776e66abbb8689dd1941b23512e7f621c864a57 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 9c6ae9afddc0494cc93b8bf05e51944a4ddf5e26)
* Do not access NV_DX_interop functions out of OpenGL contextPiotr Srebrny2022-02-161-11/+13
| | | | | | | | | | | | | | | An attempt to use NV_DX_interop functions out of OpenGL context results in an exception. Thus, we do not unregister the D3D9 texture from the OpenGL context when it is gone. This patch also clears m_glHandle variable after it has been unregister in some rare case when we cannot lock it. Fixes: QTBUG-100665 Change-Id: Ie4bc02dbaccec12d92f8e274eeb420482a5f2d58 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 3893a5b88349f4086e003c3f51cffdf538131c6c)
* Avoid sending warning on per-frame basis, use debug message insteadPiotr Srebrny2022-02-161-10/+10
| | | | | | | | Fixes: QTBUG-100363 Change-Id: Ic0c39dce6c0d016cf6e59cba9e50f4d641a16543 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1f9c3926687bac52ee794a99dcb19d66e11af24c) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Use clockwise rotation for the QVideoFrame::rotationAngle()Piotr Srebrny2022-02-155-42/+38
| | | | | | | | | | | | | | | | | | | The counterclockwise rotation of rotationAngle() does not play well with the multmedia backends. The WMF MFVideoRotationFormat that describes the counterclockwise rotation of the picture, must be applied as clockwise rotation to render frame the correct way. This patch changes the interpretation of the rotationAngle() to be clockwise rotation. This fixes the rendering for WMF and gstreamer. AVFoundation is updated to account for the direction change. Fixes: QTBUG-100337 Change-Id: I284367629dad27fea95da52af4ca2d71d9412b09 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 099e9a697b92e02666f308c1789c685990e45206) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Avoid misleading error information, display proper loading errorPiotr Srebrny2022-02-142-2/+14
| | | | | | | | | | | QSample displays _decoder error_ when invalid URL is provided. This is misleading. This patch adds a proper message for these types of errors. Change-Id: I5416cf4e5b09a008e3b6af964fe65b48895c0c57 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 72582b7e22080c2a03f180e128873ca0b566df6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-101-3/+3
| | | | | Change-Id: Ibda86821f48c76d094f092eade805d0372f0201b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing #include <functional>Lars Knoll2022-02-093-0/+6
| | | | | | | | | Found during API review. Change-Id: I04a9439d3baa2149bead62c9c989677988a96959 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 89939fc8fdd9e5756443f94ed510bacd4556fdf5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fallback on map/upload texture if texture handle is invalidPiotr Srebrny2022-02-091-7/+20
| | | | | | | | | | | | | There is no guarantee that QVideoFrame::textureHandle() will return a valid texture handle. In some backend implementations texture handle is generated after QVideoFrame is created in the mapTextures() call, which may fail. In such case, fallback to QVideoFrame::NoHandle branch. Fixes: QTBUG-100363 Change-Id: I0ae78b0abfa99af5e4579e454ea70711a8741178 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8afe5d160c5a58e79f518d7483561ffbcb67d4e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFoundation plugin: protect the use of codec constantTimur Pocheptsov2022-02-091-1/+1
| | | | | | | | | It's not defined in older SDKs, so fails to build on macOS 10.15. Change-Id: I9518db080660d15eb0ef8af0c509e1062ada7113 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit f1babcc79a1693e134b9b12df3b4a5f922d42f89)
* doc: Correctly update typo in documentation of QMediaRecorderZhang Yong2022-02-092-2/+2
| | | | | | | | | | setMediaRecorder is replace with setRecorder. Fixes: QTBUG-100501 Change-Id: Ic761912c97166fdbee045282bbde57502a3e472b Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 04bda3e31c7e82e5eca2ac3f47164c80e3395b51) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove #include <qopengl.h> from the qt namespacePiotr Srebrny2022-02-091-1/+5
| | | | | | | | | A part of the change Iaca58f6cf92eb25aac52b780dadd6f38fe998204 that did not propagate to 6.2. Fixes: QTBUG-100347 Change-Id: Ie48d93584192283f757ee4371a342bcbe1c99db5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Task-number: QTBUG-90820 Change-Id: Ie7b3be8d74c1eb9e5f09dbe1819d56c2a42653fc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit b094da4bee0954f4e77b8c406d0c760741e31ca4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: Fix player sending same position multiple timesAndré de la Rocha2022-02-022-9/+16
| | | | | | | | | | | | Under some conditions the player would keep sending the same position update notification multiple times. Fixes: QTBUG-100283 Change-Id: I6968b5e76794cf055b5bd6c4703f5a4fc68ae544 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a997f2cee2c8509aa597bb89e3c00eefe31c7564) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Windows: Fix texture leak on media playerAndré de la Rocha2022-02-021-2/+4
| | | | | | | | | | | | Textures were being created in D3DPresentEngine::createVideoSamples() and never released. Fixes: QTBUG-100341 Change-Id: I31c9bbfa5a6a6b626685c45980adcbf23a473582 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7fa8e78cc2417ab245c2e662dc2ece77329fed31) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Make the method usableLars Knoll2022-02-011-1/+1
| | | | | | | | | a const setter doesn't make a whole lot of sense. Change-Id: I8db0b91e968c9d4937bf7fd2bbba4f3a313cb49d Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 6dcbeb896226bc452dd961cbc972d80739c27143) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-011-3/+3
| | | | | Change-Id: I3be22806bc83eba4aed103fe6995041774ad570f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.4Jani Heikkinen2022-02-011-1/+1
| | | | | Change-Id: Id5f0bf189012dc1d00425eb81d756d5dcf0443aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Fix QImageCapture related snippetsSamuel Gaist2022-01-312-12/+20
| | | | | | | | | | | The code samples were not properly ported to take into account the changes from the Qt 5 code base. Fixes: QTBUG-99643 Change-Id: Ie30e39a3a4cdaff2c6881218a6f382396a3d5729 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit e3a38654e668a73a3beb2544f68ca348b0f28dc8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix qmlvideo seek issuePekka Gehör2022-01-312-2/+2
| | | | | | | | | After the fix, seek works s it should be. Task-number: QTBUG-99038 Change-Id: I6658dd3e860e88c9fee8e457d7cdcd31df840426 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit bc2c92b483d3a45e426722b50bf2f1e4ad97d648)
* QAndroidFormatsInfo: fix quadratic loop (eradicates Java-style iterators)Marc Mutz2022-01-291-7/+4
| | | | | | | | | | | | | | | | Calling QMutableListIterator::remove() in a loop is quadratic. Use Uniform Erasure erase_if, which is linear (uses std::remove_if under the hoods). Since std::remove_if() typically runs find_if() first, we can't modify elements from within erase_if()'s predicate. Factor the modifications to the elements into a separate loop. Change-Id: I04f951d9b7e05f210876a2f4065b33035c94df7a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2bd1201df43a508f3f83af7b4995869fa7c4212a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix Video.seek() methodLars Knoll2022-01-251-11/+5
| | | | | | | | | | | | | QMediaPlayer doesn't have a seek() method anymore, but a writable position property. Fixes: QTBUG-100106 Change-Id: Ia90b91abd850f1c61c9a226c5eced39ec8ed16b4 Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit cb90823b7cb68efe8cebb77035d929b790901f76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix qmlvideo metadata issuePekka Gehör2022-01-242-14/+17
| | | | | | | | | | After the fix, metadata of the video shown correctly on MetaData page. Task-number: QTBUG-99038 Change-Id: I3ef2d90c237d1740c550ff4537fe5184a88bea5f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit b2ce9610ce434ce5e779f2ae1ce04260dd0cb5b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix namespaced build on WindowsKai Köhne2022-01-203-4/+13
| | | | | | | Fixes: QTBUG-100050 Change-Id: Iaca58f6cf92eb25aac52b780dadd6f38fe998204 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit fb3b880052df64564cc2d4bde59c0877544b79c7)
* Fix rendering with OpenGL based RHI on macOSLars Knoll2022-01-203-4/+6
| | | | | | | | | | | | | Somehow we ended up having the wrong bit swizzling in the shader for the GL_TEXTURE_RECTANGLE shader. Also add some explanation about the SamplerRect pixel format to the documentation. Change-Id: I2f2ff25490ccc831988d5221a5c4b1ab541d777e Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit e03582ab5b99b0930742e26e00753b17871a8752) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-201-3/+3
| | | | | Change-Id: Idf9a15772d4501715774c15c263f1265fc2aea14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: add install command for examplesSamuli Piippo2022-01-192-0/+24
| | | | | | | | Add install command to deploy the examples correctly. Change-Id: If9c24c4267a801078a4bf3f783587afeeb734be0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a0437e324bad99685072aa7f7a5fc4d20846bb12)
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-191-3/+3
| | | | | Change-Id: I04de1f1efc3add542e8836570df8a3a86a1fc6d6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Android sending a single video frameSamuel Mira2022-01-182-6/+5
| | | | | | | | | | | Android was not sending video frames automatically, and it had to readback frame for the next frame to be available. This patch forces the emit of the frameAvailable. Fixes: QTBUG-99650 Change-Id: I7559c65b734724d4e21bbb9b2e7f3a3ae8de97d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 372349a1b4f01e4ad5470ed2403fb20d4a0b0214)
* Docs: Fix any renaming warnings and enable doc CI test/ warning limitNicholas Bennett2022-01-174-3/+7
| | | | | | | | | | | | | | In order to prevent future rework of the multimedia docs and improve the quality of submissions: -Updated the coin yaml file to include the doc test. -Updated the qdoccconf and set qdoc warning limit to 0. -Fixed the remaining qdoc warnings. Change-Id: I04f1449f9c403dd75d5612fe8d65b7019b1903b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 6a3693fafa94053b75250bcfd26ebb3e19edb85e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Remove reference to QImageCapture::CaptureToBufferNicholas Bennett2022-01-171-2/+1
| | | | | | | | | | This property was removed, so removed the reference to it. Fixes: QTBUG-99849 Change-Id: Ida4f96639922471fc872f4faaccbd86a615a2ef9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 42a6863437d366fb3d62444263af1d6961b2b100) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix SeekPauseSeek Test in AndroidSamuel Mira2022-01-143-2/+25
| | | | | | | | | | | Changed android backend to only send frames when the correct states. This will prevent sending frames on Prepared which made this test to fail. Fixes: QTBUG-99357 Change-Id: I53f26daf2c5340ce3ab02de5a4d4925b05c215aa Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 9e3d449925df40e849e039997dccd1d49753a611)
* macOS/iOS: Set default audio deviceDoris Verria2022-01-131-5/+16
| | | | | | | | | | | Set QCoreAudioDeviceInfo's isDefault property to true if the audio device is default. Fixes: QTBUG-99583 Change-Id: I8db2674155673ed9e91077a26d7c8bfda07ea653 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit dee6b3963974dc814f5f828909dc19792d34af09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't crash if system has no audio deviceDoris Verria2022-01-134-30/+59
| | | | | | | | Fixes: QTBUG-97838 Change-Id: I355958b99f62fc85228b3dd3afd06aa01005008c Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e95f7256fb534c3dd03b3091dd9835cd2f33d327) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Fix some QML Properties listed as methodsNicholas Bennett2022-01-122-38/+26
| | | | | | | | | | | Updated AudioDevice and CameraDevice QML comments. Fixes: QTBUG-99661 Change-Id: Ieb022ef3abbe4c76fe84d91f8751cc4ae85f6bcf Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a5ef0916fdbd6bf58bba2492296ae338e8862df2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Fix example link for demonstrating QAudioSinkNicholas Bennett2022-01-121-2/+1
| | | | | | | | | | Changed link to audio output example. Fixes: QTBUG-99659 Change-Id: I9a3c045d6c08bf22c15f46d535805ad5a57e9b0a Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit d84a0ac3bb61796749c88e2d9289574a42879e67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Remove reference to QAudioDevice::nearestFormatNicholas Bennett2022-01-121-4/+3
| | | | | | | | | | | | | | When setting a media format property the class will now automatically find the nearest supported property value if value being set is not supported by the QAudioDevice. The is no nearestFormat() to call. Updated the snippet reference to one that is more useful and removed the obsolete reference. Fixes: 99645 Change-Id: If04d78f47e9fda482eb392b95931ca1b0eee9337 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 22df11fc74d680014d2a3a876bbd765101922c52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Multimedia auto test audioVideoAvailable in AndroidSamuel Mira2022-01-071-0/+2
| | | | | | | | | | Missing properties set. Fixes: QTBUG-99360 Change-Id: I363b8f77a7a77041674cea9aa9797ba7c1f0553d Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 92f526ca472ba206883a8bbfd201469d52a1f1fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Multimedia auto test Metadata in AndroidSamuel Mira2022-01-071-1/+3
| | | | | | | | | | Missing signal emit when the source is not valid Fixes: QTBUG-99359 Change-Id: I07c494d83b55af7d4f94fcede8a86eba60f52f03 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8715577e3edd24d75b95992e398cc1d88c711233) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix SurfaceText test in AndroidSamuel Mira2022-01-071-0/+6
| | | | | | | | | | | | | Looking at logcat, it was possible to understand that the frames were parsed, but they were not updated. Looks like that in android it is necessary to call the frame map for the AndroidTextureVideoBuffer to updateReadbackFrame. Updated the example to force that. Fixes: QTBUG-99358 Change-Id: Id8a0e622158f836813b7ed266ad3580aff68171f Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 203cb0f9523739c2c3583abd69e55fa49c41588e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the camera format used by the camera exampleLars Knoll2022-01-052-13/+14
| | | | | | | | | | | | | | The camera example was simply trying to get the format with the highest possible resolution. But that often lead to formats with a very low frame rate being chosen. Change the algorithm to find the highest resolution format with at least 30FPS. Fixes: QTBUG-97817 Change-Id: I5e043188a4ed3d4acd72190b96fba4095a3f9aa2 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit c76508f8a2d121a428d90648b4c894c845c3f010) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: Get list of supported codecs from Media FoundationAndré de la Rocha2022-01-043-28/+147
| | | | | | | | | | | | | | | | | | This patch uses a table for container compatibility and queries Media Foundation for the actually supported audio and video codecs, instead of using hardcoded definitions for everything. Also, QImageWriter is queried for supported image formats, and the container selection for audio-only files has been fixed. It is now possible to encode audio as flac, alac, etc. Change-Id: Ie8fcbf6582ff1785ac0c77def8cebb0aef100adb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> (cherry picked from commit 9ea19cc787a049347f840a3e0560bd537b740dfa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-041-3/+3
| | | | | Change-Id: Ib7e0fdf87139de6119fe136de04ad5fbb42f23bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-031-3/+3
| | | | | Change-Id: I6fae9cabe123a1ea319be6c54103ba530e951926 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* audiosource example: Refactor push modeFriedemann Kleint2021-12-222-10/+16
| | | | | | | | | | | | Factor out a function to calculate the level from the data to make it clearer that push does not require reimplementing a QIODevice. Complements a71362d9ef7098c1d7869b3768a0990a61474980. Change-Id: I4899b96d1e8d0336f960e514bfd355a894522aa8 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 28932bcc4c40a6c5f96bf2beb860c916c1161056) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Resolve URL using QML context when setting QMediaPlayer sourcePiotr Srebrny2021-12-213-7/+93
| | | | | | | | | | | | | This patch overrides MediaPlayer set source behavior by extending QMediaPlayer with QQuickMediaPlayer. The URL set on the QML MediaPlayer source is resovled with QQmlContext resolver before it is passed on to QMediaPlayer. Fixes: QTBUG-96985 Change-Id: Icead41a6780bc42c64c143837cd39215db27af5e Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e34b665f948e3a40af0dc43e4f2d4b383ddc5a0b) Reviewed-by: Doris Verria <doris.verria@qt.io>
* AVFMediaAssetWriter: Properly reset queues and writer inputs before starting ↵Doris Verria2021-12-211-13/+20
| | | | | | | | | | | | | | | | | | | | | | | new writing We were resetting the video queue only if there was a video input attached to the session, causing the old video queue to still be valid otherwise. This led to crashes when the next recording would be audio- only because of a failed assert. To fix, release the audio and video queues and set them to null when we set up the writer for a new recording. Do the same for the camera and audio writer input. Also, create an audio queue only if there is an audio input attached to the session. Fixes: QTBUG-99296 Fixes: QTBUG-99176 Change-Id: If08b7f514ba3f264509ee78b494d8d1544991ad6 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 4bae921b03c00714efb3ef1eea06d4ca8f9b70d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:53:54 +0000