Commit Graph

543 Commits

Author SHA1 Message Date
Mithra Pattison
5705f70da1 Add default initialisation to various multimedia classes
Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-25 06:39:11 +02:00
Ling Hu
1b7da9e0ad Fixed some crash with WMF backend
Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 06:39:08 +02:00
Toby Tomkins
6d301388e1 Fix namespace compilation.
Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-25 06:39:04 +02:00
Michael Goddard
d006d874ba Add a few things to the .gitignore file.
A few Mac specific things, plus .o files.

Change-Id: I7273977666a07cdf39cf0916bc5c2dbede30af05
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-25 06:39:00 +02:00
Michael Goddard
89898e4499 Add the QtBase/lib directory as a library path, not just frameworks.
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>
2012-06-25 06:38:56 +02:00
Michael Goddard
eb92be7ede Fix QAudioOutput volume on OSX.
Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-20 09:11:28 +02:00
Mithra Pattison
84ca713760 Fix target executable name in audiooutput example
Change-Id: I4481879366f136370f4bd549bb2ef2f8764cf821
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-20 09:11:28 +02:00
Michael Goddard
be14e367fd Remove the USE_COCOA #ifdef, it's always defined now.
Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-20 07:59:05 +02:00
Ling Hu
bd071a3853 Enabled wmf plugin on Windows again
Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-20 06:41:49 +02:00
Maurice Kalinowski
6d2883e7ed fix volume handling on Windows
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>
2012-06-20 00:30:57 +02:00
Thiago Macieira
4bbbffeebc QIODevice* is used, but QIODevice was never declared
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>
2012-06-19 21:58:02 +02:00
Michael Goddard
6931cbb35a Fix a number of other qdoc issues.
* 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>
2012-06-15 08:49:29 +02:00
Michael Goddard
e975897ad7 Tweak the controls documentation.
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>
2012-06-15 08:49:26 +02:00
Michael Goddard
c88abd0177 Replace a writable position() property with a seek() method.
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>
2012-06-14 05:42:49 +02:00
Angus Cummings
940ef93c30 Updating brief layout of QML types
Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
2012-06-14 05:42:49 +02:00
Angus Cummings
a34ff2d3e0 More doc things
Changing case in some titles
Other misc wording changes

Change-Id: Ie56a390de0c5ee8f80876555d3d9139819fc5a73
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-14 05:42:49 +02:00
Alan Alpert
f5644b3648 Update folderlistmodel import to version 2
To help distinguish the QtQuick 1 and QtQuick 2 versions of
folderlistmodel, the QtQuick 2 version is now version 2 of
folderlistmodel.

Depends on e824fa97e4a9fbaa0c850274b448568953692240 in qtdeclarative

Change-Id: Ic30c255ecb4c7b12dcf624b4b1d51cbc82b779df
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-14 04:47:58 +02:00
Simon Hausmann
40a95ed42c Fix build on Windows with new qdatetime.h that doesn't redefine min/max
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>
2012-06-13 12:19:17 +02:00
Michael Goddard
d1b0862ad4 Reduce the usage of QAbstractVideoBufferPrivate.
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>
2012-06-13 05:53:53 +02:00
Michael Goddard
f5e3fdc4a7 Clarify documentation about QAudioDecoder::read and blocking.
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>
2012-06-13 05:53:50 +02:00
Angus Cummings
80f37d2d80 Renaming StopppedState to StoppedState
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-13 05:53:47 +02:00
Ling Hu
931c2d3ffe Enable auto resume of playback for gstreamer mediaplayer
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>
2012-06-12 06:33:09 +02:00
Angus Cummings
28605b8f74 Adding qdoc workaround to all control classes
Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-12 05:09:00 +02:00
Michael Goddard
342b8b9be5 Remove the legacy QML API.
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>
2012-06-08 07:53:23 +02:00
Angus Cummings
4000a180dd Fixing some doc errors for overview
Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-08 06:02:32 +02:00
Kent Hansen
2d8f81b857 Fix compilation without QtWidgets and QtOpenGL on Mac
Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-07 09:37:07 +02:00
Kent Hansen
d91d3b9b18 Don't use QtWidgets/QApplication in autotests
These tests don't link against QtWidgets; including QGuiApplication
is sufficient.

