summaryrefslogtreecommitdiffstats
path: root/src/gsttools
Commit message (Collapse)AuthorAgeFilesLines
* Alsa: fix crash when detecting devices.Yoann Lopes2014-01-301-23/+26
| | | | | | | | | 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-301-20/+21
|\ | | | | | | refs/staging/dev
| * 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>
* | whitespace fixesOswald Buddenhagen2014-01-301-1/+1
|/ | | | | | | | 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>
* Allow the camerabin source selection to be overridden.Andrew den Exter2014-01-131-6/+21
| | | | | | | | | | | 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>
* use private linkage where possibleOswald Buddenhagen2013-10-311-8/+8
| | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-207-1133/+6
| | | | | | | | | | | | Removed QGstreamerVideoOverlay and related classes. It was used as 'Window' control but performs worse than QGstreamerVideoWindow which does basically the same thing using GStreamer ready-made components instead. Removed X11 dependencies and related configuration tests. It was only needed for QGstreamerVideoOverlay. Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* QGstTools: Fix warning about unused m_intervalTimerTobias Hunger2013-09-021-0/+2
| | | | | | | Clang does complain about this member not being used. Change-Id: I02919715be43486f4646ca75deea66fc8a6a2276 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* WMF and GStreamer: fixed incorrect frame startTime and endTime.Yoann Lopes2013-08-221-2/+3
| | | | | | | | | | | | The QVideoFrame documentation explicitly says that the time is in microseconds, however the GStreamer backend was setting the time in milliseconds and the WMF backend in 100-nanosecond units. With WMF, the time was missing from the QVideoFrame when presenting it to the video surface. Task-number: QTBUG-31731 Change-Id: I0638d2abf8eed25b3a531db67c19a18703e5b630 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Change libresourceqt's .pc file.Robin Burchell2013-08-051-1/+1
| | | | | | | | The one public port of this library to Qt 5 changed the .pc to libresourceqt5, to avoid clashing with the Qt 4 version. Change-Id: I6a248606e20c4e7a8f432612ca00aded846264d9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Reset VideoSurface pointer when deletedDominik Holland2013-04-231-2/+2
| | | | | Change-Id: Iec74c8a8b914d2c2765e0e1f319d89f3daedfe3f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix warnings found by GCC 4.8 in qtmultimediaThiago Macieira2013-04-112-4/+5
| | | | | | | | qgstreamermessage.cpp:48:12: warning: ‘wuchi’ defined but not used [-Wunused-variable] qvideosurfacegstsink.cpp:383:1: warning: narrowing conversion of ‘4278190080u’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing] Change-Id: I678e9eb39f3963e20109bb15c9c0c0d118b5a3b2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-111-2/+2
| | | | | | | Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1021-21/+21
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Iffd78b4c7cf8d048a822b75c481ac380b3d8d0f4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-061-5/+5
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* fix VPATHOswald Buddenhagen2012-11-051-0/+1
| | | | | | | | | the code relied on the now removed qmake misfeature of adding DEPENDPATH to VPATH. Change-Id: I3bea30a25776eb945fbd65f9e9811c91d882893f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2421-506/+506
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove the WA_PaintOnScreen widget attribute for vide widgetsLars Knoll2012-08-081-1/+0
| | | | | | | | | This attribute doesn't quite do what it used to do in Qt 4.x anymore, and will lead to Qt not painting the video at all. Change-Id: I2338815756cab82ae152058ff5a7b5f14e07001e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Replaced endpoint control with audio input and output controlsDmytro Poplavskiy2012-07-242-16/+16
| | | | | Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst audio input: use autoaudiosrc as default deviceDmytro Poplavskiy2012-07-091-0/+5
| | | | | | | | Currently pulsesrc element is selected if it's installed, even if pulseaudio is not used. Change-Id: I7e23e647767116955e24e3681155f9cb5f6d8574 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename a few controls.Michael Goddard2012-06-292-2/+2
| | | | | | | | | | The encoder controls could be confused with actual encoding, so make clear they are just settings. Also, the end point selector controls were not named very well. Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* syncX() doesn't do anything anymore. Remove it.Thiago Macieira2012-06-261-3/+0
| | | | | Change-Id: Id15af428e1d04606564bad093847b3dc5a731e85 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* switch to new-style configure testsOswald Buddenhagen2012-06-251-3/+3
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix namespace compilation.Toby Tomkins2012-06-252-0/+7
| | | | | | Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Release string after gst_cap_to_string is called.bigbearzhu2012-05-281-1/+4
| | | | | Change-Id: I4bf8086e4413b4acb851d67919ac1014705bab03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Made pulsedevices high priority than oss for recordingLing Hu2012-05-251-1/+1
| | | | | | Change-Id: Iae607d3ee0bcaa21142e264edb32ed0e631a4a03 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Gst backend: allow rendering other video buffers than allocatedDmytro Poplavskiy2012-05-142-2/+6
| | | | | | | | | | | | Moved checking the buffer type to the buffer pool instead of comparing the buffer type in QVideoSurfaceGstSink. Some gstreamer elements may push other buffer instance than provided by sink but with the same data pointer. Change-Id: Iab3bf4da2d5eeb5d2a9375aa609a89515b067ce3 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Adapt to _qpa file rename in qtbase.Girish Ramakrishnan2012-05-093-3/+3
| | | | | | | | qtbase change 36547f4eff44361f7a6acd0cff107c0e47561f93 renamed qpa headers. Change-Id: I3d2f08fb969bf1b448b0105032d6111c6643a7a7 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Implement QGstreamerVideoRenderer::stopRenderer()Lev Zelenskiy2012-05-031-0/+5
| | | | | | | | | | Surface has to be stopped when QGstreamerVideoRendererInterface::stopRenderer() is called. This fixes a media player issue when video output is not cleared when media is set to 0. Change-Id: Ifdc851797519dcdf95db86e8dcec93b3866c388e Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Split gstreamer plugin into smaller plugins providing fewer servicesJonas Rabbe2012-04-2716-1/+3759
| | | | | | | | | | | | | | The gstreamer blob has been split into four plugins: audiodecoder, camerabin, mediacapture, and mediaplayer. Note: camerabin is still disabled because it is untested camerabin2 implementation. A new qmake configuration use_gstreamer_camera has been introduced and is needed for the mediacapture plugin to expose the camera service. This configuration has been disabled by default. Shared functionality has been moved to the internal gsttools library. Change-Id: Ifb2604f440cfa97513d39f5d7978766c88eaec45 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* gst player: clear the buffer pool when the video sink is stoppedDmytro Poplavskiy2012-04-201-1/+9
| | | | | | | | Buffers were kept allocated until the player is destroyed or next media played. Change-Id: I8a0c85da3a82ac6883075a1d0674143783c7f010 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* qvideosurfacegstsink: fixed calculation of supported formats.Dmytro Poplavskiy2012-04-201-2/+19
| | | | | | | | | | If the custom buffer pool is used, it's also necessary to query the list of video surface formats with this handle type. Change-Id: I8a38f4c75f37ed05fbfdcf0933023a6abef1b3e1 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Ensure GstBus is available during GstBusHelper lifetime.Dmytro Poplavskiy2012-04-051-0/+2
| | | | | Change-Id: I6fc867e3c7a6ad1f83938d3dc0500ea339c39fe2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved video plugins around to prevent accidental unloadingJonas Rabbe2012-04-021-1/+1
| | | | | | | | | | | | If several different plugins are located in the same place, and are loaded by different instances of QFactoryLoader, like we use, then plugins that are used elsewhere can be unloaded. By ensuring that the plugins are alone in their directory, then they will not have this problem. Change-Id: Id95b81ddf46435278fe43a4769e2d39f6b973a84 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
* Deliver GStreamer signals through Qt event loopqt-v5.0.0-alpha1Sami Rosendahl2012-03-271-6/+19
| | | | | | | | | | Emitting a Qt signal directly from GLib callback causes issues to clients. Queue the GStreamer signal and forward it to as a Qt signal from a handler that is invoked via the Qt event loop. Task-number: QTBUG-24927 Change-Id: I3c91efcce1261caf7b643fbff10663e1b093f2a8 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* resolving some warnings in qtmultimedia docsAngus Cummings2012-03-222-2/+2
| | | | | Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* gst video surface sink: start surface with correct handle typeDmytro Poplavskiy2012-03-141-4/+12
| | | | | | | The handle type should match one from the currently used buffer pool. Change-Id: I33f7856a742299ce0640f331898c3cbe5cfbdf97 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix a few memory leaks.Michael Goddard2012-03-051-2/+6
| | | | | | | | XV Buffer pool was leaking, the sink delegate was leaking, and the sink wasn't chaining to parent class so GstObject stuff was leaking. Change-Id: I5d6b6fe59dfb2b3c5367dfde8331e5943167b55d Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix a few audiodecoder things.Michael Goddard2012-02-211-4/+8
| | | | | | | | Beef up the autotest a little, and check the conversion. Change-Id: Ifffca118e092eb6c388db50a6eb12810a87aa32a Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend for audio decoder service.Lev Zelenskiy2012-02-171-1/+63
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-162-11/+99
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed gst bus helper when qt build without glib supportDmytro Poplavskiy2012-02-101-92/+39
| | | | | | | | The bus helper should not be singleton. Also combined glib and non glib cases. Change-Id: Ie18a94bfdb5413a92a5c4ff4283527360737d52d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-061-4/+59
| | | | | | | | | | Do not display prerolled frames in stopped state. Instead store prerolled frame and display it only after switching to pause or playback state. Added new unit test with a sample video file to check this functionality. Change-Id: I3fd159a199b65ca10fdf9843af5675c5ae9dad05 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: fixed prerolled frames renderingLev Zelenskiy2012-02-061-6/+9
| | | | | | | | Don't use queued render request if it's called from the object own thread. Change-Id: I61ac11f5cf68edf82d0681c95123e804869d0647 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-307-7/+7
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-237-7/+7
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-125-5/+5
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-062-2/+2
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-133-21/+31
| | | | | | | | | The X11 buffer pool was using outdated APIs, and as the 'qpa' configuration value is being removed, it caused the X11 code to be pulled in, and therefore cause compilation failures. Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>