Lev Zelenskiy [Tue, 26 Jun 2012 02:45:58 +0000 (12:45 +1000)]
Clean buffers before closing the input device.
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>
Thiago Macieira [Tue, 26 Jun 2012 15:33:27 +0000 (17:33 +0200)]
syncX() doesn't do anything anymore. Remove it.
Change-Id: Id15af428e1d04606564bad093847b3dc5a731e85
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thomas McGuire [Tue, 3 Apr 2012 13:26:56 +0000 (15:26 +0200)]
Add blackberry backend
Change-Id: I88be743f0cad94d4beabdae917758be7e4293bfd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Tue, 26 Jun 2012 04:03:54 +0000 (14:03 +1000)]
Added support for big endian data to QAudioOutput win32 backend.
Convert data from big endian to little endian.
QTBUG-19881
Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Toby Tomkins [Mon, 25 Jun 2012 07:13:24 +0000 (17:13 +1000)]
Remove insignificant flag from tests that are passing.
Change-Id: I246d7cfa79cbbbee3cfc4a354b38c155aa887aa2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Tue, 26 Jun 2012 05:22:16 +0000 (15:22 +1000)]
Add expected fail flags for consistently failing autotests.
Task-number: QTBUG-26320
Change-Id: I58624a8c39c0c247d9073097616a7a78e7e307da
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Lev Zelenskiy [Tue, 26 Jun 2012 02:07:20 +0000 (12:07 +1000)]
Fix crash in audioinput and audiooutput examples.
Do not call tr while initializing static objects.
Change-Id: Ia75ddd53ae22b0e4179f174da7d933156744e261
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
bigbearzhu [Tue, 26 Jun 2012 00:48:26 +0000 (10:48 +1000)]
Fixed a testing bug.
Change-Id: Iff7fb6d4de2f38fde37019ea7e8b034707f8bbe1
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Oswald Buddenhagen [Tue, 22 May 2012 17:17:51 +0000 (19:17 +0200)]
build system cleanups
- 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>
Oswald Buddenhagen [Thu, 5 Apr 2012 14:04:20 +0000 (16:04 +0200)]
fix bogus conditional
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>
Oswald Buddenhagen [Thu, 5 Apr 2012 12:29:09 +0000 (14:29 +0200)]
switch to new-style configure tests
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 09:07:13 +0000 (11:07 +0200)]
auto-generate module pris
Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Mithra Pattison [Wed, 30 May 2012 05:31:39 +0000 (15:31 +1000)]
Add default initialisation to various multimedia classes
Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Ling Hu [Thu, 21 Jun 2012 06:18:05 +0000 (16:18 +1000)]
Fixed some crash with WMF backend
Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Toby Tomkins [Thu, 21 Jun 2012 03:37:23 +0000 (13:37 +1000)]
Fix namespace compilation.
Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Michael Goddard [Mon, 25 Jun 2012 01:16:27 +0000 (11:16 +1000)]
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>
Michael Goddard [Mon, 25 Jun 2012 04:24:16 +0000 (14:24 +1000)]
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>
Michael Goddard [Wed, 20 Jun 2012 05:53:39 +0000 (15:53 +1000)]
Fix QAudioOutput volume on OSX.
Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Mithra Pattison [Wed, 20 Jun 2012 05:00:48 +0000 (15:00 +1000)]
Fix target executable name in audiooutput example
Change-Id: I4481879366f136370f4bd549bb2ef2f8764cf821
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Wed, 20 Jun 2012 05:03:47 +0000 (15:03 +1000)]
Remove the USE_COCOA #ifdef, it's always defined now.
Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Ling Hu [Wed, 20 Jun 2012 02:01:24 +0000 (12:01 +1000)]
Enabled wmf plugin on Windows again
Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Maurice Kalinowski [Tue, 19 Jun 2012 10:32:32 +0000 (12:32 +0200)]
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>
Thiago Macieira [Tue, 19 Jun 2012 10:24:37 +0000 (12:24 +0200)]
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>
Michael Goddard [Wed, 13 Jun 2012 03:52:05 +0000 (13:52 +1000)]
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>
Michael Goddard [Thu, 14 Jun 2012 05:03:30 +0000 (15:03 +1000)]
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>
Michael Goddard [Tue, 12 Jun 2012 07:18:03 +0000 (17:18 +1000)]
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>
Angus Cummings [Thu, 14 Jun 2012 01:49:54 +0000 (11:49 +1000)]
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>
Angus Cummings [Thu, 14 Jun 2012 01:03:33 +0000 (11:03 +1000)]
More doc things
Changing case in some titles
Other misc wording changes
Change-Id: Ie56a390de0c5ee8f80876555d3d9139819fc5a73
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Alan Alpert [Thu, 14 Jun 2012 01:29:04 +0000 (11:29 +1000)]
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>
Simon Hausmann [Wed, 13 Jun 2012 10:13:36 +0000 (12:13 +0200)]
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>
Michael Goddard [Tue, 12 Jun 2012 04:54:22 +0000 (14:54 +1000)]
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>
Michael Goddard [Tue, 12 Jun 2012 01:27:24 +0000 (11:27 +1000)]
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>
Angus Cummings [Thu, 7 Jun 2012 01:01:28 +0000 (11:01 +1000)]
Renaming StopppedState to StoppedState
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Ling Hu [Fri, 8 Jun 2012 04:57:56 +0000 (14:57 +1000)]
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>
Angus Cummings [Fri, 8 Jun 2012 03:50:06 +0000 (13:50 +1000)]
Adding qdoc workaround to all control classes
Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Fri, 8 Jun 2012 00:57:15 +0000 (10:57 +1000)]
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>
Angus Cummings [Fri, 8 Jun 2012 03:58:31 +0000 (13:58 +1000)]
Fixing some doc errors for overview
Change-Id: Ic502abf295d402678bb28e68bfacc76ae05ee8ec
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Kent Hansen [Wed, 6 Jun 2012 20:21:39 +0000 (22:21 +0200)]
Fix compilation without QtWidgets and QtOpenGL on Mac
Change-Id: I3cff7e41d27955e37bc8207e4820fdc21ce75f7b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Kent Hansen [Wed, 6 Jun 2012 12:43:33 +0000 (14:43 +0200)]
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>
Dmytro Poplavskiy [Wed, 6 Jun 2012 04:35:42 +0000 (14:35 +1000)]
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>
Dmytro Poplavskiy [Wed, 6 Jun 2012 04:06:04 +0000 (14:06 +1000)]
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>
Michael Goddard [Wed, 6 Jun 2012 02:28:34 +0000 (12:28 +1000)]
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>
Michael Goddard [Tue, 5 Jun 2012 06:36:35 +0000 (16:36 +1000)]
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>
Michael Goddard [Tue, 5 Jun 2012 02:24:59 +0000 (12:24 +1000)]
QVideoWindowControl moved to QtMultimedia, fix docs.
Change-Id: I870e5997822b60d8fba07e28ff907cbb3fef6036
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Stephen Kelly [Wed, 6 Jun 2012 09:39:59 +0000 (11:39 +0200)]
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>
Lars Knoll [Sun, 27 May 2012 10:20:55 +0000 (12:20 +0200)]
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>
Michael Goddard [Tue, 5 Jun 2012 03:27:52 +0000 (13:27 +1000)]
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>
Kent Hansen [Sun, 3 Jun 2012 21:06:48 +0000 (23:06 +0200)]
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>
Oswald Buddenhagen [Tue, 22 May 2012 16:04:58 +0000 (18:04 +0200)]
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>
Angus Cummings [Fri, 1 Jun 2012 03:02:18 +0000 (13:02 +1000)]
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>
Angus Cummings [Thu, 31 May 2012 01:57:21 +0000 (11:57 +1000)]
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>
Angus Cummings [Tue, 22 May 2012 01:32:50 +0000 (11:32 +1000)]
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>
Johannes Zellner [Thu, 31 May 2012 22:14:57 +0000 (15:14 -0700)]
Add gstreamer.json to OTHER_FILES
Change-Id: Ic063a2bd96c9445b6d1af049df6cf3e33572d547
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Dmytro Poplavskiy [Tue, 29 May 2012 04:09:15 +0000 (14:09 +1000)]
Fixed not initialized QVideoFrame mappedCount member
Change-Id: Ic0b915df120222b0bb440698c010f0e83ccce8c3
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
bigbearzhu [Mon, 28 May 2012 05:51:03 +0000 (15:51 +1000)]
Release string after gst_cap_to_string is called.
Change-Id: I4bf8086e4413b4acb851d67919ac1014705bab03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Ling Hu [Fri, 25 May 2012 06:39:55 +0000 (16:39 +1000)]
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>
Dmytro Poplavskiy [Fri, 18 May 2012 04:38:54 +0000 (14:38 +1000)]
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>
Angus Cummings [Fri, 18 May 2012 01:24:18 +0000 (11:24 +1000)]
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>
Johannes Zellner [Fri, 11 May 2012 23:20:26 +0000 (16:20 -0700)]
Fix compilation when appsrc is not available.
Change-Id: I96c9aad94b5eb0734854bc7cf0126cad6841c0cd
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Dmytro Poplavskiy [Fri, 18 May 2012 00:26:51 +0000 (10:26 +1000)]
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>
Dmytro Poplavskiy [Fri, 18 May 2012 01:53:45 +0000 (11:53 +1000)]
Added missing QDeclarativeCamera::CaptureViewfinder enum value
Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Fri, 18 May 2012 01:56:08 +0000 (11:56 +1000)]
Fixed typo in QCamera::Status documentation
Change-Id: I8ee9db0e91eceaa20a46713370a9cbd03ead6444
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Wed, 16 May 2012 04:05:45 +0000 (14:05 +1000)]
QML VideoOutput: don't keep video frames for more than necessary
The frame can be released as soon as it pushed to video node.
Change-Id: Ib2621cc2a001629e722bf15b6e1ca09323170870
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Wed, 16 May 2012 03:25:38 +0000 (13:25 +1000)]
Expose camera status to QML Camera element
It's exposed as Camera.cameraStatus property.
Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Angus Cummings [Fri, 11 May 2012 01:13:45 +0000 (11:13 +1000)]
Very minor C++ doc changes
Reordering some enum's so values are listed ascending
Replace 'The' with 'the' in some briefs
Change-Id: Ibc5042389687598ddaaf11e72acaa688b85fd4cf
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Angus Cummings [Mon, 30 Apr 2012 06:49:23 +0000 (16:49 +1000)]
Minor doc fixes for QML
renaming QML element to QML type
removing some \fn tags that were making the docs not build
some rewording
some new signal docs
Change-Id: I9b350dad1780276959aef4105e53b91082a6083e
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Dmytro Poplavskiy [Mon, 14 May 2012 03:10:09 +0000 (13:10 +1000)]
Gst backend: allow rendering other video buffers than allocated
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>
Dmytro Poplavskiy [Mon, 14 May 2012 01:54:55 +0000 (11:54 +1000)]
Fixed QML Camera errors reporting
Added missing connection to QCamera::error() signal
Added Camera.errorCode property
Change-Id: Ie0dd71d760b4b5b79b2aefaba97bc383ef2a9750
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Fri, 11 May 2012 05:45:08 +0000 (15:45 +1000)]
Improved QDeclarativeCameraRecorder errors reporting
Added QDeclarativeCameraRecorder::Error enum to allow
specify error codes as CameraRecorder.FormatError.
Added QDeclarativeCameraRecorder::errorCode property.
Change-Id: Iac5522c3110591493b98e59db18dbfc2d3b7496f
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Fri, 11 May 2012 05:32:02 +0000 (15:32 +1000)]
Added QMediaRecorder::OutOfSpaceError error code
Change-Id: Ib09208a84f83f00992878f881ee2120932779a16
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Lev Zelenskiy [Fri, 11 May 2012 05:42:04 +0000 (15:42 +1000)]
GStreamer player session: remove code for old playbin.
We only support 'playbin2'.
Change-Id: Ibe35f71377862cb83742c2f9b606c5e2fdd5199d
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Tue, 8 May 2012 04:06:30 +0000 (14:06 +1000)]
QAudioOutput: low-latency related changes.
- Decrease timer period to 10ms;
- Set PulseAudio buffer size if specified by the user;
- Set PulseAudio buffer size to 40ms if not specified;
- Always request 1 chunk of data at a time in pull mode;
Change-Id: If95c097c67c3342f733bde9e699518741d7ef991
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Kent Hansen [Thu, 10 May 2012 13:57:06 +0000 (15:57 +0200)]
Don't use QtDeclarative compat module
Use QtQml instead.
Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Wed, 9 May 2012 02:02:54 +0000 (12:02 +1000)]
Update duration information after switching to PLAYING state.
For rtsp streams duration information might not be available
until playback starts.
Change-Id: Id8829408a4bd2c0fc6a89f2d059d23a5a95d940e
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Fri, 11 May 2012 04:47:03 +0000 (14:47 +1000)]
When resource is lost pause the pipeline instead of stopping it.
Change-Id: Iccbf2f820ec6373d5853accc064dad659858514c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Angus Cummings [Fri, 11 May 2012 04:59:31 +0000 (14:59 +1000)]
Renaming audioengine overview to Positional Audio
Change-Id: I1688b5e76f7b3a8eecd5fcf060717b49f7a36f4e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Fri, 11 May 2012 01:36:15 +0000 (11:36 +1000)]
QGStreamerPlayerSession: unref pads after using them.
Change-Id: I3eec73eca5c2da3c449f362da8639a6dfb52a9e9
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Fri, 11 May 2012 00:39:40 +0000 (10:39 +1000)]
QGstreamerMetaDataProvider: fix keys not mapped properly.
Add a key which is mapped against the QGstreamerMetaDataKeyLookup,
not the original Gstreamer key.
Change-Id: I2e20b102e97b9a3a7909ff925f195cd0bdff1775
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Dmytro Poplavskiy [Wed, 9 May 2012 02:32:45 +0000 (12:32 +1000)]
Gst played: removed GST_SEEK_FLAG_ACCURATE flag
Forcing accurate seeking may be very slow for some files,
it's not intended to be used with media players.
Change-Id: I9fe759f6effa447a800aeea321cc46617c64866f
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Mithra Pattison [Wed, 9 May 2012 04:32:03 +0000 (14:32 +1000)]
Change timeout on qcamera capture tests to QTRY_VERIFY
Previous timeout was causing sporadic test failures
Change-Id: I9b30c0245e16838fafce6a4977d75aaddb6f5fdd
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Oswald Buddenhagen [Thu, 5 Apr 2012 12:26:16 +0000 (14:26 +0200)]
delete unused file
Change-Id: I15ad0f30859a3133993f0a75ed0d09bb5ef9cdf5
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Oswald Buddenhagen [Mon, 16 Apr 2012 12:54:54 +0000 (14:54 +0200)]
fix project file
"console" is CONFIG, not QT.
also, it doesn't look too convincing if an example uses private headers
...
Change-Id: I5bc128c6268901c9842f8b842d6344bd32fc7d1e
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Girish Ramakrishnan [Tue, 8 May 2012 07:10:06 +0000 (00:10 -0700)]
Adapt to _qpa file rename in qtbase.
qtbase change
36547f4eff44361f7a6acd0cff107c0e47561f93
renamed qpa headers.
Change-Id: I3d2f08fb969bf1b448b0105032d6111c6643a7a7
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Dmytro Poplavskiy [Thu, 3 May 2012 07:48:13 +0000 (17:48 +1000)]
Declare and register metatypes for media encoder settings classes
Change-Id: Ib3a42409045fe55c7a410b5ec52bd284f3475417
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Thiago Macieira [Thu, 3 May 2012 14:58:59 +0000 (16:58 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: Ic591779a3431999c007fb0ff362c7e25ce54097e
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Thomas McGuire [Thu, 5 Apr 2012 13:53:44 +0000 (15:53 +0200)]
Support QVideoWindowControl in the QtQuick Video element.
Change-Id: I953899a3ec92856955d36528057b0d45f9c26394
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thomas McGuire [Thu, 26 Apr 2012 17:16:39 +0000 (19:16 +0200)]
Improve .gitignore
Change-Id: I4e9fd33f199b90a4b7c8cf8b9fcc6d18c532842d
Reviewed-by: Debao Zhang <dbzhang800@gmail.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Lev Zelenskiy [Thu, 3 May 2012 01:34:33 +0000 (11:34 +1000)]
Implement QGstreamerVideoRenderer::stopRenderer()
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>
Dmytro Poplavskiy [Wed, 2 May 2012 03:52:15 +0000 (13:52 +1000)]
Fixed typo in QMediaRecorder::Status metatype registration
Change-Id: Id370b272b6c6c992762b1aefecb6cfbc7c916f2a
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Wed, 2 May 2012 01:15:44 +0000 (11:15 +1000)]
Replaced QMediaRecorderControl::play/stop/pause with setState
This allows to introduce new states without breaking BC.
Change-Id: I03c064cec92d6745b251a51cfb301e7f01f4b765
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Tue, 1 May 2012 03:10:33 +0000 (13:10 +1000)]
Added QMediaRecorder::status property
QMediaRecorder::state property represents the user request and
changed synchronously during record(), pause() or stop() calls.
Recorder status is changed asynchronously
and represents the actual status of media recorder.
This also makes API more consistent with QMediaPlayer and QCamera.
Change-Id: I80b4aaa70bb88e555c492908da8c29d0fc5ed5ea
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Dmytro Poplavskiy [Mon, 30 Apr 2012 05:48:04 +0000 (15:48 +1000)]
Added QCamera::UnloadingStatus and StoppingStatus values.
These statuses are useful when the camera is stopped and/or unloaded
asynchronously. Previously the status was changed to
LoadedStatus or UnloadedStatus immediately,
even while camera was still active.
Change-Id: Id11021a150b0d34791ea631d7a62086cc0727220
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Friedemann Kleint [Mon, 30 Apr 2012 13:05:31 +0000 (15:05 +0200)]
QtMultimedia: Fix deprecation warnings.
Use QVariant::canConvert instead qVariantCanConvert.
Change-Id: I3c924a0bb508a451623da250fb9d410cf70a91f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jonathan Liu [Fri, 27 Apr 2012 23:34:44 +0000 (09:34 +1000)]
Fix MinGW-w64 compilation
Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jonas Rabbe [Thu, 22 Mar 2012 01:04:03 +0000 (11:04 +1000)]
Split gstreamer plugin into smaller plugins providing fewer services
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>
Lev Zelenskiy [Thu, 26 Apr 2012 06:53:37 +0000 (16:53 +1000)]
QSampleCache unit test: correctly check whether sample is cached.
Use QSample::isCached instead of relying on pointers.
Also added a test for loading an invalid file.
Change-Id: I9f4f1e8c3dc3cdb4a88a756cc6cad85e68c3a1b6
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Lev Zelenskiy [Thu, 26 Apr 2012 06:51:54 +0000 (16:51 +1000)]
QSampleCache: Add a method to check whether a sample is cached.
At the moment there is no way to tell whether a sample
returned by QSampleCache comes from cache.
This functionality is required for a unit test.
Change-Id: Ice23bb39b8e4f0a58b9297b46bb19b9a8c34b53c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Fri, 27 Apr 2012 02:05:20 +0000 (12:05 +1000)]
Fix a compiler warning.
Change-Id: If82ec145b9076c1418460fa4d59595e0a60e5a0f
Reviewed-by: Jun Zhu <jun.5.zhu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Fri, 27 Apr 2012 01:58:50 +0000 (11:58 +1000)]
Fix a possible stale pointer access if we can't connect to PulseAudio.
We free the mainloop but didn't check validity before calling lock or
unlock. Also we might need to unlock the main loop before freeing
it in some other error cases.
Change-Id: Iadf1049324cdf37ca9841b82e53e33afdcba8cb2
Reviewed-by: Jun Zhu <jun.5.zhu@nokia.com>
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Fri, 20 Apr 2012 05:54:39 +0000 (15:54 +1000)]
Make sure the audio/video availability information changes atomically.
So there's a consistent picture of the stream availability.
Change-Id: Id7ea166353c0151fcc11105a1e233e9fe8df9cc6
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>