summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1Liang Qi2017-09-081-1/+1
|\ | | | | | | Change-Id: I4ebeec7ac72152c134dc87c8d69d0f4c2f0d3cfc
| * ALSA: Fix regression in qalsaaudioinput.cppAlexandre Jousset2017-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | In QAlsaAudioInput::open(), one should check against the available audio inputs and not the audio outputs. Regression introduced in 5473621bde2be226f2f3687a80b4bfc93bbbe572. Task-number: QTBUG-62435 Change-Id: I5db0a092a98c17964c55c9358ea1010ca05e9d6f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | WMF: Add support for QMediaMetaData::OrientationSteve Schilz2017-08-311-0/+7
| | | | | | | | | | | | Change-Id: I2cdf41d3d0c60774a9b5cb48eef3ee7850b2cadf Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-176-16/+13
|\| | | | | | | Change-Id: I0e0b41d2c3539b46b6464812c3910e54cb966ee3
| * DirectShow: Copy the frame data when we get it before emittingAndy Shaw2017-08-166-16/+13
| | | | | | | | | | | | | | | | | | | | | | Since the slot connected to the frameAvailable signal may be in another thread there is a bigger risk of it being invalid by the time the slot is invoked. Therefore we copy the data and emit with the copy to ensure that we don't lose the data. Task-number: QTBUG-61817 Change-Id: I2888661d8a7f97105a85f87b08cc9ec25f8ce8c7 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Fix warnings about casting between QString and narrow characterThiago Macieira2017-07-182-41/+41
| | | | | | | | | | Change-Id: I8d96dea9955d4c749b99fffd14cde44ebf1f7290 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | PulseAudio: allow to disable the pulseaudio autospawn featureBartosz Golaszewski2017-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | By default pa_context_connect() tries to spawn a new pulseaudio instance if it the connection fails. This is not always desirable. Add a new environment variable: QT_PULSE_NOAUTOSPAWN which - when set - will make QSoundEffect pass the PA_CONTEXT_NOAUTOSPAWN flag to pa_context_connect() thus disabling the autospawn feature. Change-Id: I623639fd5a262c8fefbd683fa9481916e79bdf0e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | PulseAudio: allow to specify the pulseaudio server stringBartosz Golaszewski2017-07-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently we call pa_context_connect() with an empty server string. This works fine if we only want to connect to the default pulseaudio server, but we may want to specify the server string on systems with custom configuration. Add a new environment variable: QT_PULSE_SERVER_STRING which allows to specify the server string passed to pa_context_connect(). Change-Id: I6805ff5e941d13bc91d306e5df3ab5d04a8a90af Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devChristian Strømme2017-07-072-3/+3
|\| | | | | | | Change-Id: Ifda1f02b8458a4fbe85d8bc27e61d4646147d82c
| * Doc: Fix wrong slashRainer Keller2017-07-071-1/+1
| | | | | | | | | | Change-Id: I979c7d8d01b00689269a7969b628864ca5eab991 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * PulseAudio: fix a pthread_mutex crash in error pathBartosz Golaszewski2017-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSoundEffect (pulseaudio) uses a workaround for stability issues: although the pulseaudio mainloop mutex is recursive, it utilizes a separate lock counting. This is not the best solution, but it is a part of a larger set of changes which improved the stability in CI under heavy load. QSoundEffect always calls pa_threaded_mainloop_lock/unlock() from the same thread so the additional lock counting works in normal situation even though it doesn't use atomic types. However if pa_context_connect() fails, pa_threaded_mainloop_unlock() is called without regard to current lock count. This leads to random double-unlock aborts if pa_context_connect() fails more than once (e.g. after the reconnect scheduled from onContextFailed()). Fix this by always using the PulseDaemon wrappers around pa_threaded_mainloop_lock/unlock(). Task-number: QTBUG-61725 Change-Id: I41eb9a76892a6646fd5620ef8f686473b339464f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Use qDegreesToRadians() instead of hand-coding itEdward Welbourne2017-07-061-4/+2
| | | | | | | | | | | | | | It have the virtue of documenting its meaning directly. Change-Id: I42f1be6b4c8e69dcf8b8711b42b19759a6aebe78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-069-18/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f9bed6cb611471db61b9c69004f16786822625d
| * AVFoundation: Make AVFImageCaptureControl work without a previewTimur Pocheptsov2017-06-272-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | We only need to wait for a new viewfinder frame if we have a videorenderer control. If there's no videorender control, then there's no preview set and we can therefore just save the capture image immediately. Task-number: QTBUG-60329 Change-Id: I9ba34919f7cd82258482507c65db6367e330e231 Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * AVFImageCaptureControl - do not block the capture's callbackTimur Pocheptsov2017-06-262-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to initiate an asynchronous image capture (via AVCaptureStillImageOutput object) and immediately stop AVCaptureSession. In this case image capture's callback can potentially block forever, waiting for a semaphore: (if) no new frames arrive after 'stop' (on whatever thread AVFoundation/GDC chooses), this semaphore is never released. To avoid this we try to acquire a semaphore with a (reasonable) timeout and report an error in case of failure. To make sure we are not leaking a semaphore and not creating a danling pointer, we use a QSharedPointer now. Task-number: QTBUG-61367 Change-Id: I208cd463f843bc807b53b23ac9651aab0382775a Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * DirectShow: Change parameter of qt_evr_pixelFormatFromD3DFormat() to DWORDFriedemann Kleint2017-06-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes g++ warnings: ..\common\evr\evrhelpers.cpp: In function 'QVideoFrame::PixelFormat qt_evr_pixelFormatFromD3DFormat(D3DFORMAT)': ..\common\evr\evrhelpers.cpp:143:5: warning: case value '842094158' not in enumerated type 'D3DFORMAT {aka _D3DFORMAT}' [-Wswitch] case D3DFMT_NV12: ..\common\evr\evrhelpers.cpp:145:5: warning: case value '842094169' not in enumerated type 'D3DFORMAT {aka _D3DFORMAT}' [-Wswitch] case D3DFMT_YV12: Change-Id: I11869144b34d848bd68434d3a062852608518978 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * DirectShowPlayerService::doSetVideoProbe(): Break out of loopFriedemann Kleint2017-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix g++ 7.1 warning: player\directshowplayerservice.cpp:724:9: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (SUCCEEDED(DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true))) player\directshowplayerservice.cpp:726:13: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' break; Amends 8e4d966f4e5546787257de046d2c3af8a19214b4. Change-Id: I491e14e0116140d2ebb870441c2f048a2d7ddc31 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * DirectShow: Silence g++ warnings about missing initializers for AM_MEDIA_TYPEFriedemann Kleint2017-06-201-0/+10
| | | | | | | | | | Change-Id: I9f764077d257dadfe1641e9bd446b6939c381173 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Fix goto bypassing variable initializationThiago Macieira2017-06-191-3/+1
| | | | | | | | | | | | | | | | Though it's a pointer. Task-number: QTBUG-60464 Change-Id: Ia3e896da908f42939148fffd14c660fd8da43aa2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Prevent m_runningCount from eventually overflowingAlbert Astals Cid2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When m_loopCount is Infinite (i.e. -1) m_runningCount would go from -2 and down, eventuall wrapping and reaching 0 and thus stopping. This is a theorical problem since even if we had a 1 second video it would take lots of years to trigger but i guess it's better than having the value of m_runningCount be unbounded Change-Id: I340ec2157ece3334e58ab4afd77c34b478a256e9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * OpenSL ES: Fix crash caused by overcommitting device with dataMika Salmela2017-06-121-2/+5
| | | | | | | | | | | | | | | | | | Sometimes m_format.bytesForDuration(delta) is larger than the QByteArray containing the data. Therefore select the minimum of these. Task-number: QTBUG-61085 Change-Id: I20a8ffb77095aecd2711f53d4c9fc7da7f9ae8e2 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-304-6/+10
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | turn QGstTools into a proper private moduleJochen Seemann2017-06-1220-77/+162
| | | | | | | | | | | | | | | | | | | | This patch moves the QGstTools lib to a private Qt module and marks the needed classes and functions with Q_DECL*, to improve cross-platform abilities. It's the first step to use the GStreamer backend on macOS and Windows platform. Change-Id: Idc23c72bcccb52dd501e169e9dfdc227856787fa Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0763-321/+927
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
| * Emit the StoppedState change after the file has finished writingAndy Shaw2017-05-233-6/+16
| | | | | | | | | | | | | | | | | | | | | | Where possible, we should be emitting the stateChanged() signal to StoppedState when we know the file is no longer being written to. The finializing status can be used to indicate it is finishing and when it is actually finished then StoppedState should be used. Task-number: QTBUG-50588 Change-Id: Ie3ac1c5cd00a6a36978e72b5485622e3302054ce Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Fix build for -no-feature-temporaryfileStephan Binner2017-05-081-0/+4
| | | | | | | | | | | | | | | | | | If a backend does not support streaming then playing from qrc is impossible for -no-feature-temporaryfile case. Change-Id: Ibb0518c4afe0598c6f3a1c03b75cc00e76b8eead Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * de-duplicate gstreamer_encodingprofiles configure testsOswald Buddenhagen2017-05-081-9/+3
| | | | | | | | | | | | | | take advantage of the system now supporting 'use' by exported name. Change-Id: I7879d4c2e31b279bbbe17916e805ee60c108351d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * DirectShow: Expose the camera control interfacev5.9.0-beta4Christian Stromme2017-05-032-0/+22
| | | | | | | | | | | | | | The interface is needed to implement Qt's camera control classes. Change-Id: I468527dd1f5e9e7a0f8868f0b7addc3c069adf54 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * DirectShow: Merge the helpers and common folderChristian Strømme2017-05-0322-25/+19
| | | | | | | | | | Change-Id: Ie1c39c26ae6dec288daafb24b5aa0b6cc2bdd218 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * DirectShow: Enable audio and video probes in DirectShowChristian Strømme2017-05-033-17/+381
| | | | | | | | | | | | | | | | | | | | | | | | This change enables the video and audio probe functionality, so it can be used with the media player. [ChangeLog][DirectShow] Added support for audio and video probes in the mediaplayer. Task-number: QTBUG-56415 Change-Id: If6f36a693b1d22372eab130df07d435c9df5a796 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Fix licensingJani Heikkinen2017-05-037-98/+140
| | | | | | | | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: If939b9a09e0cd5ccda7f12172363cbc8f78297e8 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Android: Fix crash caused by stale video-frame objectsChristian Strømme2017-04-272-18/+36
| | | | | | | | | | | | | | | | | | | | Make sure that the frame being processed is still valid, that is, the size is valid and correct, and that the frame buffer is accessible. Task-number: QTBUG-60115 Change-Id: Ic64b6f7d45d92b7923d97d6ecdc630da31abee17 Reviewed-by: Michael Dippold <mike@dippold.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * AVF: Fix mediaplayer state and status issuesChristian Strømme2017-04-263-52/+90
| | | | | | | | | | | | | | | | | | This fixes the issues that were causing the whole qmediaplayerbackend test to be blacklisted on macOS. Task-number: QTBUG-46368 Change-Id: I59a35dd50a9c07e4e4382c5facb391f5c8a27ee7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * DirectShow: Fix namespaced build with MinGWFriedemann Kleint2017-04-2639-37/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QT_USE_NAMESPACE from headers and enclose headers/sources in QT_BEGIN/END_NAMESPACE. Fixes MinGW build error: qtbase/src/corelib/global/qtypeinfo.h:246:7: error: specialization of 'template<class T> class tn::QTypeInfo' in different namespace [-fpermissive] class QTypeInfo<TYPE > \ ^ qtbase/src/corelib/global/qtypeinfo.h:265:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO_BODY' Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) ^ helpers\directshowmediatype.h:92:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO' Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE); ^ qtbase/src/corelib/global/qtypeinfo.h:57:7: error: from definition of 'template<class T> class tn::QTypeInfo' [-fpermissive] class QTypeInfo ^ Task-number: QTBUG-60118 Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * DirectShow: Fix uninitialized memory read in DirectShowMediaTypeEnum::Next()Friedemann Kleint2017-04-253-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Newly allocated memory was passed to DirectShowMediaType::copy(), which calls DirectShowMediaType::clear() on the target, which crashes when trying to release a COM pointer. Split out a DirectShowMediaType::copyToUninitialized() helper function which does not call clear() for this purpose. Task-number: QTBUG-59515 Change-Id: I2801f4ba2c8da618ff8a1c57c4cea215fff292b4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Android: Run-time permission checks for cameraChristian Strømme2017-04-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera should ask for permission before being used. Normally this should be handle by the user, which can provide proper reasons for why the camera is used. To verify that we are allowed to open the camera, and as a good default, we'll check the permission and request access if needed. [ChangeLog][Android] Added run-time permission checks for accessing the camera. Task-number: QTBUG-55992 Change-Id: Ifb4e176728aab3076fdba292e17e17d33b1260a2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove m_stopEventsToIgnoreJames McDonnell2017-05-302-14/+2
| | | | | | | | | | | | | | | | | | 6.6.0 and 7.0.0 mm-renderer don't appear to produce spurious stopped state updates. From the MMR_STOPPED in one of the comments, it looks like this was a problem with the BlackBerry mm-renderer. Change-Id: Ia336195b48df342c376b7fb3c8eb2a65ef748032 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Remove handleMmStatusUpdateJames McDonnell2017-05-302-16/+0
| | | | | | | | | | | | | | It was only used by the BlackBerry code which is gone. Change-Id: I9311824b643c3c97205e1f13656ea3a2eeebfe7a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Fix a format stringJames McDonnell2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | Used wrong class name. Probably a Copy-FailToChange. Get rid of a warning about the conversion specification that didn't match argument type. Change-Id: I4f24b737dd5f72cc1dc61c58de6ad21d9a07c8ed Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Fix build with QT_STRICT_ITERATORSSergio Martins2017-05-201-1/+1
| | | | | | | | | | Change-Id: I1d646cf7d8f68a7ec5c713735c233c71bc3f338b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename the QtMultimediaQuick libraryYoann Lopes2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | Dropped the _p suffix from QtMultimediaQuick_p to be more consistent with other modules. Change-Id: Ibb0bbb2d24bc013df6c5623cba179508c5f1becf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2120-16/+312
|\| | | | | | | Change-Id: I06cd631ca9d3b6b2ed5709a7697a26b9eb7171d1
| * Android: Fix camera preview orientationChristian Strømme2017-04-203-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Before API level 24 the display orientation (the preview) was always set to 0. On newer versions of Android the clockwise rotation is set to be either 0 or 180, depending on the hardware. Since we don't want Android to apply transformation on our surface, we'll just enforce that the display orientation is always set to 0. Task-number: QTBUG-56536 Change-Id: Ie1aacda97540d5c97e6cbd8edb2afc53e7041e1e Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-1812-5/+278
| |\ | | | | | | | | | Change-Id: I7cd203eec77f3b5689c14b81b0862c5b70bab1a6
| | * OpenSL ES: Added run-time permission checks for recording on Android5.8Christian Strømme2017-03-301-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we have permission to record before starting a recording session. [ChangeLog][OpenSL ES][Android] Added run-time permission checks for recording on Android. Task-number: QTBUG-55992 Change-Id: Iab7416384336975fdf4de8024f02ab2414033163 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add run-time permission check for recordingChristian Strømme2017-03-303-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check and request permission to record audio if needed. [ChangeLog][Android] Added run-time permission checks for media-recording. Task-number: QTBUG-55992 Change-Id: I781e5a5447f1ad03c069b2171637525ae9108d78 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * GStreamer: improve the list of default recording formatsYoann Lopes2017-03-301-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | Add some common codec combinations such as MP4/H.264/AAC or with alternative audio codecs such as MP3 or AC-3. Change-Id: If67c68112d0f170a1391bef750e2bc8fc0d246de Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * GStreamer: Fix position value at EndOfMediaChristian Strømme2017-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Return the duration when we're at the EndOfMedia Task-number: QTBUG-59604 Change-Id: If057257a65d73aa456dd7dc52b6cb624dd4712d3 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add convenience method for checking and requesting permissionsChristian Strømme2017-03-222-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | This will be used to check and request permissions at run-time. Task-number: QTBUG-55992 Change-Id: I344859aeb05fecf09ac46064e9452787d615a8a1 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add logging categoryChristian Strømme2017-03-223-2/+57
| | | | | | | | | | | | | | | | | | | | | Adds logging category for the android plugin. Change-Id: I0b0868fa7da4ce5426b3682ab40c4317afb79cd0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 09:06:39 +0000