review.tizen.org Git - platform/upstream/qtmultimedia.git/log

If the sample hasn't been loaded, don't try and delete things.

Causes entirely reasonable warnings from QCoreApplication::postEvents,
when calling deleteLater on a null pointer.

Change-Id: I5f1fa526b2d57844b9c0d2e634d434e2f7867bdf
Reviewed-by: Ling Hu <ling.hu@nokia.com>

Export QMediaPluginLoader so it can be used by libqgsttools_p.

Change-Id: I2af6a68646cccaa92ae8b85b67e2095dcfee485e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

If Pulse isn't ready, don't crash when trying to play.

Change-Id: I996581e4492004f716d44a39fb5f74c26c9f9ac2
Reviewed-by: Ling Hu <ling.hu@nokia.com>

Fix volume change error on mono stream for soundeffect(pulseaudio)

(Cherry-picked from 663df44fc8563c548c26a7ae21927b09664c28f2)

Change-Id: I005071bc1a8b2eae4d0660042fc8986d61804c47
Reviewed-by: Michael Goddard
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Add cap on internal read/write buffer for QAudioOuput(PA)

cap set to no more than 5x period size

Change-Id: If3ae244993a8929832f6724c386dac6f12ef0f03
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Added support for non QMediaObject based VideoOutput sources.

VideoOutput element checks first for mediaObject property of
source object and if it's not available it checks
for videoSurface property.

It allows to implement video frames generator and connect it
to optimized VideoOutput QML element.

Change-Id: I8ee618cf61b9d9100f25e742c631ea8724c188dc
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Add additional protection on the write size in QAudioOuput(pulseaudio)

Check and cap the write size in pull mode to handle the case
where user returned an invalid write size through QIODevice

Change-Id: Ie0610a63f1d5400fba87f32a99bdc38479e0e7e8
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Changed QVideoSurfaceGstSink to take pools from plugins

Change-Id: Iec743efc52513e2000276b9a18d1d9639c270699
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Remove SkipMode parameter from QSKIP.

The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Ib6225572a46eac7881222fdce192750b8b13ee3b
Reviewed-by: Steve Schilz <sschilz@pasco.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Radio systemtests

Added some radio functionality to match the qlm radio example

Change-Id: Ie0358c3443121b638db406e095467b18b4d6b57c
Reviewed-by: Daron Andrew Edie
(cherry picked from commit 1e542df82fbcc4e3a8f75537af204f83827a4587)
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Add qRegisterMetaTypes for the public Q_DECLARE_METATYPEs.

Also turned qtmedianamespace.qdoc into a cpp file so I
could stick the qRegisterMetaTypes into it.

Change-Id: Idd6d3e2f348f1ed45b0a35ce180d023a170e8625
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Fix pullmode data lost problem in QAudioOutput(pulseaudio)

At each userFeed, m_bytesAvailable is not updated properly in pullmode,
so the pull data size become irrelevent to the size we can actually write.
This problem is fixed by checking the actual writable size each time
before pulling the data and limit the size of the pulled and written data.

Change-Id: I6f53e6348693ddf4e3c79e90d3c3d0c1ffc713aa
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Change the order textures are bound.

Leave texture unit 0 active at the end, since the active texture unit
is not restored by SG itself.

Change-Id: I4970a955fea5c9342cc93c1d1b07ffbfb71e5f04
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Added qRegisterMetatype for QVideoSurfaceFormat.

Change-Id: I7dbae1dde2f24db89479dcb23ef6fc5e29377f25
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Use QAtomicInt::load() and ::store()

The operator=(int) and implicit int cast operators are deprecated
and will be removed.

Change-Id: I5091d705fba45195239c901f210355e09e123faa
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>

Rearrange the automatic tests.

Split them into unit and integration tests. Integration tests really
need to be run on the real platform (not in a VM etc) since they are
somewhat unstable or nonfunctional otherwise.

A few tests were previously broken by QUrl changes and they were repaired.
Removed one test since it was not providing a lot of value.

There are still a number of tests that rely on Q_AUTOTEST_EXPORT symbols.

Change-Id: Ic402abf0af946baa5945075d975b3f584f9ef280
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>

Declare more metatypes and debug operators.

