Commit Graph

188 Commits

Author SHA1 Message Date
Yoann Lopes
439d5b0e53 QVideoWidget: fixed setFullScreen(false) on the Xcb platform.
Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget.
Requires change I3616dc0f in qtbase to work.
Because of a bug in some X window managers, the order in which
setWindowFlags() and showNormal() are called has been changed.

Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-01 09:31:28 +02:00
Venugopal Shivashankar
43a00f366f Doc: Moved example documentation and images
Changed to adhere to the new documentation structure
outlined here:
http://qt-project.org/wiki/Qt_Documentation_Structure

Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-26 17:47:43 +02:00
Yoann Lopes
28c053ccad Use QVideoWidget in the videowidget example.
The videowidget example now uses QVideoWidget instead of a custom
QAbstractVideoSurface, the former being the most straightforward and
fastest way of showing a video in a QWidget.

The old code has been moved to a new example: "customvideosurface".

Change-Id: I15fb4482d0e77bafd24d4cb03316fc8f4ef13c35
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-09-26 12:18:30 +02:00
Iikka Eklund
dcbbad869e Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-24 09:05:51 +02:00
Tasuku Suzuki
c15b2833ba Make compile with -no-widgets
Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 10:29:23 +02:00
Tasuku Suzuki
474540eb43 remove useless dependency in qmlvideofx.pro
Change-Id: Ie79cc9294f3845c089525195684df4a60171f78c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 11:13:41 +02:00
Stephen Kelly
3613a14b38 Use Qt::WindowFlags, not Qt::WFlags.
The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.

Change-Id: I576a04e60c59e0bdf60da9c07e4d2917fc02a491
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-13 18:41:44 +02:00
Lars Knoll
aeb8cfe2a2 Remove the WA_PaintOnScreen widget attribute for vide widgets
This attribute doesn't quite do what it used to do in
Qt 4.x anymore, and will lead to Qt not painting the video
at all.

Change-Id: I2338815756cab82ae152058ff5a7b5f14e07001e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2012-08-08 15:49:16 +02:00
Michael Goddard
3a5a59ed85 Add 32 bit support (int/float) support to audioinput example.
Change-Id: Ib7160f60af36cdccfe91a620f5555189792c13c4
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-03 07:05:46 +02:00
Thiago Macieira
e015f72189 QRegion::subtract is deprecated
This code was suspicious. It looks like it was broken, caught by the
gotcha that the old API was.

Change-Id: Ief9543de3b9fdf18f6b620c9462a75594a4a3903
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-02 07:28:30 +02:00
Thiago Macieira
218fff76d5 QAbstractItemMode::reset() is deprecated, don't use it
Instead, use beginResetModel() before the model is reset, and add
endResetModel() after it.

Change-Id: Ibac3f2207ed999ed9d703266509b3ad91203f28d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-08-01 22:27:37 +02:00
Dmytro Poplavskiy
0d0e89b1e8 Ported QML camera example to QtQuick 2.0 and QtMultimedia 5.0
Removed controls not currently supported on Qt5 platforms
and added basic video capture mode

Change-Id: I1f188d31af770cfb6ebb65ab5ee4a5467abcfbeb
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:52 +02:00
Lev Zelenskiy
b915c5e0e7 Player example histogram: Process frames on a separate thread
Change-Id: I6989f9ea9cb6e45c54ed75079a5b5748e15ee0d8
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:47 +02:00
Mithra Pattison
9a3538fc50 Update example QML to follow API change
QML for ListView API in qmlvideo and qmlvideofx was modified.
Usage of this API in FileBrowser file required changes to
follow the new API.

Change-Id: I3da25ed5bc696a72cdefc6c72d2ab95c319b758c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-16 07:18:21 +02:00
Mithra Pattison
fdc197d614 Fix include path error in shadow build of audiorecorder example
Change-Id: Iafe726c4b84b728d084b3085bb13e5055e96bb8b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-16 07:18:02 +02:00
Mithra Pattison
53fdcca366 Delete obsolete class methods and update related code
Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-10 08:26:04 +02:00
Mithra Pattison
dde8dc46f0 Fix installation of spectrum example
Fixed setup of spectrum project, to correctly install the spectrum
executable.

Task-number: QTBUG-13018
Change-Id: Ifcc55d02cf0e50f9c1015fa89b5f2d851b2a44c4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-02 02:59:10 +02:00
Lev Zelenskiy
1c81d25e4f 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>
2012-06-26 05:26:42 +02:00
Oswald Buddenhagen
82ade38b11 switch to new-style configure tests
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-25 10:40:03 +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
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
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
Kent Hansen
68680fc661 Don't use QtDeclarative compat module
Use QtQml instead.

Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-14 05:34:32 +02:00
Oswald Buddenhagen
bd5afd94bb 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>
2012-05-09 01:27:44 +02:00
Thiago Macieira
b2b92dad82 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>
2012-05-04 13:36:08 +02:00
Friedemann Kleint
5ae3adcfa9 Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
Remove QDeclarative compatibility module code.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-24 11:47:54 +02:00
Michael Goddard
e057fd9e8a Move QAudioDecoder to public.
To get better feedback between alpha & beta.

