summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GStreamer: improved logic for window and widget controls usage.Yoann Lopes2015-02-187-27/+68
| | | | | | | | | | Provide these controls only when the xvimagesink gstreamer element is available. This allows QVideoWidget to fallback to QVideoRendererControl when xvimagesink is not available. Task-number: QTBUG-41618 Change-Id: I59f90ea8857c7ec0ffa08be9804e5458d95b79c4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Compile Alsa and PulseAudio plugins only when enabled by configure.Yoann Lopes2015-02-171-2/+2
| | | | | | | | They are enabled by default, this simply makes sure -no-alsa and -no-pulseaudio work. Change-Id: I8e921381363064bb65b414152eab27c08a551dc4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Android: fix adjusting camera viewfinder resolution.Yoann Lopes2015-02-111-9/+14
| | | | | | | | | | | | | The viewfinder resolution must be in the same aspect ratio as the image capture resolution. When adjusting the viewfinder resolution to comply with that restriction, we assumed that the ratios had to be exactly equal. Though, in practice, there can be a small difference. For example for resolutions 2592x1952 (ratio=1.3278) and resolution 640x480 (ratio=1.3333). Task-number: QTBUG-37525 Change-Id: Ia5a6dd3a4a6d901b24bf74f8aa4e34bffe61f89b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Fix some typosSergio Ahumada2015-02-1111-17/+17
| | | | | Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into ↵Frederik Gladhorn2015-02-102-1/+50
|\ | | | | | | refs/staging/5.4
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-102-1/+50
| |\ | | | | | | | | | Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb
| | * Ensure the system libraries are linked when -opengl dynamic is usedv5.4.1Andy Shaw2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-43211 Change-Id: Id543c74233f547c61164b9d32a5f6a3f6d1bc1b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| | * Added 5.4.1 change file.Yoann Lopes2015-02-031-0/+49
| | | | | | | | | | | | | | | Change-Id: Icde0e9aadb47dbf5a0b0bb22258b66b13cd5c75c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-1010-29675/+128370
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: Ib62195d0b992a52d3a87f460283b1f2813f0e5eb Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Clarify documentation for QImageCapture's 'ready' property.Yoann Lopes2015-02-102-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike what was described in the documentation, it's not permissible to call capture() while 'ready' or isReadyForCapture() is false. All backends emit an error in that case. Updated the documentation to reflect that behavior. Change-Id: Icb326e65376b65eadd4c68b67e0ee30beddf1a04 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Encode urls passed to media player properlyJoni Poikelin2015-02-101-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-44383 Change-Id: I2c63d5530ad76474ccad8ad69493419dd46032fa Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | Change-Id: I2c0a3ba90c3343b362cd756584979f1b08405d34 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | directshow: Fix plugging/unplugging a second cameraSergio Martins2015-02-051-6/+9
| | | | | | | | | | | | | | | | | | When having more than 1 camera (like one laptop integrated webcam and a separate one) you had to restart the application for QCameraInfo::availableCameras() to work. Change-Id: I47cfa928cfd9500524b81a4bf8ec5ebff0b79879 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix memory leak in QWindowsAudioDeviceInfo::availableDevices().Friedemann Kleint2015-02-051-0/+2
| | | | | | | | | | | | Task-number: QTBUG-44305 Change-Id: I8c5afd6d5c77ef1ef81c3b752c6246dc50406794 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Add the library prefix to QObject in public headerSergio Ahumada2015-02-041-1/+1
| | | | | | | | | | Change-Id: I3add728003f4199fe7adec364487cc9b60a8c4cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix no-opengl pixel format check (reenables Format_RGB24)Peter Seiderer2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | Disable Format_RGB24 only in case of QOpenGLContext::LibGLES by moving the no-opengl endif after the check against Format_RGB24. Change-Id: I389ae2bb32dc8b2c55ec801f52d820620630b1c0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Bump versionOswald Buddenhagen2015-01-161-1/+1
|/ | | | Change-Id: I29a6579deefb4ca80bb014c43ee34697fa89bd47
* Add resolution and fps on mfw_v4lsrcLaszlo Agocs2015-01-123-5/+63
| | | | | | | | | | | | | | Add support for changing resolution and frame rate with mfw_v4lsrc. This is essential for embedded applications that are not happy with the default VGA@30. This makes constructs like the following functional on devices like i.MX6 with MIPI cameras: Camera { viewfinder { resolution: "320x240"; maximumFrameRate: 15 } } Change-Id: Ia297afdb5ca51c6e55ad45dce37fdab7da3a5cfb Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Migrate to categorized logging in Quick 2 video outputLaszlo Agocs2015-01-092-23/+15
| | | | | | | | | | Enable qt.multimedia.video to get the logs. Also enhance the printing when creating the video node implementation. It is essential to have an easy way to figure out what handle and formats the node in use supports. Change-Id: Idf3a9f076ba03b5e613c19f2347204c841850b45 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Support byte ordered QImage formats in pixelFormatFromImageFormatLaszlo Agocs2015-01-091-0/+3
| | | | | | | For QVideoFrame purposes they are equivalent. Change-Id: I776c60aa8ca848e58499bbd0c1fc25c457d46ef6 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Support YUV420P in the i.MX6 video nodeLaszlo Agocs2015-01-061-0/+1
| | | | | | | | | | Camera input is often in this format. Until now the lack of GL_VIV_I420 (which was presumably missing in older versions of the extension?) in the format list resulted in falling back to the built-in i420 node instead of the zero-copy imx6 one. This is now corrected by adding the correct format mapping. Change-Id: I6e891bb3bb07d64ccd5b2d170b052f677c8bd19c Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Fix: static linking on Linux with both PulseAudio and Alsa pluginsGabriel Hege2014-12-228-38/+38
| | | | | | | | | | | Fixed multiply defined symbols when linking statically with both PulseAudio and Alsa plugins enabled: The private classes In/OutputPrivate had identical names and have been renamed. Change-Id: I9415beeeed9fb0e14ead3f0ab906f343b3934341 Task-number: QTBUG-43514 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* remove unnecessary LICENSE.GPLv2Jani Heikkinen2014-12-221-292/+0
| | | | | Change-Id: Ic2be97ac71f2dbf48925b2ee7fb4ab291c7573c7 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-171-0/+111
|\ | | | | | | Change-Id: Ice62a75ba6ff094e22e8affbecf26f4d3bf2f282
| * Added 5.4.0 change file.v5.4.0Yoann Lopes2014-12-031-0/+111
| | | | | | | | | | Change-Id: I623b42d5f4f565ee7cf2d064e52609a99636bd6a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I7e93575a6e3767485e2a5430312e87527b2c9b2d
* | winrt: Add missing QAbstractVideoSurface::stop() call.Andrew Knight2014-12-111-2/+4
| | | | | | | | | | | | | | This was preventing the surface from restarting with a different format. Change-Id: I1f86ddb1b16618f167183c7e2fcb32658df578f3 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | winrt: Fix encoding propertiesAndrew Knight2014-12-111-4/+17
| | | | | | | | | | | | | | | | | | | | | | These should match the capture mode. Additionally, there was a semantic error preventing the encoding properties from being properly selected. This fixes a bug in which the viewfinder was receiving frames too large for display as an OpenGL texture. Task-number: QTBUG-41065 Change-Id: Ia82c8f44bba1692a219edc5f9d78fc76c3d8a4ba Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | winrt: Fix camera auto rotationAndrew Knight2014-12-114-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no Windows Runtime API to find the camera sensor rotation, so assume that phones always have a camera mounting of 270 degrees. Tablet and webcams remain mounted at the default (0 degrees). As the frame is not flipped automatically by the system, the scan line direction is set to BottomToTop for front-facing cameras to achieve compatibility with other platforms. Task-number: QTBUG-41066 Change-Id: Icf17ecd4aca9fa9d5b24d94e5b21b63ee6f21f28 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Make it compile with no-openglLaszlo Agocs2014-12-111-0/+4
| | | | | | | | | | | | Change-Id: I71358bb1268e5b28b66b1817a3ec0cd98459cfd2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Remove private API use from video orientation handlerAndrew Knight2014-12-111-3/+1
| | | | | | | | | | | | | | | | The QPA header isn't needed anymore, as nativeOrientation was added as a QScreen property in 5.2. Change-Id: I7cd00feae769175fd0c4be65b503e74ee910814a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | GStreamer: better camera device name logic.Yoann Lopes2014-12-091-0/+2
| | | | | | | | | | | | | | | | Use the device ID for QCameraInfo::description() when the driver doesn't provide any display name. Change-Id: Iff1f17187ecb52262412f85db04d7108fae71717 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | OpenSL ES: volume support for QAudioInput.Yoann Lopes2014-12-032-5/+17
| | | | | | | | | | | | | | | | | | The OpenSL volume interface is not available for audio inputs on Android so we apply the volume ourselves on the PCM data. Task-number: QTBUG-42159 Change-Id: If43d8aa576bc70a925681f0db1ca8b40e71f7b29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Fix VideoOutput autoOrientation when switching cameras.Yoann Lopes2014-12-032-11/+41
| | | | | | | | | | | | | | The VideoOutput's camera info was not updated when switching cameras. Change-Id: I23537ce98b08009898eaa26ef14d5b9a746ab5f7 Reviewed-by: Andrew Knight <andrew.knight@theqtcompany.com>
* | Remove unused private membersThiago Macieira2014-11-255-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | One is not used, the others are not even initialized, so don't use the memory. qsoundeffect_pulse_p.h:172:20: warning: private field 'm_resourceStatus' is not used [-Wunused-private-field] qvideowidget_p.h:211:25: warning: private field 'm_aspectRatioMode' is not used [-Wunused-private-field] qalsaaudioinput.h:156:22: warning: private field 'timestamp' is not used [-Wunused-private-field] qalsaaudiooutput.h:135:22: warning: private field 'timestamp' is not used [-Wunused-private-field] Change-Id: I7c9f50d57c4d29ee0dfd7dc086771d721cdb5b05 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix Clang warning about comparison of different signsThiago Macieira2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | Commit 4d35f66acf90e64e6c174bee9d809713d07fcd7e changed from -1 to ~0 because ICC complained, but Clang still sees ~0 as int. So force to unsigned. qgstappsrc.cpp:144:31: warning: comparison of integers of different signs: 'unsigned int' and 'int' [-Wsign-compare] Change-Id: I6b0fdf8dc5df157d8e184f22dba44660e60ca3b2 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-216-10/+23
|\| | | | | | | Change-Id: Iec2c793710c95919975aa3c03144d915ca5fa84f
| * Fix bogus videonode plugin handlingv5.4.0-rc1Laszlo Agocs2014-11-185-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each plugin must provide its own unique key. Otherwise we will only ever see one single plugin. Right now running on i.MX6 is often broken because the imx6 videonode plugin is not picked up since only the egl one is seen by the system. With the fix both plugins provide their own unique key so both become visible. Additionally, introduce a QT_VIDEONODE environment variable. This is useful to specify which plugin to use. This is necessary in case multiple custom videonode plugins support the same formats. Change-Id: Iaa1988f8436dcb938cb9a95e2e0d68a4e92e113c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * WinRT: Fix compilation after ANGLE updateMaurice Kalinowski2014-11-171-1/+1
|/ | | | | | | Header inclusion is not needed, hence remove it for WinRT. Change-Id: I8117439849143975cad3dc14e36118b8da4621de Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Check whether current context can be obtained when deleting textures.Friedemann Kleint2014-11-062-4/+12
| | | | | | | | Add a warning in that case. Task-number: QTBUG-41966 Change-Id: I491ee9e13c9504040ab789951656983a736d9203 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* OpenSL ES: improve buffer logicChristian Strømme2014-11-042-8/+27
| | | | | | | | | | | | | Don't use relaxed load and stores, we need to be stricter to avoid problems with high frequency re-fills of the buffer. If we don't enforce ordering we might end-up spending more time trying to acquire an open slot in the buffer. Updating processes bytes is also moved off the "OpenSL" thread. Added some comments for improved readability. Change-Id: Ie27965fc6bf4b8394081ae6419f4933522ada98e Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* OpenSL ES: Don't store or return the adjusted volume level.Christian Strømme2014-11-042-4/+2
| | | | | | | | | | According to our own docs we should always return 1.0 (MAX) volume level if the device doesn't support setting the volume, which is the case for OpenSL ES on Android. Task-number: QTBUG-42159 Change-Id: I9144e9e2cd84cc80633c68c5d6fa32b8dbd0fcd5 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Doc: Added the missing screenshot imageVenugopal Shivashankar2014-11-032-0/+2
| | | | | Change-Id: Ifcef698bd735b7fe7e5f4a92984be07a01f283fb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* WMF plugin: Initialize member variable m_stateDirty.Friedemann Kleint2014-10-311-0/+1
| | | | | | | | | Fix purify warning: [W] UMR: Uninitialized memory read in MFPlayerControl::refreshState(void) {1 occurrence} Task-number: QTBUG-41966 Change-Id: I1416f906dcc8c31a528ab7f09a258873fcfe9d1e Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Add QT_GSTREAMER_CAMERABIN_VIDEOSRC environment variable.Yoann Lopes2014-10-303-7/+56
| | | | | | | | | It can be used to set which video source element should be used by the camerabin. Change-Id: I8d1cd8c4ba6fe5a89817699f645b0997e713aaca Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Doc: Updated the \brief statementsVenu2014-10-2411-44/+38
| | | | | | | Most of them were unnecessarily long. Change-Id: I8942254c2211adb268e399056435e6acc940616f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Android: Use the new findClass() method.Christian Strømme2014-10-174-73/+60
| | | | | | | Avoid local caching. Change-Id: I1e30896da664c5a45c38c09412c16cb8ff70c5c7 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-142-7/+8
|\ | | | | | | Change-Id: I716fd3acb69e424047691069cd4a781f656d0487
| * QNX: Fix resetting video surface5.3Bernd Weimer2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | If video surface object is set to 0, it must not be accessed to set a property on it. Task-number: QTBUG-40746 Change-Id: I1de0e5495918d3ea06706412fab15bf1af012f36 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * WMF: Use media source only when it is initialized.David Schulz2014-09-301-5/+6
| | | | | | | | | | Change-Id: I0efcf6139d0b81194cf25383025f080f8656728c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 22:26:28 +0000