Change-Id: I96812af7ac5ef79a9602acf4b51498350e8e50e1
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-07 08:28:08 +02:00
Dmytro Poplavskiy
74383cb40c Added QAbstractVideoBuffer::release virtual method
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>
2012-06-07 08:28:08 +02:00
Dmytro Poplavskiy
62749d654d Removed encoding options from Audio/Video encoding controls
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>
2012-06-07 08:28:08 +02:00
Michael Goddard
f53788ae42 A number of documentation fixes.
* 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>
2012-06-07 07:05:57 +02:00
Michael Goddard
a8ec84e3ca Clarify the metadata functionality of QMediaPlayer.
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>
2012-06-07 07:01:42 +02:00
Michael Goddard
32337e5440 QVideoWindowControl moved to QtMultimedia, fix docs.
Change-Id: I870e5997822b60d8fba07e28ff907cbb3fef6036
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-07 05:03:31 +02:00
Stephen Kelly
b93032a7df Use QPointer instead of QWeakPointer to track QObjects.
The latter is to be deprecated.

Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-07 02:17:22 +02:00
Lars Knoll
487010e579 Remove the last remainders of the old plugin system
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>
2012-06-05 12:44:29 +02:00
Michael Goddard
aae2e2104b Call the base QQuickItem geometryChanged function in our override.
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>
2012-06-05 06:12:03 +02:00
Kent Hansen
71e25920da Avoid string-based, dynamic lookup of signals
Qt5 has a new function QMetaMethod::fromSignal() for obtaining
the meta-method that corresponds to a particular signal (member
function).

This also avoids calling the virtual metaObject() function to
resolve the meta-method every time the signal is emitted; it is
known at compile-time which class the signals are defined in,
so it's safe to retain the meta-methods across calls.

Change-Id: I47328ec2dfc335c570fb18bcd304a2ee405bfd6e
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-05 04:20:47 +02:00
Oswald Buddenhagen
9219ba76fd add multimediawidgets before gsttools to SUBDIRS
the build dependency does not override the qmake processing order, but
this will become important soon.

Change-Id: I8ef88285f9c12829080e6f5e1cc0349dd59f83b8
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-01 08:33:29 +02:00
Angus Cummings
786ecd937c ensure important docs are built by the automated publisher
this workaround makes sure that qdoc can find the \class
and \namespace declarations.

Change-Id: I950e6fbc10064f438d7f282ff20783acdf20de27
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-01 07:25:57 +02:00
Angus Cummings
2e7c9e650c Renaming the QML overview page
There is a requirement that we refer to internal QML
groups as 'API' rather than 'plugin'

Change-Id: I8dc19435cf3f0d24f714b9840f5b83c6c74f7fa8
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-01 06:35:50 +02:00
Angus Cummings
e063610527 Fixing doc errors in MediaPlayer and CameraFlash
properties were not showing up for either type. There were
namespace errors in flash, and mediaplayer docs needed to
be copied from audio.

Change-Id: I53fa721ec9e0cfa1aee3586c7e3eb608b9a1b465
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-01 06:35:41 +02:00
Johannes Zellner
a95de846d9 Add gstreamer.json to OTHER_FILES
Change-Id: Ic063a2bd96c9445b6d1af049df6cf3e33572d547
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
2012-06-01 00:10:47 +02:00
Dmytro Poplavskiy
9ce3b81cff Fixed not initialized QVideoFrame mappedCount member
Change-Id: Ic0b915df120222b0bb440698c010f0e83ccce8c3
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-05-30 06:50:18 +02:00
bigbearzhu
d722d30171 Release string after gst_cap_to_string is called.
Change-Id: I4bf8086e4413b4acb851d67919ac1014705bab03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-28 08:03:08 +02:00
Ling Hu
4d0bb08351 Made pulsedevices high priority than oss for recording
Change-Id: Iae607d3ee0bcaa21142e264edb32ed0e631a4a03
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-25 09:12:57 +02:00
Dmytro Poplavskiy
b51e1bfa66 Replaced camera viewfinder resolution control with settings control
It allows to specify a number of camera fiewfinder parameters
including frame rate, resolution and pixel format.

It also allows to extend the list of parameters without breaking source
or binary compatibility.

Change-Id: Ibea85a968ab7ee7b8d1ae34c7fcbac8f5586f53f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-05-22 03:42:05 +02:00
Angus Cummings
f11c5c83a0 Reordering audio overview doc
Trying to put more common use cases earlier in the
list of implementation details.

Change-Id: I11195d5d2f7846dec3342d43fe3917fb13374daa
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-21 21:19:49 +02:00
Johannes Zellner
2564dbec68 Fix compilation when appsrc is not available.
Change-Id: I96c9aad94b5eb0734854bc7cf0126cad6841c0cd
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-05-21 20:28:56 +02:00
Dmytro Poplavskiy
63db99a8ee Added custom parameters to Audio/Video/ImageEncodingSettings
This allows to specify more advanced and system/codec specific settings

Change-Id: Ia0a2e94eaf56df285a219018e0beab895a2e7c2a
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-18 05:28:35 +02:00
Dmytro Poplavskiy
f965f683d0 Added missing QDeclarativeCamera::CaptureViewfinder enum value
Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-18 05:28:32 +02:00
Dmytro Poplavskiy
9fb8bdd509 Fixed typo in QCamera::Status documentation
Change-Id: I8ee9db0e91eceaa20a46713370a9cbd03ead6444
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-18 05:28:29 +02:00