Nearly all of the multimedia metatypes used in the auto tests are
now declared properly, and a large number of the types have debug
operators as well.

Removed the superfluous decls as well.

Change-Id: I42cfe37562db0c71d9811b4577fc326a3326ccc9
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Add a private class, since we now can.

This was a XXX Qt5 thing for binary compatibility. We could also
now use QObjectPrivate if we wanted to.

Change-Id: I7d95e3adf7b0725e91e1e229646a453863e989ed
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

QtMultimedia: Remove qpa-sections from .profiles.

Prepare for removal of the -qpa configure option.

Change-Id: Ibf4be58231d29cd972eb765f32b410e1eb9d7fed
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Fix logic in QAudioDeviceInfoInternal::updateLists()

Task-number: QTBUG-20482

Change-Id: I0dd59a0388965726eb8cfd36a8549250916d999a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Remove the last bits of QtMultimediaKit (*).

Except a comment about it in the module overview.

Change-Id: I22d9111d7917d1a3259ee1e525fd52501733454e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Use deleteLater when called on a decoder error.

Since we cleanup the decoder itself, it can crash when the stack
unwinds back into the decoder code. Similarly on a network error.

Change-Id: Ice36a3008359565f186406945973747b3134d296
Reviewed-by: Ling Hu <ling.hu@nokia.com>
(cherry picked from commit fb10bcf6cea520e1c43a77b6b88cf01ae9dc74ad)

Merge remote branch 'qtmultimedia.git/master'

This replaces the qtmultimedia.git contents with qtmultimediakit.git's
contents (as a merge with -s ours, when run against qtmmk).

Change-Id: I940f84fb09285eb7e37d0aaac07ccc4f3165b04f

Fix config.test

Using "this" in non member function, oops.

Change-Id: I7cda3eea755099af2ff2df7b777e3e228e53e325
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Don't ignore debug plugins on Mac when release plugins aren't available

Previously, we unconditionally ignored any plugins whose names ended
with _debug.dylib. This makes the mediaservice plugins unusable on Mac
if Qt is configured to build plugins as debug-only (which is
incidentally the default).

Change-Id: I5a8981b2251e803fa233b74c968f6eaa452d367c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

We already have a mock backend.

Change-Id: Ic4f9277c4c4bff225ac6cd70d28b495a42435e35
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Declare these metatypes.

Change-Id: I5b10669f2b17f67d95469dc28e99822d7f08280c
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Adapt to QtDeclarative api renaming (QSG --> QQuick)

Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fixed compile; QDesktopServices -> QStandardPaths

Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd.

Change-Id: Ie0d79eaee5c6fedfaacae69800f6aec9190f83db
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Added RDS functionality to the QRadioTuner/QDeclarativeRadio

Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Limit the sequential bytes skipping to a max 16kB at a time.

Otherwise QIODevice::read will try and allocate whatever junk is
passed in, so a corrupt chunk can result in 1GB+ allocations which
are never actually used.

Change-Id: I1ea4a5c1a5d21b1ee6f7e428105c52c0ee6ca7f7
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Fix debug output test - type is qreal, so can be float or double.

Change-Id: Ica34e3076b186c4e4af4492722c1fe00445d3184
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Added testcase to qcamerabackend test CONFIG

To ensure the test case is installed.

Change-Id: I959a1d73e3d8c913c4f15bb9e12b663ca4fb0343
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Fixed build problems with Quicktime

Because the Q_WS_* defines were removed, the Quicktime backend
stopped working. Replacing them with Q_OS_* works. Additionally,
the Quicktimer Player Service has to depend on QtWidgets.

Change-Id: I687b352191c38a91edaaf2a687ac13ed118fcf88
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Doc: Add ability to generate documentation for the module.

-Added targets so that "make docs" will generate the
documentation.

Change-Id: I16a74d7e15e12df16570f110c7e67a110d53afad
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Init mediaobject at classBegin rather than componentComplete

Since we use an explicit backgroundaudio class,
there is no need to wait for other property to determine
the mediaobject type. So it is better to init the mediaobject
at classBegin to prevent being accessed before mediaobject initialized.

Change-Id: Ia55b8b4c1ab70cc0acbf6f49bcb3e20bdb813a88
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Make the C++ API of QSoundEffect public.