Change-Id: I3620825fb9c2bb9de69951cf1d583b191d62cb0d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-04-11 03:32:00 +02:00
Jonas Rabbe
8e82f57c6a Updated declarative components to use the QML module
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-03-14 05:55:40 +01:00
Gareth Stockwell
2b73f92a7f Use small-screen layout in qmlvideo, qmlvideofx examples on Harmattan
Change-Id: Ieaaca763630acfb81a1b5b5cfef2d08367a9e265
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-03-12 07:36:04 +01:00
Gareth Stockwell
e42e467af4 Updated qmlvideofx to use MediaPlayer.autoPlay instead of playing
Change-Id: Iee9066a6c7fcddbe6054e9c505b24e478f63cb4d
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-03-12 07:36:01 +01:00
Michael Goddard
2a8463711c Expose availability from the backend to C++ and QML.
The availabilityError property was static based on the service, but it
can change at run time, so add the plumbing to allow the backend to
report it itself.

Also make sure that both QML and C++ expose the availability.

The radio tuner and data controls previously had properties (but no
signals) for availability - these have been removed.

Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-03-02 09:30:34 +01:00
Lev Zelenskiy
c9b3f247c7 Audio decoder example.
Change-Id: I0f9fb755ef8bc6f66696a06996ac7a9f13de69cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-27 05:26:51 +01:00
Lev Zelenskiy
b37ea41ce1 Audio recorder example updated to display level using QAudioProbe.
Change-Id: I7d5aea306aeb3cd9109615f9ed4905c53125233a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-24 06:51:30 +01:00
Lev Zelenskiy
03a14a95fe Video player example updated to display histogram using QVideoProbe.
Change-Id: Iaeba751280133bd405fe90a0d5d07be446c95738
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-24 06:51:30 +01:00
Oswald Buddenhagen
e791e4f0e9 clean up qmake-generated projects
remove assignmets which are defaults or bogus

Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-22 00:17:05 +01:00
Michael Goddard
4f38f950b0 Fix some compiler warnings.
As it turns out, we had an overloaded virtual from an earlier era,
with the extra parameter never used.  So cleaning that up was a
bonus to remove the compiler warning.

Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-14 08:30:40 +01:00
Gareth Stockwell
1ee21da63e Fix shader file loading in qmlvideofx example
Each effect is implemented as a QML element, whose
fragment/vertexShaderFilename properties specify paths from which
shader programs are loaded.  These paths are relative to the application
installation directory, e.g. "shaders/billboard.fsh".  If the current
directory from which the application is launched does not match the
installation directory, shader program loading fails.  This patch
converts the relative filename provided by the QML element into an
absolute path before attempting to open the file.

Change-Id: I8ed39d271c4f1f59180588843e500ed73a93a543
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-13 03:01:49 +01:00
Gareth Stockwell
f21c62394e Disable flicking of qmlvideofx example parameter panel
Change-Id: I4cf563c288aaf37fe60ba1ec56ffc9fd72060b99
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-13 01:31:00 +01:00
Gareth Stockwell
a93be80d33 Improve usability of qmlvideofx example on small touchscreens
* Add tolerance to mouse press detection on divider and slider grips,
  so that clicks just outside of the grip radius are treated as if the
  click was inside the grip.
* When slider bar outside of grip radius is clicked, increment slider
  position by a fixed amount, towards the click position.

Change-Id: Iefb0b274ee5a97ed5cb789596bf6b3c07a7fc8b8
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-13 01:30:57 +01:00
Michael Goddard
db781f29e0 Add some recent things to the overview docs.
Also clean up a few other doc related bits and pieces.

Change-Id: I56714e1811e38a7225131c1d141430b49f5f509c
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-09 01:33:18 +01:00
Gareth Stockwell
50a80cd083 Fixed 'magnify' shader in qmlvideofx example
Previous shader caused untransformed pixels (those outside of the lens)
radius to be offset slightly from their original positions.

Change-Id: I4df847fdc40073a55da8777981c3fdd373937658
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-09 00:42:27 +01:00
Gareth Stockwell
5c0629b571 Enable qmlvideofx window to be resized, when large screen layout used
Change-Id: I3010b9fd5f68e922ff94edd4d08d8114c689c037
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-08 22:34:08 +01:00
Gareth Stockwell
c1ec175b24 Tidy up frame rate display in video examples
* Use a Column element to position QML and video frame rate counters.
* When using small-screen layouts, hide frame rate counters when dialogs
  or menus are displayed.
* Do not display instantaneous frame rate.  If changes in this rate
  trigger a repaint, then the rate itself is changed.  If the repaint
  occurs in less time than the QElapsedTimer resolution, the displayed
  instantaneous rate is always zero.
* Add a label, so it is clear which is the QML repaint rate, and which
  is the video frame rate.

Change-Id: Ie58ab162ab44bd7f1c4b297eed929b9baa73552c
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-08 22:30:49 +01:00
Gareth Stockwell
b6f54c8833 Tidy up file browsing in video examples
* Use QStandardPaths to determine the initial folder displayed when
  the file browser is launched
* Persist folder between file browser invocations

Change-Id: I5b86dd3d304c3f33802f3189716e1d360774198d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-08 22:30:34 +01:00
Ling Hu
809bbc35c6 Add AudioEngine with new implementation
Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-06 05:35:28 +01:00
Michael Goddard
78ffd1bc18 Remove QMediaImageViewer (SC break).
This class has turned out to be not very useful at this point in time.

Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-03 03:21:43 +01:00
Jason McDonald
5e801e2793 Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-30 07:08:05 +01:00
Michael Goddard
3b00730eca Add a volume (gain) property to QAudioInput.
Only implemented for PulseAudio so far, but the API does explain that
it's optional.

Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-01-25 07:18:48 +01:00
Alan Alpert
8aef60c1cf Update in line with recent QWindow API change
Change-Id: Id495215c7861f05849ffbfd1a0e66af9990a1365
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-25 06:15:06 +01:00
Jason McDonald
6390157fd7 Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.

Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-23 04:21:51 +01:00