summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed QML video playback on MacDmytro Poplavskiy2012-06-298-12/+493
| | | | | | | | | | | | Use the same CIImage based video frames as with QGraphicsVideoItem, but since CIImages can't be rendered directly in Scene Graph, the frame is rendered to FBO first. Task-number: QT-5423 Change-Id: I16f7e6351578bae21f8642a8028538c441e1f544 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst Capture: image capture fixesDmytro Poplavskiy2012-06-293-2/+25
| | | | | | | | | Report camera is ready to capture only in image capture modes; Emit capture failed if camera not configured for capture Change-Id: Ia2b92e2f8c760db948185a29c3e5ceae81dd3af4 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Gst capture service: capture mode fixesDmytro Poplavskiy2012-06-293-6/+22
| | | | | | | | | | Fixed reporting the current capture mode Set the correct default capture mode Allow viewfinder only and Video+Image capture modes Change-Id: Ib12504304bca22fe664631ff5ffbc0a392ba34a8 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
* Gst capture: don't wait for pipeline to stopDmytro Poplavskiy2012-06-292-15/+0
| | | | | | | | State changes to lower state are synchronous in gstreamer Change-Id: Ib87eabfeee9ec100f24efbaa989ec909ac7f9a1b Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Allow gst video capture startup without viewfinder attached.Dmytro Poplavskiy2012-06-291-1/+2
| | | | | | Change-Id: I5f0b7dc12f4ee8e988d6107047d963949bcdb5bf Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Refactoring wmf pluginLing Hu2012-06-2910-22/+42
| | | | | | | | make mf startup/shutdwon inside plugin instead of player component make sourceresolver a common component for a wmf related tasks. Change-Id: I49cdc4fa512a62398a68cd2be2f522f567d11c7c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed a WMF seek bug.Ling Hu2012-06-291-2/+2
| | | | | Change-Id: I1f077a045dad94127e747dd3f8c8566559aef5a2 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename availabilityError to availability.Michael Goddard2012-06-2932-114/+113
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename a few controls.Michael Goddard2012-06-2948-206/+206
| | | | | | | | | | 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>
* Read actual period size after initializing a stream.Lev Zelenskiy2012-06-281-3/+9
| | | | | | | QTBUG-23833 Change-Id: I2bd352cf34d12e1be22f640c47fc2388dc3a7f8a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix header path for audio engine on Mac.Michael Goddard2012-06-272-5/+9
| | | | | | | There's a different prefix here. Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Allow frequences up to 96000 in QAudioInput win32 backend.Lev Zelenskiy2012-06-271-1/+1
| | | | | | | QTBUG-26102 Change-Id: I1c594f7df4aea2292045e1e96f58926d97bcfd82 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-06-271-6/+7
| | | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I8276e56766684efd26b78dc019ff871ebac28408 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@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>
* Add blackberry backendThomas McGuire2012-06-2615-0/+2027
| | | | | | Change-Id: I88be743f0cad94d4beabdae917758be7e4293bfd Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-06-261-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-2514-33/+14
| | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* fix bogus conditionalOswald Buddenhagen2012-06-251-1/+1
| | | | | | | | | | | this code meant (alsa && linux) || openbsd || freebsd, which is presumably not what was meant. but the os test seems rather pointless in the first place, so just remove it. Change-Id: I2591c9307ab9d6e821625b24797259ed60e9a082 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* switch to new-style configure testsOswald Buddenhagen2012-06-258-17/+17
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-252-4/+3
| | | | | Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add default initialisation to various multimedia classesMithra Pattison2012-06-254-12/+27
| | | | | Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fixed some crash with WMF backendLing Hu2012-06-256-25/+51
| | | | | Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix namespace compilation.Toby Tomkins2012-06-2511-12/+25
| | | | | | Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the QtBase/lib directory as a library path, not just frameworks.Michael Goddard2012-06-251-1/+1
| | | | | | | | This meant that any non-framework libraries there weren't found (like the multimedia helper libraries). Change-Id: Iacd99f82763d39fc47c779c9498dfd5e1cc0e743 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix QAudioOutput volume on OSX.Michael Goddard2012-06-202-0/+29
| | | | | | Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove the USE_COCOA #ifdef, it's always defined now.Michael Goddard2012-06-201-2/+0
| | | | | Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Enabled wmf plugin on Windows againLing Hu2012-06-206-12/+13
| | | | | Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* fix volume handling on WindowsMaurice Kalinowski2012-06-202-0/+25
| | | | | | | | | | | volume handling for QAudioOutput is broken currently as it fallbacks to the default implementation. Need to cache the volume, as hWaveOut is invalid while the output is not in active state. Task-number: QTBUG-25454 Change-Id: I2adb28a5e6719a5d3c360553abd70af46b646080 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QIODevice* is used, but QIODevice was never declaredThiago Macieira2012-06-191-1/+1
| | | | | | | | After I made qpair.h no longer include qdatastream.h, which included qiodevice.h. Change-Id: Icae2b466e022d3394ce5cafceeb4ea6601f6d33f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix a number of other qdoc issues.Michael Goddard2012-06-1531-421/+565
| | | | | | | | | | | | | | * Several places needed the forward class declaration hack * Missing/wrong minor version numbers on imports * A few typos * Any number of attempts to work around qdoc * A few missing docs * Tweaked soundeffect docs Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Tweak the controls documentation.Michael Goddard2012-06-1538-37/+37
| | | | | | | | Also move the qaudioendpointselector control into controls. Change-Id: Ia21f98a683eb38a9c11c42f6e7901d7d841aae90 Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-142-23/+50
| | | | | | | | Seeking is sometimes asynchronous, and more importantly nearly every one using a slider for seeking ends up with a binding loop. Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Updating brief layout of QML typesAngus Cummings2012-06-1419-21/+21
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Fix build on Windows with new qdatetime.h that doesn't redefine min/maxSimon Hausmann2012-06-133-1/+5
| | | | | | | | | | Windows system header files redefine min/max, unless NOMINMAX is defined. In some cases we can simply include qt_windows.h, which does the trick, in other cases including qt_windows.h produces different compilation errors and it's simpler to just do the NOMINMAX trick. Change-Id: I3cf81bab7c239363adfa274f158bdf999d1d3ecd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Reduce the usage of QAbstractVideoBufferPrivate.Michael Goddard2012-06-133-13/+6
| | | | | | | | Move the handle type to the base class (since it's always needed) and don't allocate the private class in the default paths. Change-Id: I870a315310ce740f07b1d43cedecfce21feae505 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Clarify documentation about QAudioDecoder::read and blocking.Michael Goddard2012-06-132-9/+13
| | | | | | | | | It doesn't block - not safe to implement in all cases. Applications can implement blocking semantics based on their usage of event loops or threads. Change-Id: If9a6b1ae7014df63a43989c4940524bc5eaae383 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Renaming StopppedState to StoppedStateAngus Cummings2012-06-135-10/+10
| | | | | Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Enable auto resume of playback for gstreamer mediaplayerLing Hu2012-06-122-31/+44
| | | | | | | | | The resource policy now supports implicit auto-resume, so it is better to cooperate with that in mediaplayer to enable auto resume playback after resource lost. Change-Id: Iba0d28e64fa864dd6332a62e915316d48a12a533 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Adding qdoc workaround to all control classesAngus Cummings2012-06-1227-3/+61
| | | | | Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the legacy QML API.Michael Goddard2012-06-0811-2189/+322
| | | | | | | | This means no version 4.0 (which was never released) and no Qt.multimediakit alternative import. Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fixing some doc errors for overviewAngus Cummings2012-06-083-2/+11
| | | | | Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix compilation without QtWidgets and QtOpenGL on MacKent Hansen2012-06-074-6/+13
| | | | | Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QAbstractVideoBuffer::release virtual methodDmytro Poplavskiy2012-06-073-1/+16
| | | | | | | | | | | | | | It's useful when the buffer pool stores QAbstractVideoBuffer instances instead of underlying system buffers and allows to avoid reallocation of QAbstractVideoBuffer instances. The default implementation deletes the buffer, so this change is source compatible. Change-Id: I7dadd7dac529748b5eb33e5aa7c2d0578b8b1634 Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed encoding options from Audio/Video encoding controlsDmytro Poplavskiy2012-06-0710-116/+0
| | | | | | | | | | | They are replaced with encoding options from QAudio/Video/ImageEncoderSettings. This also allows to specify options without requesting controls. Change-Id: I507e68cdb8cb46325689804d27c6d0561cada50b Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* A number of documentation fixes.Michael Goddard2012-06-079-29/+36
| | | | | | | | | | | | | | * Remove references to private QMediaServiceProvider class and point new backend writers to irc/mailing lists * Wrong or missing parameter names * Fix a few links * Correct a few property data types * Various other things to keep qdoc happier Change-Id: I5c8800d65c00f0783541afef35990bd3918acab7 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* Clarify the metadata functionality of QMediaPlayer.Michael Goddard2012-06-072-11/+24
| | | | | | | | | | | By linking to QMediaObject functions. Also clean that up a bit so it's a bit more useful for people looking for higher level functionality. Change-Id: Ie452122c4d55f88326a7b71c5882dfe38f489791 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* QVideoWindowControl moved to QtMultimedia, fix docs.Michael Goddard2012-06-071-2/+3
| | | | | Change-Id: I870e5997822b60d8fba07e28ff907cbb3fef6036 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Use QPointer instead of QWeakPointer to track QObjects.Stephen Kelly2012-06-075-13/+17
| | | | | | | The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove the last remainders of the old plugin systemLars Knoll2012-06-057-27/+18
| | | | | | | | | | | Port the last two currently unused plugins (v4l and wmf) over to the new plugin format. Fix documentation that still mentioned Q_EXPORT_PLUGIN. Change-Id: I18200dd792e8973687e92180fc41d11395b35132 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Call the base QQuickItem geometryChanged function in our override.Michael Goddard2012-06-051-0/+2
| | | | | | | | Otherwise you get strange errors like the width/height of a VideoOutput element are 0. Change-Id: Ib123112b513f5ed2f0ce24da6dbfe00e20551d74 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>