The QML API already was. The C++ API still needs good documentation,
though.

Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>

Declarative VideoOutput: added support for more rgb formats.

RGB 565, RGB 32 and BGR 32 formats added,
all of them supported with OpenGL ES.

Change-Id: I026628611c59575af5934bac0a5f95dfbc6770cb
Reviewed-on: http://codereview.qt-project.org/6644
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Copied ALSA config test into QtMultimedia module

The config test which still exists in QtBase should be removed at a
later date, together with pulseaudio and gstreamer config tests.

Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20
Reviewed-on: http://codereview.qt-project.org/6643
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Make sure this library gets installed.

Change-Id: I6b556b3b22deae002d2d2cf47680f23e207b5d00
Reviewed-on: http://codereview.qt-project.org/6639
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Fix qwavedecoder test data deployment on device

- Device deployment changed to use DEPLOYMENT instead of INSTALLS for
test data files
- Test data deployment target fixed to go under binary
installation directory instead of the build directory

Change-Id: I4b0007f9309767083a4a5dfa6f3dc26f3c36c330
Reviewed-on: http://codereview.qt-project.org/6573
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Multimedia: Compile on Windows.

MSVC is more strict about #include <> and #include "".

Reviewed-by: Ling Hu <ling.hu@nokia.com>
Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5
Reviewed-on: http://codereview.qt-project.org/6134
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Moved general gstreamer helper classes into separate library.

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>

Fixed a couple of failing auto tests.

QDeclarativeAudio test is using a fake backend initialised
to a specific volume. The test was testing against a
different volume.

QMediaPlayerWidgets was trying to include QApplication,
but from the wrong place and was not including QtWidgets
module.

Change-Id: I5ca108a040a4f4bd0d7550268f3a4ef5d790e755
Reviewed-on: http://codereview.qt-project.org/6458
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Tests should not be unconditionally excluded.

Change-Id: I3910a03e5c2231f91b84b368339948fbca750f28
Reviewed-on: http://codereview.qt-project.org/6399
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Add QNAM tests to wavedecoder as well, to simulate slow sources.

Change-Id: Ic65659bfdf72aea2cea5ae97de50a1e661db189b
Reviewed-on: http://codereview.qt-project.org/6404
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Rename the parsing error signal to parsingError.

Refactor the error handling code a little.

Change-Id: I717b3aaacb24660b3f26769f19ac718b73106473
Reviewed-on: http://codereview.qt-project.org/6401
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Fix the wavedecoder a little.

Handle RIFX and corrupted files better. Update the autotest so that it
is run properly (and copies files properly in shadow build). Fix the
gendata script to properly create testdata.

Change-Id: I47b705507bebaef54df2835ec767c6b220c64678
Reviewed-on: http://codereview.qt-project.org/6380
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

tests: eliminated usage of qttest_p4.prf

Change-Id: I45f6c818c9dbdcf37c9f5f382b42da9c69618311
Reviewed-on: http://codereview.qt-project.org/6382
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

only corrupt 'data' descriptor nothing else

Change-Id: I5640d13e8c893152e449d348f8bf6c45b899b44d
Reviewed-on: http://codereview.qt-project.org/6283
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

tests: eliminated usage of qttest_p4.prf

qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Change-Id: I3f49fd3b79899eff1d6ad9458143f34419026276
Reviewed-on: http://codereview.qt-project.org/6286
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

Auto test for private class QWaveDecoder

Change-Id: I50ffbc3187ae7d7a7623af3ef7d3fed2975bdbbe
Reviewed-on: http://codereview.qt-project.org/6270
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Sanity-Review: Michael Goddard <michael.goddard@nokia.com>

bail out in case of missing descriptors

Change-Id: I7c231367a4b5ef2d15fd1a7af2c2a6c1d51c9460
Reviewed-on: http://codereview.qt-project.org/6279
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Improve video test coverage and debugging output.

Added a few debug operators for some useful enums, and
added tests for them. One or two other features not really
tested.

Change-Id: Idffec6ade1d4e05dbf72f3dc47dfc0d01ddddf8b
Reviewed-on: http://codereview.qt-project.org/6201
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Rename QtMultimediaKit to QtMultimedia.

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>

Add a new servicename for background mediaplayer

