summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame"HEADdevAndy Shaw44 hours4-9/+5
| | | | | | | | | | | This reverts commit 2b96c113cf7057b556856149114999b973b3f2c2, due to the fact that it introduces a problem with existing cameras on Windows. So reverting for now until a fix can be found. Pick-to: 5.15 Change-Id: Ica59c8a68de7aecf6a4ebd1bd044363e9acefd93 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-11-041-0/+29
| | | | | | | | | | | | | | | | - 6d70c875615ffc9c315e203530aac0d320185701 Add changes file for Qt 5.15.1 + fd2bb11b9c9f4a0cff99ed21d9e5291ff5ec065d AVF: Introduce QCameraCaptureDestinationControl_iid + b34065e03e467d2c2b7a04e84bbec815f595220c CameraBin: unset GValues after finish using them + 9862bf04d18d8453c5bf2667768c0b8fbafe512c Gstreamer: fix camerabin's supported focus point mode + 67cac1524f56af09289eb76b5e2a38ca6d2a78c6 DirectShow: Use also pin category when negotiating + 4b26133b1cac084a61dbbf68b3fff711ca49f712 Bump version + 4ca84a8ae95d2703d2459d6335c4420ae32b37b6 Fix nullptr dereference in directshow plugin + 732b1abff8eaa6ac5ff0414aea25ad7617dab2e8 Add changes file for Qt 5.12.10 Change-Id: I4f45ad937938681a7a233e975ce9290ddaa84105 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit fd30913d4601d12437404e1d20113a1ed6364ccc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependenciesFriedemann Kleint2020-10-2911-63/+66
| | | | | | | | Fix some warnings about deprecated API and usage pf QMutexLocker. Change-Id: I16a1e66a57d0c638f88478ec250e92178c6a433c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix nullptr dereference in directshow pluginLuca Carlon2020-10-201-1/+2
| | | | | | | | Init pointer before trying to dereference it in directshow plugin. This fixes a crash trying to play a video when QT_DIRECTSHOW_NO_EVR is set. Change-Id: Ie42eff035bd7fe173ca629c68b1228dc760c717d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Android: rename Android's package name for Qt 6Assam Boudjelthia2020-10-0516-27/+27
| | | | | | | | | | Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: I261a3422ec81b0504174a132559d9bbf820815f9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* DirectShow: Use also pin category when negotiatingVal Doroshchuk2020-09-244-42/+57
| | | | | | | | | The pin should be negotiated once and use PIN_CATEGORY_CAPTURE. The same logic is implemented in chromium. Pick-to: 5.15 Change-Id: I89ac13c1a7e982c1011b2a872e853ee5bc2036b2 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Gstreamer: fix camerabin's supported focus point modeRatchanan Srirattanamet2020-09-231-2/+0
| | | | | | | | | | | | | Commit be7fef656a1d087d3d1d3fa102da4fce85855935 (Add support for face detection focus point mode to camerabin backend.) updated camerabin's isFocusPointModeSupported() to indicates face detection mode support. However, it forgets to remove the old code that says only auto and custom is supported, making the face detection never reported as supported. Pick-to: 5.15 Change-Id: I76627e0b72fb94cd1370bc990edd6c748086a5d9 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Fix tst_QDeclarativeAudio::videoOutput to check QJSValue values insteadVal Doroshchuk2020-09-231-1/+3
| | | | | Change-Id: I159af0c7e2574455bc7c7b1343251566b7f2e5f2 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Update dependency refVaL Doroshchuk2020-09-231-2/+2
| | | | | Change-Id: Ia552a1b14e552eb7f3cdc5963186ef2a2261c52f Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Replace std::min by qMinVaL Doroshchuk2020-09-231-1/+1
| | | | | Change-Id: I5f434151d7b0755635e506767358db6164e325ee Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Include QIODeviceVaL Doroshchuk2020-09-231-0/+1
| | | | | | | incomplete type 'TestNamespace::QIODevice' named in nested name specifier Change-Id: Ied2228202fd12d2b296747714f35355c7f311cc5 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Add dummy impl QtMultimediaUtils::setActivityVaL Doroshchuk2020-09-231-0/+5
| | | | | Change-Id: I59830dad9d79046c99b1d59d8c26c4b3a59791e9 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Remove QStringList forward declVaL Doroshchuk2020-09-235-5/+0
| | | | | Change-Id: I5ad8d2519c1b83b7cb19d291dba21853ffb0d73b Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Gstreamer: handle delayed camera unload() in addition to stop()Ratchanan Srirattanamet2020-09-151-6/+22
| | | | | | | | | | | | | | | | | | Commit b1a0bc9d454793d705a4aba84b301d3f8dfb50ea (Prevent immediate-stop of currently-unloading gst recording pipeline) make sure that CameraBin Control will delay QCamera::unload() if the camera is busy. However, it didn't update the handleBusyChanged() to also do the unload when busy status changed. This commit make handleBusyChanged() to handle both delayed stop() and delayed unload(). This make sure that if unload() is called when the camera is busy, it will eventually be unloaded. Also update the log message to properly print the delayed action. Task-number: QTBUG-65398 Change-Id: I2a752265fb082fbc3feb895f1cf904202df155c9 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* CameraBin: unset GValues after finish using themRatchanan Srirattanamet2020-09-111-0/+3
| | | | | | | | | | GValue can contain allocated memory. Not unsetting it can cause memory leak. This patch adds g_value_unset() calls to various places that miss ones. Pick-to: 5.15 5.12 Change-Id: I78e0f8f6c558ada0e7828c11094132359c579c2a Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* AVF: Set playback audio session category while playingVal Doroshchuk2020-09-101-1/+7
| | | | | | | | | | | | | Since when the application is active and then moved into the background then audio can be played fine. But if the application is already in the background then it will not play the audio. Decided to set AVAudioSessionCategoryPlayback with AVAudioSessionCategoryOptionMixWithOthers to audio session, which leads to restart playing from the background. Fixes: QTBUG-69949 Change-Id: I18fb4904b0810b7dfb63585278edbb8ee2f02d05 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* AVF: Introduce QCameraCaptureDestinationControl_iidVal Doroshchuk2020-09-107-11/+169
| | | | | | | | | | | | | | | | | | | | Can be used like: QCameraImageCapture->setCaptureDestination( QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile); Both CaptureToBuffer and CaptureToFile are supported. If CaptureToBuffer is requested, then it sends imageAvailble signal If CaptureToFile is requested, it sends imageSaved imageCaptured is sent only if there is the video frame available. (e.g. when abstract video surface is used as viewfinder) Pick-to: 5.15 Fixes: QTBUG-85470 Change-Id: If22281e4d0eacfb0d38f8b1c8b676191817f592e Reviewed-by: Ihor Dutchak <ihor.youw@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Quick: Introduce multiple textures for NV12/NV21 video framesVaL Doroshchuk2020-09-091-1/+23
| | | | | | | | | | | | | | | | | | | For QVideoFrame::Format_NV12 and Format_NV21 formats added a possibility to provide the video frames in QAbstractVideoBuffer::GLTextureHandle, MTLTextureHandle multiple textures. Currently QVideoFrame::handle() is used to have only one texture. Which limits the video frames only for RGBA format. NV12/NV21 requires 2 textures, one for chroma and for luma components. So QVideoFrane::handle() must return a list with 2 native handlers. The patch allows to render the video frames in NV12/NV21 formats with multiple textures, using current QSGTexture's to avoid uploading/downloading the data. Change-Id: I3e6e734948a43dc77bfd2dcacb69cf8ffefdb813 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Be (somewhat more) consistent about the value of piEdward Welbourne2020-09-083-3/+3
| | | | | | | | | Use qmath.h's value for M_PI in shaders (where we can't use M_PI itself), instead of a different hand-rolled value in each. Task-number: QTBUG-58083 Change-Id: I8d3acf0e6f46e2a8cae78c83c122e2b90db31f7c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-09-031-0/+45
| | | | | | | Change-Id: Ida0d0494f46079ac3934742539965fe78a0d2f8c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 73d9affb0c44dc21d83e9aeec5e4d83bc57d189b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adapt usage of QAtomicInt::store to storeRelaxedVal Doroshchuk2020-09-024-11/+11
| | | | | Change-Id: I6dd611adaf4fbabf17e925e0f23fbf977529dd2c Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Replace calls to removed qmlRegisterType overloadsMarcel Krems2020-08-311-3/+3
| | | | | Change-Id: I3cb5a7839dc1648efdf1f4a9a317d7c52232495a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Quick: Always create sg textures in ctor()VaL Doroshchuk2020-08-303-12/+6
| | | | | | | Since compare() can be called before updateUniformData() Change-Id: I7a1e0a08926cbf6d5629468b8bf64dcd7602b399 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Quick: Update qsb binsVaL Doroshchuk2020-08-259-0/+0
| | | | | | | Regenerated all files to be up-to-date Change-Id: Idc1ef58659500bc3f56b41dab92f5600d0e3e46c Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Add missing includesMarcel Krems2020-08-242-0/+2
| | | | | | | | qwindowsaudiodeviceinfo.cpp(132): error C2027: use of undefined type 'QIODevice' qwindowsaudiooutput.h(151): error C2504: 'QIODevice': base class undefined Change-Id: I64c3f90f19936eb6db65b8a71980d19ceacc1b1c Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Remove code for < QT_VERSION_CHECK(6, 0, 0)VaL Doroshchuk2020-08-0315-68/+0
| | | | | Change-Id: Ia64872eef299b2583a21ea40403cb0d281baf3e6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Reorder Format_ABGR32 and Format_YUV422PVaL Doroshchuk2020-08-032-4/+4
| | | | | Change-Id: I212f2544d8422955e7da22810c2e98a23b7857c0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Quick: Copy texture data when updatingVaL Doroshchuk2020-08-032-8/+7
| | | | | | | When the video frame is unmapped, the data might be invalid Change-Id: I0f5db581995ceb0a52ccd69a81a8f04690f3ebfc Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove AudioEngineVaL Doroshchuk2020-08-0342-7184/+0
| | | | | | | Task-number: QTBUG-74423 Fixes: QTBUG-84596 Change-Id: I21184ee24cbcbd5091e3466b132301e80bfad7d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* GStreamer: Update render rect only if open gl sink is usedVaL Doroshchuk2020-07-201-1/+3
| | | | | | | | | Only glimagesink requires updated render rect. Change-Id: Ib30bf364edda4cd088a1202bbd5c958b552ba999 Fixes: QTBUG-85545 Pick-to: 5.15 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Fix ambiguous in QRandomGenerator::global()->boundedVaL Doroshchuk2020-07-202-2/+2
| | | | | | | call of overloaded ‘bounded(qsizetype)’ is ambiguous Change-Id: Ie0f5a0394627345aca7c0a4a028d1048cf0405cf Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Remove the unused include of qregexp.hSona Kurazyan2020-07-091-1/+0
| | | | | | Task-number: QTBUG-85235 Change-Id: I8d3175b2bc9fe07a6f110b12b4b170ad5305397a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtmultimediaVaL Doroshchuk2020-06-307-17/+5
| | | | | Change-Id: I463d3a1541cee1fcf4a6b6d1e2e1eac85fbfc682 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* IMX: Prepare vivante plugin for RHIVaL Doroshchuk2020-06-3012-72/+141
| | | | | | Task-number: QTBUG-78678 Change-Id: I61a62b71f5731949a7e1094efc854bd3d7d1aa6a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove android video nodeVaL Doroshchuk2020-06-307-433/+0
| | | | | | | | Since it uses gl texture, which can be replaced by default sg video node. Task-number: QTBUG-74423 Change-Id: Id00748ccf18595d8ea782378c512c7fca6fe0229 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Android: Use current gl context as shareVaL Doroshchuk2020-06-301-2/+6
| | | | | | | | | | | | | If a video surface contains gl context, it is now used as a share. Otherwise nothing is rendered. The gl context is set when updatePaintNode is called for the video output quick item. Also context's offscreen window now should be on the same thread as the surface. Task-number: QTBUG-78678 Change-Id: I8f2bdd56a5ce209edc206b74ffa5c48e34e7218f Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Don't map QMemoryVideoBuffer when there is no data insideVaL Doroshchuk2020-06-302-1/+13
| | | | | | | Pick-to: 5.15 Task-number: QTBUG-85202 Change-Id: If40af4af211af86311c0e04a8bdd0627dc34a939 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-2858-122/+122
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I5466906d759a7cc046d77a21e2c647a4b938d070 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2530-81/+78
| | | | | | Task-number: QTBUG-84469 Change-Id: Id8d07836a66e4d9223341483bfe0ed251ba2806c Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Remove winrt pluginVal Doroshchuk2020-06-2535-6713/+1
| | | | | | | | WinRT has been removed already Task-number: QTBUG-74423 Change-Id: Ia1269a52f02a24ba67e08e6cc1f451ba50b55fdd Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Quick: Remove EGL video nodeVaL Doroshchuk2020-06-245-377/+0
| | | | | | | Not supported in RHI Change-Id: Iad0a360c9378ffbfe57070881fc94d807b3d1235 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove wasapi pluginVal Doroshchuk2020-06-2416-2374/+0
| | | | | | | | Requires WinRT support Task-number: QTBUG-74423 Change-Id: Ice9788df3e503c4c111bc6524c509e93dbf407c5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Quick: Fix padded video frame when bytes per line > widthVaL Doroshchuk2020-06-151-7/+7
| | | | | Change-Id: I625bb06f81ce9860d49d7998cc49c304f2d6b848 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Doc: minor fixes re the camera documentationAndy Shaw2020-06-153-1/+3
| | | | | | Pick-to: 5.15 Change-Id: I8fbff45f5ebae681ab37cfd0ab0acb79eec88864 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Qt6: Port QtMultimedia from QStringRef to QStringViewKarsten Heimrich2020-06-119-14/+15
| | | | | | Task-number: QTBUG-84319 Change-Id: Ic342142dd17591159ee84139157e5ed613b03682 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove Radio supportVaL Doroshchuk2020-06-1058-6264/+10
| | | | | | Fixes: QTBUG-84592 Change-Id: I3b9e51689fd542c35cb57cf6c51a141aec3034df Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Quick: Allow to build with -no-openglVaL Doroshchuk2020-06-105-10/+38
| | | | | Change-Id: I927998b9ffa80a324636855c5dcc92cb57e9d520 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Introduce QAbstractVideoBuffer::MTLTextureHandleVal Doroshchuk2020-06-1013-66/+155
| | | | | | | | | | | | | | | | Added MTLTextureHandle to render metal textures. Is used by default if rhi is enabled for metal backend. Also fixed the frame renderer to create new opengl context and use provided one from the video surface as a share context. To remember, when the quick item is created and updatePaintNode is called, current gl context is set to the video surface as a property. When the frame renderer is ready, it extracts the gl context and uses it as a share one. Task-number: QTBUG-78678 Change-Id: I51ce666ca7c2adc10dd2c1d1dfed99cc9f596e2b Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* CoreAudio: Don't apply audio category if it is not neededVal Doroshchuk2020-06-094-18/+12
| | | | | | | | | | | | | | | | | | If just devices are requested, no need to apply any categories with activation of audio device. Postpone setting category and activating audio until actual playing is requested. Categories/options for input devices: AVAudioSessionCategoryPlayAndRecord with AVAudioSessionCategoryOptionMixWithOthers For output: AVAudioSessionCategoryAmbient with no options. Pick-to: 5.15 Fixes: QTBUG-83776 Change-Id: I9364bdea2882bc23039817207eca62b311841ba6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* GStreamer: Start playback when bufferedVaL Doroshchuk2020-06-091-1/+1
| | | | | | | | | | Regression since d8d072417b08dd75734b3f0aa86c3a49db934770 Pick-to: 5.15 Fixes: QTBUG-84556 Change-Id: I557ac7eb38ebdbb6c52e5348902ee8c3f1a91f07 Reviewed-by: <roman.valov@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io>