summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer
Commit message (Collapse)AuthorAgeFilesLines
* clean up qmake-generated projectsOswald Buddenhagen2012-02-221-1/+0
| | | | | | | | remove assignmets which are defaults or bogus Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a few audiodecoder things.Michael Goddard2012-02-213-73/+99
| | | | | | | | 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-173-73/+182
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a partial gstreamer based audio decoder service.Michael Goddard2012-02-1712-11/+916
| | | | | | | Doesn't work yet. Change-Id: Iebd085d68346cb73af8df59c84e8e52a17de2a52 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QMediaRecorder: GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-163-0/+113
| | | | | | | | QGstreamerCaptureSession: Using GStreamer buffer probe to access media data. Change-Id: I2ee38e864fbd69fcba9efe90d4dcf138528e00c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-168-3/+593
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-062-2/+2
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-061-2/+8
| | | | | | | | | | 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>
* Added metaDataChanged(key,value) signal to metadata controls.Dmytro Poplavskiy2012-02-063-25/+35
| | | | | | | | | | | | | | It may be more efficient and convenient for application to use this signal instead of metaDataChanged(). metaDataChanged() signal is emitted for compatibility, backends should emit both signals. Signal added QMetadataReader/WritterControl, QMediaObject and QMediaRecorder. Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-013-7/+7
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3098-98/+98
| | | | | | | | | | 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>
* Fix some static analysis defects.Michael Goddard2012-01-253-10/+11
| | | | | | | | | A few silly errors, a few unlikely errors, a few changes that should not have resulted in a problem but makes the code clearer. Change-Id: Id2c82e9317d53822e4da13c94dec9595ea33b07a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Disabled CameraBin2 based camera backend.Dmytro Poplavskiy2012-01-231-3/+4
| | | | | | | It's not currently tested enough to be enabled. Change-Id: I3c8eb7a81af982b6c98b733755d19c78f2f1c5ed Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2398-98/+98
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed metadata keys type from enum to QString.Dmytro Poplavskiy2012-01-2011-261/+194
| | | | | | | | This allows to combine metaData and extendedMetaData and simplify metadata handling on both backend and application sides. Change-Id: I136eedc86c215be3485db101c43069ca7c82101b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use US spelling for organization.Michael Goddard2012-01-193-3/+3
| | | | | | | | Since it seems it was never implemented, don't keep the legacy spelling. Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed QCamera::captureMode property to QFlagsDmytro Poplavskiy2012-01-176-19/+19
| | | | | | | | | This enables the expression of extra camera modes like viewfinder only or capture during video recording. Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06 Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix build for the camera support of QtMultimedia GStreamer plugin.Alexis Menard2012-01-142-17/+1
| | | | | | | | | Include the correct header file (it was renamed) and also remove duplicate declaration. Change-Id: I2683851e9fd0978427273c4739f47b54e1af743b Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-1290-90/+90
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-111-3/+3
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-0612-50/+67
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-068-8/+8
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-051-1/+1
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix readyChanged signal emit in gstreamervideorendererMithra Pattison2011-12-211-6/+5
| | | | | | | | | | Modified handling of source update in gstreamervideorenderer as the existing logic meant that it would never emit the readyChanged signal. Change-Id: I0a1488cfc151388fe0145d231001e502e9f45f0e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-1310-50/+38
| | | | | | | | | 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>
* Fixed QtMultimedia core namespace compilation.Toby Tomkins2011-11-2532-37/+107
| | | | | Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile; QDesktopServices -> QStandardPathsRohan McGovern2011-10-241-2/+2
| | | | | | | Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd. Change-Id: Ie0d79eaee5c6fedfaacae69800f6aec9190f83db Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-1231-2388/+27
| | | | | | | | | | Cleaned up configuration of gstreamer with a separate config test. Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379 Reviewed-on: http://codereview.qt-project.org/6459 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-0716-204/+204
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Gst player backend: don't show the first frame when resuming playback.Dmytro Poplavskiy2011-09-274-3/+55
| | | | | | | | | | | | | | | It's necessary to temporarily disable show-preroll-frame of video sink, load pipeline to paused state, seek to requested position, and after seeking is finished (position updated) playback is started with show-preroll-frame restored. Task-number: MOBILITY-3030 Reviewed-by: Jonas Rabbe Change-Id: Ide1e6d909dd53f670229c293bc6be496a54e8626 (cherry picked from commit 625cce87e28fc7b5ec8785824affb3129fd3607b) Reviewed-on: http://codereview.qt-project.org/5500 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Move resource policy usage to a config test.Michael Goddard2011-09-263-9/+6
| | | | | | | | | MeeGo uses this too. Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2 Reviewed-on: http://codereview.qt-project.org/5447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Camerabin backend: fixed compilation without X11Dmytro Poplavskiy2011-09-171-0/+3
| | | | | | | | | Disable video widget and overlay controls on systems without X11 Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00 Reviewed-on: http://codereview.qt-project.org/4850 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Compile with refactorGunnar Sletta2011-09-177-9/+9
| | | | | | | Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Build fix after refactorLasse Holmstedt2011-09-135-5/+5
| | | | Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
* Fix some compiler warnings.Michael Goddard2011-09-054-2/+13
| | | | | | | | | Mostly about deprecated ASCII casts. Change-Id: I70428913799c15f20a1a5f80be57848e1072e058 Reviewed-on: http://codereview.qt.nokia.com/4158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakitMichael Goddard2011-08-3034-959/+818
|\ | | | | | | Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
| * Ported gstreamer camera backend from camerabin to camerabin2.Dmytro Poplavskiy2011-08-2419-795/+608
| | | | | | | | | | | | | | Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e Reviewed-on: http://codereview.qt.nokia.com/2994 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| * Gstreamer media backend cleanup.Dmytro Poplavskiy2011-08-0520-164/+210
| | | | | | | | | | | | | | | | | | | | | | Moved controls specific bus/sync messages handling from player/camera/capture session to corresponding controls. Reviewed-by: Michael Goddard Change-Id: Ieb67976ed335b0ef1cde87dc60e8ad8da3409526 Reviewed-on: http://codereview.qt.nokia.com/2535 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.Michael Goddard2011-08-251-1/+1
|/ | | | | | | Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6 Reviewed-on: http://codereview.qt.nokia.com/2665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Gst backend: Fixed deadlock when pipeline is stopped during prerolling.Dmytro Poplavskiy2011-07-252-7/+27
| | | | | | | | | | | | | | | | | | | | Waiting for start() to be invoked in the main thread may block if gstreamer blocks the main thread until this call is finished. This situation is rare and usually caused by setState(Null) while pipeline is being prerolled. The proper solution to this involves controlling gstreamer pipeline from other thread than video surface. Currently start() fails if wait() timed out. Task-number: QTMOBILITY-1663 Reviewed-by: Michael Goddard Change-Id: Ib95e589a814e53efb9b4c454ef9f233658ff8c6a (cherry picked from commit ac9762e2dbc06d696c6c74825ee22ac1fc176d9c) Reviewed-on: http://codereview.qt.nokia.com/2073 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add some debug output in QMediaPlayer gstreamer backend for convenienceLing Hu2011-07-251-0/+53
| | | | | | | | | Change-Id: I5c4beec63ededc39bda7ae69dce721d118921b83 Reviewed-by: Michael Goddard (cherry picked from commit 3119b89f549b2fc03a213c355323b1ef31aa20e9) Reviewed-on: http://codereview.qt.nokia.com/2072 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the configuration tests.Michael Goddard2011-07-252-3/+3
| | | | | | | | | | Add the list of tests to sync.profile, and make sure each test only happens on the platforms it's intended for. Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4 Reviewed-on: http://codereview.qt.nokia.com/1910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add install rule for pluginshawcroft2011-07-211-0/+3
| | | | | | | Change-Id: Icd204cd7eb53af73fcaec3af41b4881592e0d044 Reviewed-on: http://codereview.qt.nokia.com/1919 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile; removed useless use of qRound with integersRohan McGovern2011-07-211-1/+1
| | | | | | | | | | | qRound of an integer type never made sense. Since 2dcd3939a8bd5ff743e4c87f87b2d81b1a101467 in qtbase, it won't compile any more. Change-Id: Ia30334bc92236d0fef9b6ac99d65bae4fe79dc57 Reviewed-on: http://codereview.qt.nokia.com/1905 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove most of the "mobility" references.Michael Goddard2011-07-19109-109/+109
| | | | | | | | | Docs still need some fixing, but there are some legitimate usages of it there. Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162 Reviewed-on: http://codereview.qt.nokia.com/1736 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove some obsolete bits.Michael Goddard2011-07-1819-333/+11
| | | | | | | | | They can be updated again later when things are more stable, if needed. Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27 Reviewed-on: http://codereview.qt.nokia.com/1724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update licenseheader text in source files for qtmultimediakit Qt moduleJyri Tahtela2011-07-08111-1889/+1889
| | | | | | | | Replace old license header with correct one. Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308 Reviewed-on: http://codereview.qt.nokia.com/1318 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Fix playback problem with RTSP streaming for QMediaPlayer(gstreamer)Ling Hu2011-07-053-3/+34
| | | | | | | | Change-Id: Ie920cbb5a377e810aee3e106bb50deb46365ce3b Reviewed-by:Michael Goddard (cherry picked from commit 05841ae6a9e0ffac623f9b00565bf33a52a22ecd) Reviewed-on: http://codereview.qt.nokia.com/983 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Gst player backend: increased network timeout.Dmytro Poplavskiy2011-07-051-4/+5
| | | | | | | | | | | | | 5 seconds timeout is to short, increased to 30 seconds. Task-number: MOBILITY-3013 Reviewed-by: Michael Goddard (cherry picked from commit cf230f948de63c7755c7759b3e14a02ad14cb185) Change-Id: I41d62ac1ed15f2c09af6fd804723096996d16139 Reviewed-on: http://codereview.qt.nokia.com/974 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
* Disabled alsa on maemo devices.Dmytro Poplavskiy2011-07-051-1/+1
| | | | | | | | | | Reviewed-by: Michael Goddard (cherry picked from commit f13421482c5a4d0bf6e20d96517060c5ff2c6785) Change-Id: I43bceede31026353108ca9eefc251520257cca4e Reviewed-on: http://codereview.qt.nokia.com/973 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 22:39:45 +0000