Change-Id: I40b3670462f0b865a9e64bd2abd6d6a01db01e80
Reviewed-on: http://codereview.qt-project.org/4492
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Update background audio element to use new service name

Change-Id: I8f0480e4fb40b034f75dcd900f2d440fd0e7610d
Reviewed-on: http://codereview.qt-project.org/4493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Update audiooutput example with volume slider

Update example for new volume API

Change-Id: I1b9ccbccc62930549e667f0063b3d76feb23a2ea
Reviewed-on: http://codereview.qt-project.org/5662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Add QAudioOutput volume API and pulseaudio backend implementation.

Change-Id: I70784e8d17522a23f6467713d58384b30557694b
Reviewed-on: http://codereview.qt-project.org/5663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Fakeradio: emit signal when scanning aborted

Patch from Sami Nurmenniemi.

Emits searchingChanged(false)
when scanning is aborted because it was initiated too close to
the limits of the frequency range.

Change-Id: I15a1334c8a7058dd8eb413c2742f8f12aed7bed5
Reviewed-on: http://codereview.qt-project.org/5570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Gst player backend: don't show the first frame when resuming playback.

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>

Needs widgets module to build.

Change-Id: I95ba0c64843bfcdfc9797c4d818ac17606e4a1d3
Reviewed-on: http://codereview.qt-project.org/5563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Fix a few QT_BEGIN/END_HEADER pairs.

Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b
Reviewed-on: http://codereview.qt-project.org/5514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Remove QApplication usage - it's in QCoreApplication.

Change-Id: I0c1fab0c0eea56f1ecb141d6238acdf2778c82d8
Reviewed-on: http://codereview.qt-project.org/5513
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>

Move the backend specific documentation into a nicer place.

We really don't need to bore the 99.9% of people who won't care. And
it's certainly not more important than camera.

Reviewed-by: Derick Hawcroft
(cherry picked from commit 51e3a1bc45ffc2688fcd3949216aedda4c41bf81)

Change-Id: I8add47e42c2c06bf5e16f406604a19531af6901e
Reviewed-on: http://codereview.qt-project.org/5501
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fix a playback bug for mediaplayer windows media foundation backend

Task-number:QTMOBILITY-1606

Reviewed-by:Jonas Rabbe
(cherry picked from commit d5426bf52e19c9c6a52837b423f48024979ea076)

Change-Id: Ie7c1c90a8f5a64e77c435ffc1917d8f9638dfff3
Reviewed-on: http://codereview.qt-project.org/5499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fixed directshow config test

In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is
present, but dxtrans.h (which is #included by qedit.h) is missing.

The standard workaround for this issue is already used by
plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds
the same workaround to the config test.

Reviewed-by: Michael Goddard
Reviewed-by: Ling Hu
(cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1)

Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d
Reviewed-on: http://codereview.qt-project.org/5498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fixed a typo in the WMF backend which caused a compilation failure

Reviewed-by: trustme
(cherry picked from commit 7eab979c41513321518d5e3cea6d142bbf4e58d9)

Change-Id: I9cd5de907867ea6561c568d10c88e3bf5a701509
Reviewed-on: http://codereview.qt-project.org/5496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

fix a spelling error

Change-Id: Ic593f342055a4ff65503bd92236ff2904012d4f4
Reviewed-by:Michael Goddard
(cherry picked from commit d9cd5386f6d9aa1c702424d272d70a0b45a6b9db)
Reviewed-on: http://codereview.qt-project.org/5495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fix config.tests for directshow backend.

directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0),
so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow
mediaplayer will also be replaced by wmf backend.

Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b
Reviewed-by:Michael Goddard
(cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2)
Reviewed-on: http://codereview.qt-project.org/5494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fix the config.tests for WMF backend.

Windows SDK v7.0 is required to compile the WMF backend,
so add additional check for MENonFatalError.

Change-Id: I3edb86b8132b8022b30c02ea6289f617aadfc683
Reviewed-by: Michael Goddard
(cherry picked from commit b738126352e5d914ea366b2725b72e2306b39ee2)
Reviewed-on: http://codereview.qt-project.org/5493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit

Conflicts:
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro

Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13

Move resource policy usage to a config test.

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>

