summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-0315-32/+32
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Ensure the backend has had its geometry updated.Roger Maclean2014-02-031-0/+3
| | | | | | | | | | When trying to play video in an overlay window, the video fails to be displayed because everything that would cause updateGeometry to be called on the backend has already occurred prior to the backend having been created. Change-Id: Ida3c8feea69b497a18e9f44d7143bed03380d6ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Exclude win32 plugins from WinRT buildMaurice Kalinowski2014-02-031-1/+1
| | | | | Change-Id: Icd07ad6805341f763a7abcfc8a24104c5d672ad7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Move win32 and Alsa audio backends into plugins.Christian Strømme2014-01-3023-332/+589
| | | | | Change-Id: I9835cf5ee97900569f26421a19543b485e933051 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Alsa: fix crash when detecting devices.Yoann Lopes2014-01-302-75/+83
| | | | | | | | | Some old versions of Alsa crash when snd_device_name_hint(-1, ...) is called. This patch works around the problem by iterating manually over all the available sound cards. Change-Id: Ic380a371acc15013d137553ff30d68bed5af664e Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Yoann Lopes2014-01-3043-288/+1358
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-2743-288/+1358
| |\ | | | | | | | | | Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5
| | * Fix sending End Of Stream on gst pluginDaniel Nicoletti2014-01-271-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When streaming to gst a typefind operation is performed which jumps around to find which codec the file provides, this fix the call to send an EOS before we try to read and not after which causes confusion to gst. Task-number: QTBUG-32963 Change-Id: I2658b6a4e960430c8ab422a3bee5e11956663116 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * Fixes mediaplayer crashes on OSXtom2014-01-241-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the "libqavfmediaplayer.dylib 0x0000000110fa7c8c -[AVFMediaPlayerSessionObserver unloadMedia]" crash on Macs. The problem was: writing to memory that had already been released. If not sure, one should always check if the objects exist before deleting it. Solution tested on OSX 10.7, 10.8, 10.9 [ChangeLog][qtmultimedia][avfmediaplayersession] Task-number: QTBUG-34213 Change-Id: Iac108711851c348e96e73542b4e71653007eeb54 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-2219-212/+688
| | |\ | | | | | | | | | | | | Change-Id: Ifcb0e0bac29c11980ea2a9d67b12e1b79c4bd9f6
| | | * Android: fixed video rendering with multiple media players.Yoann Lopes2014-01-205-109/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems all Android media players share the same video buffers, which results in textures containing frames for the wrong media player. When getting a new frame, we now copy it into a FBO in order to avoid that another media player overwrites the frame being shown on screen. Task-number: QTBUG-35868 Change-Id: I6701cf7368a3ef9e73d649c3ece1f206cafd5bb3 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | * Android: fixes custom camera focus point.Yoann Lopes2014-01-203-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom focus point passed to the camera was in viewport orientation but should be in sensor orientation. The two might differ. Task-number: QTBUG-36208 Change-Id: Id272402090c2814e02abc527c0f6a6e932a60081 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | * Fix incorrect/missing application of recording settings in camerabin.Andrew den Exter2014-01-175-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set profiles if no settings are specified. Apply all settings before starting a pipeline as the mode can switch without being restarted and incompatible video recording settings can prevent the pipeline starting even in image capture mode. Set audio encoding settings and encoder profiles if they are supplied. Change-Id: I06febf977c2cae306383f9dbaae0f81f531b4757 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * Fix writing orientation and date exif tags in camerabin.Andrew den Exter2014-01-172-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orientation tags need to be transformed from the string tag returned by gstreamer to the orientation in degrees. Date tags need to be inserted with gst_date_time_new_local_time. Finally setting a tag value shouldn't clear all other tags. Change-Id: I28922148251084c12cf6c93d9b097fa5df41da9d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * Remove workaround for resolved gstreamer bug.Andrew den Exter2014-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reloading the capture pipeline before recording is unnecessary and introduces a big pause. Don't do it. https://bugzilla.gnome.org/show_bug.cgi?id=649832 was resolved in gstreamer 0.10.23 Change-Id: I0de02af52dcc193bce7a4e3e61407ae1c2d3818c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * Allow the user to specify the viewfinder resolution instead of guessingAndrew den Exter2014-01-176-71/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guessing badly prevents the camerabin pipeline from loading at all and the fallbacks used are not representive of the capabilities of most cameras. So either stay out of the process and let gstreamer negotiate a resolution if it can, or use a resolution supplied through the viewfinder settings control by someone hopefully better informed. Task-number: QTBUG-30842 Change-Id: Iec2dcc2476f38822f9e0d02301e46a1f49b7c6da Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * Android: fixes some issues with JCamera.Yoann Lopes2014-01-161-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Quit the worker thread only when the worker is deleted. This makes sure all events are processed before terminating the worker. - Correctly cache the preview size even when it's an invalid one. Task-number: QTBUG-36204 Change-Id: I76055984e8ece3f7f40dba7dd89d28a4faa1e72e Reviewed-by: Denis Kormalev <dkormalev@ics.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-2021-30/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools library to make the QDeclarativeVideoOutputBackend interface implementable by a plugin. Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Android: optimized NV21 top ARGB32 conversion.Yoann Lopes2014-01-171-15/+550
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now based on fixed-point arithmetic and uses pre-generated lookup tables for YUV coefficients and RGB clamping. The new implementation is on average 2x-3x faster than the previous one (tested on the Samsung Galaxy S4). Change-Id: I1daf12f7f9b2f2334e90e0ede79e6d83800f1db6 Reviewed-by: Denis Kormalev <dkormalev@ics.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | | whitespace fixesOswald Buddenhagen2014-01-3054-160/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | | | Android: fix crash in QAndroidCaptureSession.Yoann Lopes2014-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to apply video recording settings until a camera is actually started. Change-Id: I5348b91669835b9d776f56a3f49e3f8a11533d15 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | | Fix MSVC-warning about truncation of constant in tst_qaudiobuffer.cpp.Friedemann Kleint2014-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If9e239be38f8d15542ab9bf3a74bccf0a43b4e69 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | | Fix MSVC-warnings about unsafe bool operations in tst_qcamera.cpp.Friedemann Kleint2014-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qglobal.h(501) : warning C4804: '-' : unsafe use of type 'bool' in operation global/qglobal.h(501) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning) tst_qcamera.cpp(507) : see reference to function template instantiation 'T qAbs<bool>(const T &)' being compiled Change-Id: Ifd467b5536a0d386f592ae339129b3ebfb7b8838 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | | Fix MSVC-warnings about unused variable meta in tst_qdeclarativevideooutput.cpp.Friedemann Kleint2014-01-291-4/+2
|/ / / | | | | | | | | | | | | Change-Id: If324fd2e65acb7650b1d8dee4964a2c2bb17f876 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1735-114/+289
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
| * | Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I662277a4ed9341f188e5e3f1abab50c6f5f85577 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Fix build without Qml and Quick modules.Yoann Lopes2014-01-164-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conditionally enable auto-tests that depend on the Quick and Qml modules. Task-number: QTBUG-35911 Change-Id: I8b9d304ea630093d423b48a4ebc53ef6f4280244 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * | Fix build error on BlackBerry10Wolfgang Bremer2014-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The variable type was changed to QStringRef but the the conversion to QStringRef was left out. Change-Id: I973b0eb5795fa7bcf89ceac809fb3ff607a85913 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | Use QStringRef instead of QString whenever possible.Jędrzej Nowacki2014-01-1511-23/+23
| |/ | | | | | | | | | | | | That way we reduce count of temporary QString instances. Change-Id: Id806c68ea616828c2355c07b8576616fa6a8da17 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Only acquire resources as required in gstreamer backend.Andrew den Exter2014-01-1312-25/+107
| | | | | | | | | | | | | | | | | | | | | | Make resources required for capture optional and disable just the capture features if they are not available, so the camera viewfinder can be displayed and images captured without blocking the music playback and the other way around. Change-Id: Ic9692195156d994ccd4a911ae41d2242a00d575b Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fix playback with exotic gstreamer pipelines.Andrew den Exter2014-01-131-1/+7
| | | | | | | | | | | | | | | | | | | | Extend the list of raw video formats, and allow the playbin flags to be overridden by an environment variable when the default isn't suitable for whatever reason. Change-Id: I4c7d821b0ce29f5ad2dc0341e378ffd17c489e98 Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fix recording settings being discarded by the Camera QML type.Andrew den Exter2014-01-132-0/+11
| | | | | | | | | | | | | | | | | | | | Query existing settings from the recorder instead of locally cached settings as some other agent may have applied some settings separately and those would otherwise be discarded. Change-Id: I0ebeaf06c6f7306c5987aa269032842b538a6a8b Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fix configuration of camera settings in camerabin backend.Andrew den Exter2014-01-133-5/+44
| | | | | | | | | | | | | | | | | | Enable gstphotography interfaces if the compile check passes, and implement missing pieces of whitebalance and focus configuration. Change-Id: Icd24dfd148204f8d8218176593c3120427a13e1e Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Allow the camerabin source selection to be overridden.Andrew den Exter2014-01-135-50/+80
| | | | | | | | | | | | | | | | | | | | | | Prefer the default camera-source element if there is one or an element identified by an environment variable to a static list of possible elements which may not be appropriate for the target environment. Change-Id: I53816c949307953780f9046eb11e09effe059be0 Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * don't error out on static buildsOswald Buddenhagen2014-01-101-2/+0
| | | | | | | | | | | | | | | | | | | | commit daa8e22 made it actually work, but apparently forgot to re-enable it. Task-number: QTBUG-35843 Change-Id: Ib782634a4b1916e25e22f0b4c4f7bf42bf92b52f Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | BlackBerry: Changed documentationBernd Weimer2014-01-132-2/+2
| | | | | | | | | | | | | | Changed platform notes title to be able to reference it from elsewhere. Change-Id: I0edcebc6aa04e7a063cbe8b386ca8b38e0ae22a9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1020-24/+267
|\ \ | |/ | | | | Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
| * BlackBerry: Fixed volume settingBernd Weimer2014-01-101-1/+1
| | | | | | | | | | | | | | Mute status is taken into account when setting the volume. Change-Id: Id2b9c7f6a1e5b6e4f5d4c82830544394c714b48f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Mark tst_qcamerabackend test as insignificant on Mac OS XSimon Hausmann2014-01-081-0/+2
| | | | | | | | | | | | | | | | | | It has failed 6 times during qt5.git stable integrations since September 2013 See also QTBUG-36040 Change-Id: I6abd5b2723d2346a4831ab28fa040c14615148b0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Android: QVideoProbe support for cameraDenis Kormalev2014-01-089-11/+248
| | | | | | | | | | | | | | | | | | | | | | QMediaVideoProbeControl sublclass added to capture service to make QVideoProbe work with Android camera. [ChangeLog][QtMultimedia][Android] QVideoProbe support for camera Task-number: QTBUG-35416 Change-Id: I14d0a0e8abd14ee8f577e2901b976b8ed46eb320 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fix some typos in documentation.Jeff Tranter2014-01-076-8/+8
| | | | | | | | | | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: Ieb7be17bd1d50751f00620f7ac28d09355856ac0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| * Fixed some documentation for VideoOutput qml type.Yoann Lopes2014-01-061-2/+2
| | | | | | | | | | | | | | | | mapPointToSource() and mapPointToSourceNormalized() were documented with the wrong name. Change-Id: Ia128f698a02f1c865bc27443ef2c6cef8fc7a720 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * PulseAudio: fix crash when failing to create a context.Yoann Lopes2014-01-061-2/+3
| | | | | | | | | | | | | | | | | | | | Don't try to call a function on a null PulseAudio context. If pa_context_new() fails, we now try again to connect to the pulse audio daemon later. Task-number: QTBUG-35456 Change-Id: I0b848d3f25f57651ab31b9eca7ceb1bc9df2f682 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * GStreamer: add missing breaks in QGstreamerRecorderControl.Yoann Lopes2014-01-061-0/+3
| | | | | | | | | | | | Task-number: QTBUG-34914 Change-Id: I8237201cb656a3cde23e3d750939fe11e35519cd Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-01-071-1/+1
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-1/+1
| |\ \ | | |/ | | | | | | Change-Id: Iefedab3cfc470affbd3118a4e9eb3c892945cd2a
| | * Correct QSoundEffect::supportedMimeTypes() documentation.Mitch Curtis2014-01-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I154b124949ee4f07ea413d8cdb419fcc08cb8324 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Fix whitespace issue in the QVideoFrame auto test.Christian Strømme2014-01-071-1/+1
|/ / | | | | | | | | | | | | | | The test was failing because it was expecting a trailing whitespace directly after the serialization of the meta-data map. Change-Id: I62aa022492c721d408d23a98e8a3cfa173f45e68 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-235-163/+687
|\ \ | |/ | | | | Change-Id: I0429a7186bef08918b777d6aa662685c57bad091
| * Android: camera moved to a dedicated threadDenis Kormalev2013-12-235-163/+687
| | | | | | | | | | | | | | | | | | | | | | | | | | Actual camera work moved to JCameraWorker which lives in dedicated thread. JCamera now acts as proxy calling JCameraWorker methods with invokeMethod (when it is needed). [ChangeLog][QtMultimedia][Android] camera operations moved to a dedicated thread Task-number: QTBUG-35564 Change-Id: Ie4edcbf0869d56b0fef4ad0c820450cc77657fdd Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>