summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Use QOpenGLContext::makeCurrent if QGLContext::makeCurrent failedVaL Doroshchuk2019-05-141-8/+17
| | | | | | | | | | | | | | | | | | If QPainterVideoSurface::setGLContext(QGLContext::currentContext()) is used and no valid paint device has been provided to QGLContext, it fails to make the context current. Thus there might be no available current context which might also produce crashes. QGLContext::currentContext() creates QGLContext based on current QOpenGLContext instance, and no paint device is available in QGLContext::device() in this case. Currently QVideoWidget and QGraphicsVideoItem are effected. It is relevant when a renderer calls currentContext->doneCurrent() before using the QPainterVideoSurface. After this there is no any current context which could cause a crash, e.g. within compiling the shaders. Task-number: QTBUG-74277 Change-Id: Ia28f4f6843a82a897399fd1ce2463e3b087b6437 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Gstreamer: Fix deadlock when state is requested in ASYNC modeVaL Doroshchuk2019-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | When new media is set to the player, updating of "show-preroll-frame" property from the video sink is also requested: g_object_set(G_OBJECT(m_videoSink), "show-preroll-frame", value, NULL); This produces emitting of a signal: g_signal_connect(G_OBJECT(sink), "notify::show-preroll-frame", G_CALLBACK(handleShowPrerollChange), sink); Inside handleShowPrerollChange() the state of the video sink is requested with infinite timeout: gst_element_get_state(GST_ELEMENT(sink), &state, NULL, GST_CLOCK_TIME_NONE); In case if the video sink performed an ASYNC state change, means changing of the state is pending and need to wait, this function will block up for infinite timeout. But probably changing of the state is requested (and should be performed) on the same thread where it is waiting for this change, it produces a deadlock. Changing timeout to 10ms to avoid this block. Fixes: QTBUG-72468 Change-Id: I06235ccfb8f76423f65ed192d5e8de6e60723e72 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* EVR: Remove setting of start/end times in QVideoFrameVal Doroshchuk2019-05-141-10/+0
| | | | | | | | | | | | | | | | | | | | | Due to unknown bug in IMFTransform->ProcessOutput() when after seeking sample times are not set correctly to provided IMFSample. This causes current playback position to be not respected in video samples. Even if you seeked to higher/lower position, sample time is always counted from beginning. Which makes no sense to use this feature because video frame's sample times are not related to current position. To test it, need just seek to arbitrary position and check how startTime is not correlated to new position. Fixes tst_QMediaPlayerBackend::seekPauseSeek Task-number: QTBUG-65574 Change-Id: I897d75c055347cdcca38a84dc18f91800d070c09 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* DirectShow: Don't update status on pending tasks when graph is loadedVal Doroshchuk2019-05-141-1/+1
| | | | | | | | | | | | | | | The tests expect to see updated playback position together with QMediaPlayer::BufferedMedia. But currently QMediaPlayer::BufferedMedia is emitted before updating the position. Removed updating the status if the graph is already loaded but a task is still pending. Fixes tst_QMediaPlayerBackend::seekInStoppedState Task-number: QTBUG-65574 Change-Id: I66d214312dbf31973a13b5154a52599aa517f38c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* DirectShow: Don't set the same mediaVal Doroshchuk2019-05-141-0/+3
| | | | | | | | | | | | Fixes tst_QMediaPlayerBackend::playlistObject() Actual (currentMediaSpy.count()): 2 Expected (1) : 1 .\tst_qmediaplayerbackend.cpp(1224) : failure location Task-number: QTBUG-65574 Change-Id: Ia7cbcb4a22ee43df9e1efff065910b084bdbf00e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Android: Allow starting camera without viewfinder availableVal Doroshchuk2019-05-131-11/+32
| | | | | | | | | | | | | | Currently it is not able to start camera without viewfinder. For this purpose there is QAndroidCameraDataVideoOutput with SurfaceView in order to be able to start the camera preview. Implemented dummy QAbstractVideoSurface to render to it when no video output is provided before starting the preview. Task-number: QTBUG-73582 Fixes: QTBUG-73237 Change-Id: Ic76d247b5d5352e8539ba61271484e56d3a40fbd Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Android: Don't open camera if it was already openedVal Doroshchuk2019-05-131-1/+11
| | | | | | | | | | | | | The application should only have one Camera object active at a time for a particular hardware camera. Since there is no way to determine that the camera has been already opened by the same application, added a fix to prevent opening the camera if it was already opened and not released. Task-number: QTBUG-73582 Change-Id: Ide9ddea0c32489d86a613846ecf2e91ef94a776c Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* QGraphicsVideoItem: Always use generic painter when no gl paint engineVaL Doroshchuk2019-05-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If eglfs is used, then there is valid current gl context and it has OpenGL shader programs (QGLShaderProgram::hasOpenGLShaderPrograms). This gl context makes QPainterVideoSurface to use QVideoSurfaceGlslPainter instead of QVideoSurfaceGenericPainter. QOpenGLCompositorBackingStore uses QImage as a QPaintDevice. In this case QPainter::beginNativePainting does nothing because of QRasterPaintEngine. Since QVideoSurfaceGlslPainter is supposed to work with a gl paint engine and not with a raster one, this prevents rendering any video content. To work this around, view->setViewport(new QOpenGLWidget) could be used, where QOpenGL2PaintEngineEx will be taken into account. If platform was not eglfs, QGLContext::currentContext() could be unavailable which made QPainterVideoSurface to use QVideoSurfaceGenericPainter and the video was rendered correctly. QVideoSurfaceGenericPainter should be used when the paint engine is not gl based. Task-number: QTBUG-57836 Change-Id: Id4839facddb2494ec5abf729ea80068eb5e2af1d Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* Gstreamer: Don't reset pipeline to GST_STATE_NULL when EndOfStreamVaL Doroshchuk2019-05-101-1/+1
| | | | | | | | | | | | | | In case of EOS the state of the pipeline currently is changed to GST_STATE_NULL, which releases some resources and it might take some time to restart the playback. If the media should be played few times, there could be a gap between EOS and new play which can be heard. Suggesting to set the state to GST_STATE_PAUSED instead. If there is a need to release resources, empty QMediaContent should be set to the media player. Change-Id: Ifa5c886abfbea037fd395b7336a5590001d4a7f7 Fixes: QTBUG-75314 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* AVFoundation: Use $PRODUCT_NAME in Info.plist only for macx-xcode specVaL Doroshchuk2019-05-091-2/+4
| | | | | | | | | | Since Info.plist is handled only in ProjectBuilderMakefileGenerator which is used only if MAKEFILE_GENERATOR == XCODE. Using -spec macx-clang uses UnixMakefileGenerator. Change-Id: Ie6a8e6a0b133da1e0e7d556b32693c56d8cbf294 Fixes: QTBUG-75285 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Don't postpone setting of camera's stateVal Doroshchuk2019-05-032-19/+23
| | | | | | | | | | | | | | | | | | | | | Currently if the application is inactive, the state is postponed to be set and processed when the app becomes active. This also postpones stateChanged() signal and saving the state value, while it should be set (but not processed) immediately as done in another backends. Added a fix to store the state and emit stateChanged regardless of activity of the application. When the application becames available, the state will be processed. In case of an error while opening the camera: - UnloadedState is emitted - CameraError - UnloadedStatus Change-Id: Ie376d29366168a6b15eccea884f385070f94fe35 Task-number: QTBUG-73582 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+40
|\ | | | | | | Change-Id: Iba6e8b9c44b6fc83ec69ad7a922135a35564de8d
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-031-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + fea4d302cddbb91e23864a4dbd786d53b72f67ea Gstreamer: Set surface from renderer before creating pipeline + 09490d1ac6294173004f8f5b948dea9a1e412d3d Doc: Fix documented QtMultimedia import + 935967a453b47ae7c8e9ad3d94eef3813eab58db Fix compile failure with gstreamer 0.10 + d665520e8bd23121160d82cada34ff625e0d0cfe Bump version + 226f802fb04de6b135a0214674ce77643ba479c4 Add source url to 'decoding error' warning + c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a Fix QCameraInfo to be invalid if camera failed to find device + 80411380fbf614d833cd42dee80d01510326ccd3 winrt: Use highest supported resolution for camera preview/image capture + f41819387531a5ddfbad2e80ceec7b57a5ebb7c6 Android: Use CaptureStillImage as default capture mode Change-Id: I2cf7a9c86b08e72ffbea9901371a40610b65eadd Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Windows: Reset position on pause in QMediaPlayer after EOSVal Doroshchuk2019-04-101-2/+3
| | | | | | | | | | | | | | | | | | | | pause() should reset position to the beginning after EOS. Fixes tst_QMediaPlayerBackend::processEOS Task-number: QTBUG-65574 Change-Id: I4802102bde657d7a3dde0b426c335b021207ae08 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | EVR: Don't repaint with black until the surface is activeVal Doroshchuk2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | A frame must be presented until pause/play is called. Fixes tst_QMediaPlayerBackend::seekPauseSeek Task-number: QTBUG-65574 Change-Id: I6946c5a5977c44fed80abce364a4222845898016 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | QWindowsAudioInput: Set volume only if it has been requestedVal Doroshchuk2019-04-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | Currently if the device gets opened, also its volume is set to 100%. The volume should be set only if it has been requested. Change-Id: I9dc4ab29ad71f3ac6556c6dd32c7b8e5d69efab2 Fixes: QTBUG-75024 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Android/AudioTrack: Fix crash when it is unable to get min buffer sizeVal Doroshchuk2019-04-032-6/+13
| | | | | | | | | | | | | | | | | | android/media/AudioTrack::getMinBufferSize might return an error instead of a size. Task-number: QTBUG-73583 Change-Id: I52e2d214ab7065bcea9d983979bb0b83717428af Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Android: Fix tst_QCameraBackend to find FinalizingStatusVal Doroshchuk2019-04-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tst_QCameraBackend::testVideoRecording. Since QMediaRecorder::FinalizingStatus could be sent immediately, it is sane to wait for final QMediaRecorder::LoadedStatus only. But added a fix to check if the FinalizingStatus has been emitted. Task-number: QTBUG-73582 Change-Id: I63fc6b1951a712215ee5d982233924a79ac1c124 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Android: Fix status of QMediaRecorder after start/stopVal Doroshchuk2019-04-032-45/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the camera is ready for capture -> QMediaRecorder::LoadedStatus. If CaptureVideo is changed to CaptureStillImage -> StoppedState and UnloadedStatus. If camera's status is StoppingStatus -> StoppedState and UnloadedStatus. If camera's status is LoadingStatus -> LoadingStatus. If recording is requested -> RecordingState and RecordingStatus. If recording is audio-only -> immediately LoadedStatus, before start and after stop. Fixes tst_QCameraBackend::testVideoRecording Task-number: QTBUG-73582 Change-Id: I976c4e3afab529e0949571c4002e9ceba74cac97 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Android: Move inline qml to separate file in testsVal Doroshchuk2019-04-038-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | Since androiddeployqt is looking for qml modules in qml/js files only, it is unable to deploy qml plugins for inline qml from cpp. Hence modules are never found while compiling inline qml. Fixes tst_QDeclarativeVideoOutputWindow and tst_QDeclarativeVideoOutput Fixes: QTBUG-73597 Fixes: QTBUG-73598 Change-Id: I43dc1ac38522779ff37f04b055a41b2c05eb7619 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Android: Move test files to qrc in tst_QSoundEffectVal Doroshchuk2019-04-032-0/+11
| | | | | | | | | | | | | | | | | | Since TESTDATA files are not deployed to device, need to add them to qrc. Task-number: QTBUG-73583 Change-Id: Ie0b934b1d9bd46f8748ca93a3502ef1643271217 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Android: Fix tst_QCameraBackend to wait for imageCapturedVal Doroshchuk2019-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | QCameraImageCapture::imageCaptured is also async and could be delivered after QCameraImageCapture::imageSaved. Fixes tst_QCameraBackend::testCameraCapture and tst_QCameraBackend::testCaptureToBuffer Change-Id: I47ee22c39cd2570f20a3e75a80249ed16ca52d0e Fixes: QTBUG-73582 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | DirectShow: don't change camera zoom level if not requestedIhor Dutchak2019-04-011-1/+1
|/ | | | | | | | | | | | | | DirectShowCameraZoomControl sets camera zoom level to 1x each time, when camera goes into LoadedStatus (e.g. on stream stop), which is inconveniant, specially if camera has physical remote, and zoom level may be changed externally. Disable this behavior, if zoom level was not requested explicitly by zoomTo(...) function from client code. Fixes: QTBUG-74180 Change-Id: I99ff76af04f80c630a0c397db5713e6706ebf175 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Ihor Dutchak <ihor.youw@gmail.com>
* Android: Use CaptureStillImage as default capture modeVal Doroshchuk2019-03-281-1/+1
| | | | | | | | Fixes tst_QCameraBackend::testCaptureMode. Change-Id: I2f6486102ebcbf7e1ab0feea8c13658772d5b90f Fixes: QTBUG-73582 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: Use highest supported resolution for camera preview/image captureOliver Wolff2019-03-282-7/+18
| | | | | | | | | | | Using the lowest supported resolution yields ugly results and has weird side effects (green bars). If no resolution is explicitly given, we should use the maximum supported solution for preview as well as capture. Task-number: QTBUG-72874 Change-Id: Ie0fae65180e66156c6de468f2cabb9122fe665ba Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Fix QCameraInfo to be invalid if camera failed to find deviceVaL Doroshchuk2019-03-251-2/+10
| | | | | | | | | | Since QCameraInfo uses deviceControl and infoControl to get info about camera, it needs to clear these controls if the camera failed to find a device by name. Change-Id: I1404f70234f978fa4568b6c883a5676f61e08145 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 42932e1a9dfd6699763b336f552e46f9b1ff30c9)
* Add source url to 'decoding error' warningRoland Rossgotterer2019-03-252-2/+2
| | | | | | | | | | | Previously, QSoundEffect logged a warning if the source could not be decoded, but without mentioning the source it tried to decode. When using multiple QSoundEffects in one application, adding the source to the warning will help to find the one causing the decode error. Change-Id: I4c6bbdfe4a62f650b64ab951bcc637febedae98e Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I36778f9d06291356d949b25acb3cee767ba90aee
* Fix compile failure with gstreamer 0.10Richard Oehlinger2019-03-181-0/+5
| | | | | | | | This fixes an compile failure introduced in commit 67c4ec55. Fixes: QTBUG-74475 Change-Id: I0dabb72f8b5cdd75336b15515381ff9d9442788f Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+45
|\ | | | | | | Change-Id: Ic3485054ca68580cd2bf08e37262ad92073f00c8
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-221-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a29d83ff4bbab71fc2f8af77594a9aff997c2b2a Gstreamer: Negotiate default settings before encoding container profile + 4617faa7fae3deda5690dade4b64785ac215e16c Migrate QGstUtils to use QRegularExpression + 0caa716a92f8f971813fced4bd9f7d62a53cbcdb Bump version + 37345cd5dc75d061495888a4bb44d1329b02da8f WavFile example: fix indentation + 4e8e47989d96f8d60feec2187e4d9c85adb19c2a WavFile example: drop needless includes + 67c4ec55b12c9c397838e3cf3392b66cbd4c142a Gstreamer: Set custom pipeline using url + 3c2e902e319ff9329f26103250f43eb540be4302 Fix comment for YUV fragment shaders + 26ffdc559c78fa5f9b9f5a05f7d6d9b778e711c8 Android: Fix memory leak of GL resources + 5c8ed3a67384bc22eb1a876ed2fb29063657a675 DirectShow: Fix crash when camera is being destroyed + 86172a759d40b0dc6dc664ba79581bf315526788 gpu_vivante depends on opengles2 and gui + d6c69017130405d945df7f9bd8b529932b158806 Fix crash in player example when close the window while playing + a8ebc9c9fd746bd6c269fa61145d53faafecdbd5 Do not ignore tst_*.qml + a7f01cea43a16a9b2b06ab3a8ff3b62b8edce5cd Fix static build on Windows + 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe Gstreamer: Fix compilation error with 0.10 version Change-Id: I0348a27c2757eab0336fbf024523d5502960dd58 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Doc: Fix documented QtMultimedia importKai Koehne2019-02-262-4/+4
| | | | | | | | | | | | | | | | Since change 871a097d0c6e8203f82 QtMultimedia is registered with the latest Qt minor version, but the documentation wasn't updated yet. Change-Id: I58eb629c5a2851f83231891b2e219210d79c862c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Gstreamer: Set surface from renderer before creating pipelineVaL Doroshchuk2019-02-222-2/+7
|/ | | | | | | | | | | | | | When multiple pipelines are created, and one of these gets recreated, it picks up the last set surface. This is incorrect, as it needs a surface belonging to the current renderer. This patch sets the surface before creating pipelines, retrieving it from the current renderer. Task-number: QTBUG-73557 Change-Id: I0811f7262a0eca57e01361a55515351127520064 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Gstreamer: Fix compilation error with 0.10 versionVal Doroshchuk2019-02-141-5/+3
| | | | | | Task-number: QTBUG-73740 Change-Id: I1de087b63f65bab39351d5446254a8d1832e88c3 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix static build on WindowsKai Koehne2019-02-111-0/+4
| | | | | | Fixes: QTBUG-73464 Change-Id: I5d1052dec14bbe6ee69b348352991d14d63b9c76 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* Do not ignore tst_*.qmlVaL Doroshchuk2019-02-081-0/+1
| | | | | Change-Id: I55c045909dd0eeac86160ca989ce893ed2816483 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix crash in player example when close the window while playingVaL Doroshchuk2019-02-081-0/+3
| | | | | | | | | | | | | When it is playing and close the window: 1. The player object will be destroyed first (all QString's). 2. Next parent QWidget will be destroyed with all children. 3. While destroying QMediaPlayer from Player object, the playback will be stopped. 4. The status will be changed and Player::statusChanged will be called. The connection still exists. And since all string members are already freed, it produces a crash. Change-Id: I2c2fdca97f0ff4b300527b550ecc0c12b04e5b4e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* gpu_vivante depends on opengles2 and guiLiang Qi2019-02-061-1/+1
| | | | | Change-Id: I8317956994f586fa2272d5633af91325d277998b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* DirectShow: Fix crash when camera is being destroyedVal Doroshchuk2019-02-061-4/+1
| | | | | | | | | | | | If a camera is going to be destroyed, a service plugin releases media service, (which releases ds camera session) and might call CoUninitialize. This leads to a crash when DirectShowSampleGrabber is destroyed after releasing the camera. Added a fix to release the sample grabber together with camera session. Task-number: QTBUG-73461 Change-Id: I8e518d0242d983c8d2bb00c30ad87c7e8e1e2c93 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-013-0/+35228
|\ | | | | | | Change-Id: I1d3188a758fc89c2fedfc9a2274bf808bbe2b56e
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-151-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 27ab485e6a28dc081152ed8a8867ae51220479ba Gstreamer: Fix camera example to apply video settings + 630738f9ef1ba7467c3c280a1cb64471c37d62d1 Gstreamer: Fix compiling issue with < 1.1.3 ver + be919fd68a844a2e7e0d15c70fc5ccacce8d4edc Alsa: Do not open device twice in QSoundEffect + cce3e8a019a3272ff422b1cdb1ce11bb7b00feea Gstreamer: Do not create video profile if no codec provided + 05a58a81db51564f93397dcf8f7cd37c8d4d1a9d DirectShow: Fix compiler warnings + d9bf568551c9e101374ba842e831650d34d0d41e Bump version + 6dd0e0141bbb8ca8571f7d142c7b0314e8c63f57 CoreAudio: Decrease volume when playback is stopped on macOS + 2c974280aa8c40d29ec89bdc73bc6bf384c010c9 EVR: Prevent redefinition of MFVideoNormalizedRect + 6966a09c9a6a2c134a739446cc582e47d0c6ed6d Add changes file for Qt 5.11.3 + c459810caf72be43275e983b01cf97556ad55562 DirectShow: Display windows error string when camera fails + 9fb8dd4e76700da8d321a8677e44e771a0213a7e DirectShow: use supported pixel formats for QCamera video surface + 67a826716a9a58659f7272cbce3c450af384da5a Windows: Repaint QVideoWidget when WM_PAINT or WM_ERASEBKGND received + a9889e9e853b2b0e9b3736a258c908fa7559b35c DirectShow: Restart not active surface when frame is received + 06f1f32daa89265269532a02457e73912da3c2d7 DirectShow: Don't queue video buffers from sample grabber + 4e9b9c1f268b333efd4b266091976585e4660352 WMF: Map PKEY_Media_EncodingSettings to QMediaMetaData::Description + 4fb0aa479ea6b5ea7e72ba880cf01bbaa59d93fa Add binary compatibility files for 5.12 for QtMultimedia + 7064057843bd474115055acdc76a886953acf898 QGstUtils: fix build with MSVC + 885ad4bd1de3c0e8d14bae94f63d10e54b36283c GStreamer camera bin service plugin: remove bogus export macros + 982d4c9505cf427709aac18346dd9df4a13f76c5 GStreamer: remove unnecessary <unistd.h> includes + 5d7531192bbb411c24039dd5c68805d42383f547 Fix QCamera::testCameraLockCancel test + 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 Fix test to pass when wave is not available + afc952f93922db36ff7a93ce3c4e558cb78177e2 Bump version + 80898b03be54e2855472987f60f4c2526344389b Return ServiceMissingError if no camera found by name Change-Id: Ib012fed3c29d300df9101f1db7f38387e5288c23 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0813-39/+97
| |\ | | | | | | | | | Change-Id: Ic42cf93c3be21a84d711effae28a3292f2b5c600
| * | Add binary compatibility files for 5.12 for QtMultimediaMilla Pohjanheimo2018-12-182-0/+35160
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: Id9346f9e75d9fdbcf8ad30409d706829f1ba2573 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Android: Fix memory leak of GL resourcesVal Doroshchuk2019-01-312-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeferredDelete events have implicitly higher priority, which makes this event to be handled before MetaCall events. See QSGSoftwareRenderThread::sync(): ... QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); Where it processes deferred deletes and no meta calls will be delivered even if they were requested before the deferred delete. Task-number: QTBUG-67280 Change-Id: Iba23550d2cffb1cea1b4c2fe4c903078d9f2f046 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Fix comment for YUV fragment shadersSamuel Gaist2019-01-295-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | The comment contains information which makes it misleading to understand how the components are passed. Change-Id: I29cdb5eec1e8014fa7f0ca3f1a0f54258fdb431f Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | Gstreamer: Set custom pipeline using urlVaL Doroshchuk2019-01-232-31/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced possibility to set custom pipeline using url. Now the pipeline should be set only via QMediaPlayer::setMedia using url with scheme "gst-pipeline". For example, "gst-pipeline: videotestsrc ! autovideosink" Since setting the media should be done after renderer in QML, hence a surface is ready to be used and "qtvideosink" is available in pipelines. To use it with QVideoWidget, setting the pipeline should be done after passing video output. Change-Id: Id43f8681069e4bca2eafb154df2c5d446a0ca498 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | WavFile example: drop needless includesRolf Eike Beer2019-01-171-3/+0
| | | | | | | | | | | | | | | Change-Id: I26033a3d853dca8023fe4ec5f1eb7c53ef5d013f Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | WavFile example: fix indentationRolf Eike Beer2019-01-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibc117caf24daef75cf2e71f04b058ffadd30c273 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: Ia716cc04cebf19cc1c2514d1ab2f8b2080dd29da
* | | Migrate QGstUtils to use QRegularExpressionSamuel Gaist2019-01-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the QGstUtils class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Fixes: QTBUG-72589 Change-Id: I67e189c48688b512cc76c884fd2a7e51e1b188f9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 02:11:04 +0000