Clean some doc warnings.

Change-Id: I9cadc589a02bbc4804d2d21ab30752af375ef89c
Reviewed-on: http://codereview.qt-project.org/5348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>

Add QT_BEGIN/END_HEADER things, plus QT_MODULE thing.

Change-Id: I1a5f51a659175cadadcdaf0c4e5e9048f98e64e0
Reviewed-on: http://codereview.qt-project.org/5346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fix widget dependencies for multimediawidget tests and examples.

Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37
Reviewed-on: http://codereview.qt-project.org/5286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Remove older QGLContext calls in favour of new QOpenGLContext.

Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877
Reviewed-on: http://codereview.qt-project.org/5339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Don't re-set default properties in MediaBase::componentComplete

This is to avoid conflicting with state restore from background playback.

Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc
Reviewed-on: http://codereview.qt-project.org/4397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

add QT+=widgets for tests to run

Change-Id: Idccbb5429f1f081d815b4596f0cf0f74c1160f5c
Reviewed-on: http://codereview.qt-project.org/5188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Added basic radio system tests

Change-Id: I6f3ef3e3c9f1bb851c2d9f9cbad1aea1df77004f
Reviewed-on: http://codereview.qt-project.org/4945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie

Added basic camera system tests

Change-Id: I39cefa9207bf45d57cb735cb1a7335b9153d79ee
Reviewed-on: http://codereview.qt-project.org/4944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie

added basic video system tests

Change-Id: I89cadef1249296c834c4a612f5885439986ff1dc
Reviewed-on: http://codereview.qt-project.org/4943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie

Added basic audio system tests

Change-Id: Ib3cec8adc4cba80a9e91d6fd90c607e99a197c0c
Reviewed-on: http://codereview.qt-project.org/4942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Reviewed-by: Daron Andrew Edie

Camerabin backend: fixed compilation without X11

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 refactor

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 refactor

Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626

QML Camera element redesign.

Grouped camera properties in a similar way to C++ QCamera API.
Added support for video recording.

Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b
Reviewed-on: http://codereview.qt-project.org/3552
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Split some of the autotests into widget and non widget parts.

Since the tests are mostly not widget based.

Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

Silly defs file error.

Change-Id: Ic4c128b6c410701092848048982a8e82a5c58b88
Reviewed-on: http://codereview.qt.nokia.com/4224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Fix some compiler warnings.

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>

Clean up the autotest pro files to remove warnings about private headers

Since the tests are bound to a version it's unnecessary.

Change-Id: I7884615179157caa3836face22a4aa431ee5c425
Reviewed-on: http://codereview.qt.nokia.com/4155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Add background audio element.

Change-Id: I64c91beb7219cc148efc606e87e5f6e57b4b55ce
Reviewed-on: http://codereview.qt.nokia.com/3574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Mark a few tests as insignificant on QPA.

Running with QPA minimal isn't enough for a lot of the video related
tests, and in some cases the backing store code crashes.

Change-Id: I7a09c244fb856397a60c53388b22c3e141737a66
Reviewed-on: http://codereview.qt.nokia.com/4106
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

Add QMediaBackgroundPlaybackControl interface

Allows some media service backend to provide the ability to can play media in the background while the application is terminated.

Change-Id: Ia5e751367f6d6ea6847c3c873b45df5f971557e2
Reviewed-on: http://codereview.qt.nokia.com/3561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

Added tune up and down methods, and changed name of scan methods.

Instead of requiring developers using the radio API to read the
frequency step, adding it to the current frequency and setting the
new frequency, there has been added tuneUp and tuneDown methods.
Also, the searchBackward and searchForward methods have been renamed
to scanDown and scanUp which seem more logical. And cancelSearch
has become cancelScan.

Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e
Reviewed-on: http://codereview.qt.nokia.com/4013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

Merge branch 'radio' into 'master'

Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0

Added QML API for getting the limits for a specific radio band.

Using properties for the frequency step, minimum and maximum
frequency of the currently selected band.
Also updated the declarative-radio example to use the minimum
and maximum frequencies to show a tuner band for the radio.

Change-Id: I9f28f10e98e008c14b10bdc12b0727086cd45f0b
Reviewed-on: http://codereview.qt.nokia.com/3829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>