summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DirectShow: refactor custom renderer filterYoann Lopes2016-07-0630-1371/+2324
| | | | | | | | | | | Refactor out some of the filter and pin logic into the DirectShowBaseFilter and DirectShowPin abstract classes. This will avoid code duplication when implementing the probe filter. The existing source filter (for qrc files) can also be refactored to use these abstract classes. Change-Id: Iaf141472dea82579ad085b3318624f9a57aa46d8 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Blacklisting playPauseStop() on all LinuxesMilla Pohjanheimo2016-07-061-6/+1
| | | | | | | | | Changed the blacklisting of playPauseStop() to be "linux" instead of separately blacklisting it for each Linux distribution, since it's failing on all. Change-Id: I0b545423bf598b7487722bd5dda2d236be7131f6 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Fix build when building with QT_NO_OPENGLAndy Nichols2016-06-281-1/+1
| | | | | | | | | | | Now that it is possible to build qtdeclarative when QT_NO_OPENGL is defined, it is no longer safe to assume qtHaveModule(quick) == OpenGL. So for the time being building of qtmultimediaquick tools is disabled when qt is built without opengl support, as the implementation depends on OpenGL currently. Change-Id: Iec76d25c5a86ee16674bf433c492585ad5f87988 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add config test for wasapi pluginMaurice Kalinowski2016-06-144-2/+61
| | | | | | | | | | | | | | The wasapi audio plugin can also be used on desktop versions of Windows. The support has been experimental so far and will now be enabled in case the SDK contains support for it. Unfortunately MinGW does not provide Microsoft::WRL::RuntimeClass and IActivateAudioInterfaceCompletionHandler, hence we need to disable the plugin currently for it. Change-Id: I2be6e99810d462507112465a2084a2d72c3c62f0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* DirectShow: fix media player volume.Yoann Lopes2016-06-141-16/+13
| | | | | | | | The Qt volume was interpreted as a logarithmic factor but it should actually be linear. Change-Id: I0f3e742e934261742bd96f5e3ca3fb42f310864c Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Use logarithmic volume scale in examples.Yoann Lopes2016-06-143-9/+9
| | | | | | | Sounds much better than a cubic scale. Change-Id: I4daaa333a5e1f24b93443d624b024a1263979538 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Add LogarithmicVolumeScale to VolumeScale enum.Yoann Lopes2016-06-147-20/+159
| | | | | Change-Id: I0b556b5f705825fc8c8135305bda4bc860ffbf14 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Blacklisting tst_QSoundEffect::testLooping on Ubuntu 16.04Milla Pohjanheimo2016-06-141-0/+1
| | | | | | | | | The test in question has been blacklisted already for Ubuntu 14.04, and since it fails on Ubuntu 16.04 also, we need to blacklist it. Task-number: QTBUG-46689 Change-Id: I04eeb50031ddb622e62d895df37fd685a6f059f8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1112-45/+521
|\ | | | | | | Change-Id: Iffd8d86489161c49a647cae77a31f5451b06cf4b
| * Implement QCameraViewfinderSettingsControl2 interface for AndroidRuslan Baratov2016-06-0210-45/+519
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class QAndroidViewfinderSettingsControl2 which implements QCameraViewfinderSettingsControl2 interface. This make next QCamera methods working on Android: * QCamera::setViewfinderSettings * QCamera::supportedViewfinderFrameRateRanges * QCamera::supportedViewfinderPixelFormats * QCamera::supportedViewfinderResolutions * QCamera::supportedViewfinderSettings * QCamera::viewfinderSettings Originally from: * https://github.com/headupinclouds/gatherer/issues/109 Change-Id: Ic43e434289a626691f01ed9832654fa9b0105c7d Reviewed-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Blacklist cases from qaudiodecoderbackend in Ubuntu 16.04v5.7.0-rc1Simo Fält2016-05-231-0/+1
| | | | | | | | | | | | Change-Id: I0482247ce2f24d1b47f32fe403db8587b6f92abc Task-number: QTBUG-46368 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge 5.7 into 5.7.0Oswald Buddenhagen2016-05-203-14/+26
| |\ | | | | | | | | | Change-Id: I7b8df058f300b1fa173679bb045f4c87dc736cd2
| * | Blacklisting pushSuspendResume for Ubuntu 16.04Milla Pohjanheimo2016-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test is failing on all Linux distributions. Blacklisting it for Ubuntu 16.04 too. Task-number: QTBUG-49736 Change-Id: I24d6387fabd9257a36589ccd1b3d63092c9dc0c1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Android: fix media player volume.Yoann Lopes2016-06-091-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | Qt expects a linear volume, so does Android. We don't need to do any conversion. Change-Id: I35acf0040aff0c6c0d812b4d11fe42a7a6a97ed0 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | OpenSL ES: use QAudio::convertVolume().Yoann Lopes2016-06-091-3/+1
| | | | | | | | | | | | | | | Change-Id: Iba1c8c050162646a3cdbe75928a6ebd0a1b17e30 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Fix out-of-date documentation for QAudioSystemPlugin.Yoann Lopes2016-06-031-16/+7
| | | | | | | | | | | | | | | Change-Id: I0c186ae42a6f1ad0d2fde38544341741d4e8df6a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Use new volume conversion API in examples.Yoann Lopes2016-06-034-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | Volumes sliders are now scaled cubically so that loudness changes are perceived linearly. Change-Id: Ibf00d6a97d872063d92457493417be5eb42f79ac Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Add new volume conversion API.Yoann Lopes2016-06-037-1/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Qt Multimedia volume APIs expect a linear volume factor. However, UI volume controls should typically use a logarithmic or cubic scale to match how the human ear perceives loudness. The new helper function (C++ and QML) provides a way to do the conversion from one scale to another. Change-Id: If7795426b728ab0e8fd6635988dbc9be795e3e5e Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Blacklisting tst_QSoundEffect::testLooping on OpenSUSE 42.1Milla Pohjanheimo2016-06-022-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted testLooping() on OpenSUSE 42.1 and removed 'insignificant_testcase' CONFIG, which was a typo in any case. It should be 'insignificant_test'. Also we should get rid of the tests marked as insignificant in any case. Task-number: QTBUG-46689 Change-Id: Idcf9589e26d066e664cf68e6c25c03f4d1973287 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Remove mentioning of -audio-backend command line optionLars Knoll2016-05-311-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The option has not done anything for quite some time, let's get rid of it. Change-Id: I8863ae81b74f1065d0eb0dd95b8ce192a6cd6a51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-244-18/+28
|\ \ \ | | |/ | |/| | | | Change-Id: I5aedca14c2bd454de0c274eeca88d15b83ae07a5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-193-14/+26
| |\ \ | | |/ | |/| | | | Change-Id: Ib95ddbbc6e2b69663597cae045ec81eda6d12d58
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-192-12/+24
| | |\ | | | | | | | | | | | | Change-Id: Iaecbb5c4a33bf0eaffa4f1896bdc09751b1f04c4
| | | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ic272c741ca0bb805dc50ce591ac0ea1d93f07944 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | | * Merge 5.6 into 5.6.1Oswald Buddenhagen2016-05-127-20/+68
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ib4a7640e12319d78ea5ae8f58d79c9fab8d0ea60
| | | * | winrt: Fix crash when initializing certain camerasMaurice Kalinowski2016-05-111-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cameras return video properties when querying for MediaStreamType_Photo, ie. Surface Book. This caused an assert. Instead when asking for photo resolutions, only query the available image resolutions and skip results not of type image. Change-Id: Ia1886a11f47676d6713eec86f3a80c664871a968 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | | Make qtmultimedia 5.6 branch compile without c++11:nullptr usageRalf Nolden2016-05-171-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 5.6 should not require c++11 features, however, nullptr slipped in here. Replace nullptr with Q_NULLPTR for initialization. Change-Id: Icf62618657b5bb725bd4c8f924853fa191f6e413 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | winrt: Only set focus if supportedMaurice Kalinowski2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6dc2eb6acbd0f5167aa4bad9af08ce8aa5a456b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | Stabilize tst_QAudioOutput::pull().Yoann Lopes2016-05-111-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53297 Change-Id: I521b9b3594016197228676648f97f568a8db0a7e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | Improve QAudioDeviceInfo::defaultDevice().Christian Stromme2016-05-2032-161/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation of QAudioDeviceInfo::defaultXDevice() would always report the first available device as the "default" one, making the order, in which devices were listed, a hidden requirement when implementing audio plugins. To make it easier and more reliable to retrieve the default device, all new plugins should implement the new QAudioSystemPluginExtension interface as well as the QAudioSystemPlugin. Devices will be chosen in the following order (first match wins): default plugin -> default device -> first available device plugins -> default device -> first available device Task-number: QTBUG-51292 Change-Id: I8ace78858976fe7c60a2c4a117ef15c4e1bb177f Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-1347-719/+794
|\| | | | | | | | | | | | | | | Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1046-719/+787
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| | * | decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I6d8c623f41c633babe5923344c915412d3d6bcd4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * | Android: improve texture rendering on API level >= 16.Yoann Lopes2016-05-104-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android API level 16 added SurfaceTexture::attachToGLContext(). This allows to create the OpenGL texture when the first video frame is available, rather than at initialization. This means we can do without the ugly hack that makes the render thread call us back through some custom property. Additionally, it allows to recreate a new OpenGL texture every time the SurfaceTexture is reset. Task-number: QTBUG-51911 Change-Id: I17b04524d426c42ef8aa0288b0731597bc9eba62 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * | Add FreeBSD define and include for <sys/types.h> where <linux/types.h> is usedRalf Nolden2016-05-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile fix: FreeBSD uses <sys/types.h> instead of the linux version <linux/types.h>, so this patch changes the include by Q_OS_FREEBSD define. Change-Id: Iafe18614ad2360dce9858039b22f9b6c2dd9caaa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | Android: detect more error cases when rendering frames to textures.Yoann Lopes2016-05-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't render the frame if the SurfaceTexture has been released or if the render size is invalid. Change-Id: I6b8bf14e023ff54a560b0a9e6027ef9d7d06ab6a Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * | Android: correctly use mutex for texture rendering.Yoann Lopes2016-05-091-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Some sections were not protected by the mutex, even though they should have been. An example of problem that could happen because of this was if the SurfaceTexture was reset while the render thread was rendering that texture. Change-Id: Ie95860fd4eb722bbac04cccc430cc1a8abf1df4d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Polish the videowidget example.Friedemann Kleint2016-05-043-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add command line parsing and file argument. - Port to Qt 5 connection syntax. - Adapt size to available geometry (for High DPI). Task-number: QTBUG-53114 Change-Id: I1c1c547ddb14210ef5900f99f4870d6d91b67088 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * DirectShow: Invoke IGraphBuilder::AddSourceFilter() with local file name.Friedemann Kleint2016-05-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When possible, convert the URL to a local file name with native separators. The method seems to accept URLs with file scheme, but fails when passing UNC paths. Task-number: QTBUG-53114 Change-Id: Ib7418090080be8c1b8472e77541e686adaa3a18a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * fix example installsOswald Buddenhagen2016-04-286-0/+16
| | | | | | | | | | | | | | | Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * GStreamer camerabin: return the proper camera sourceZhang Xingtao2016-04-283-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - return m_cameraSrc for function cameraSource() instead of m_videoSrc. m_videoSrc is not always assigned(default 0), it will crash on: if (g_object_class_find_property( G_OBJECT_GET_CLASS(m_session->cameraSource()), "exposure-mode")) { And as the function name says, it would be better to return the value m_cameraSrc. - make sure pointers are not NULL before using them. Change-Id: I8a56db34a805724b428409b87de7d072ee7bfa57 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * CoreAudio: use AudioComponent instead of deprecated Carbon ComponentDyami Caliri2016-04-272-54/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OS X 10.11 generates a warning when the code uses the Carbon Component Manager to locate audio devices. The new AudioComponent interface has been available since 10.7. Change-Id: I46ecbcd62871ecc46ce3ebd9ea2a37a9e1342f41 Task-number: QTBUG-48828 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * QNX: Avoid reading frames faster than they're renderedDan Cape2016-04-275-247/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code would capture frames with a 60Hz timer into two pixmaps alternating pixmaps with each successive frame. Rendering was somewhat disconnected from this, if rendering was unable to occur at 60fps, multiple frames might be copied for each frame rendered. This meant that it might try copying a video frame into a pixmap that was currently being used by the GPU with bad effects. The primary effect being severe flicker on i.mx6 targets. The change is to ensure that we don't read the window data until we're just about to make use of it. This means we don't ever get ahead of ourselves and read the video window once for every frame rendered. The code has been significantly refactored. There is now a class that manages the pixmaps and egl images. This is created on demand and the images are created and destroyed when sizes change. Since this all now occurs in the proper thread, much of the nonsense of setting _q_GLThreadCallback to arrange a call from the render thread is avoided. Remove BlackBerry ifdefs that are no longer used. Change-Id: I4bf5efa4c39c8170e3f55499c167ee10e521e100 Reviewed-by: James McDonnell <jmcdonnell@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Fix macro redefinition warningChristian Stromme2016-04-271-12/+7
| | | | | | | | | | | | | | | | | | | | | Don't re-define APIENTRY macros unconditionally on mac. Change-Id: I894f866da0ec0d6da76a62f01c24739be92d851f Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Fix unused variable warningChristian Stromme2016-04-261-2/+5
| | | | | | | | | | | | | | | | | | | | | - warning: unused variable 'm_renderer' [-Wunused-variable] Change-Id: Ie7d8ebe35a3ab0beb66cda3448595ed952f7dea4 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Fix property attributes.Christian Stromme2016-04-261-5/+5
| | | | | | | | | | | | | | | | | | | | | A property can't be both constant and writable at the same time. Change-Id: Ie1f81fdf10eba7fe84f98f7c34f829cdac654e75 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * winrt: Disable camera deactivation automation in debug modeMaurice Kalinowski2016-04-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera control reacts to an application becoming inactive and turns off the camera. However, when debugging or watching internals inside an IDE this feature breaks the state of the application as the IDE gets focus and hence camera is turned off. Change-Id: I6f80476592c0faa32e9da11401f699c6211d226a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * winrt: Fix device watcher handlingMaurice Kalinowski2016-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When device watcher has been started it can have the enumerationComplete state in addition to started. Hence only start the watcher if none of those two states is present. This fixes an assert where starting an already started watcher failed. Change-Id: Idc3af256845f0993a26e8d186b499ef1c7e7dacc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * winrt: fix camera control after move to xaml threadMaurice Kalinowski2016-04-225-193/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera control management has to happen inside the xaml thread, otherwise the behavior is undefined. This results in ie. the first capture not working due to synchronization issues. When (de-)activating the videoRenderer we have to switch to the UI thread first. In addition add focus for Windows 10 (Mobile), previously it was compiled for Windows Phone 8.1 only. On desktop this might return no focus mode to be supported, but API-wise this is available. Task-number: QTBUG-47803 Change-Id: I9b345ebc82502fc6e00aede43b9096893cd0ad53 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * winrt: Add categorized logging to camera controlMaurice Kalinowski2016-04-223-0/+17
| | | | | | | | | | | | | | | | | | Change-Id: I6d823ac07950212d766905c9409469f2b1b84954 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 23:57:08 +0000