summaryrefslogtreecommitdiffstats
path: root/examples/video
Commit message (Collapse)AuthorAgeFilesLines
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-143-1/+3
| | | | | | | | 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>
* Update folderlistmodel import to version 2Alan Alpert2012-06-142-2/+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>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-142-4/+4
| | | | | | | Use QtQml instead. Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-044-4/+4
| | | | | | | | | | 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>
* Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.Friedemann Kleint2012-04-245-7/+7
| | | | | | | Remove QDeclarative compatibility module code. Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use small-screen layout in qmlvideo, qmlvideofx examples on HarmattanGareth Stockwell2012-03-121-0/+5
| | | | | Change-Id: Ieaaca763630acfb81a1b5b5cfef2d08367a9e265 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated qmlvideofx to use MediaPlayer.autoPlay instead of playingGareth Stockwell2012-03-121-1/+1
| | | | | Change-Id: Iee9066a6c7fcddbe6054e9c505b24e478f63cb4d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix shader file loading in qmlvideofx exampleGareth Stockwell2012-02-131-1/+23
| | | | | | | | | | | | | | 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>
* Disable flicking of qmlvideofx example parameter panelGareth Stockwell2012-02-131-0/+1
| | | | | Change-Id: I4cf563c288aaf37fe60ba1ec56ffc9fd72060b99 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Improve usability of qmlvideofx example on small touchscreensGareth Stockwell2012-02-135-50/+60
| | | | | | | | | | | * 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>
* Fixed 'magnify' shader in qmlvideofx exampleGareth Stockwell2012-02-091-5/+8
| | | | | | | | 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>
* Enable qmlvideofx window to be resized, when large screen layout usedGareth Stockwell2012-02-085-6/+43
| | | | | Change-Id: I3010b9fd5f68e922ff94edd4d08d8114c689c037 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Tidy up frame rate display in video examplesGareth Stockwell2012-02-087-52/+110
| | | | | | | | | | | | | | | * 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>
* Tidy up file browsing in video examplesGareth Stockwell2012-02-087-632/+672
| | | | | | | | | * 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>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30125-125/+125
| | | | | | | | | | 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>
* Update in line with recent QWindow API changeAlan Alpert2012-01-252-3/+2
| | | | | Change-Id: Id495215c7861f05849ffbfd1a0e66af9990a1365 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23125-125/+125
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated QtMultimedia declarative module to version 5.0Jonas Rabbe2012-01-115-5/+5
| | | | | | | | | | | | The QtMultimedia module should have version 5.0 to align with Qt 5 in general. This change updates the version, but keeps 4.0 versions of the elements for compatability purposes. Documentation and examples has also been updated to reflect this version change. Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-061-13/+1
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-06125-125/+125
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix namespace compilation.Michael Goddard2011-12-225-8/+4
| | | | | | | By removing unnamespaced forward decls. Change-Id: Icccb34092ef7451d29f52db08811a2152c50e4b8 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix some of the effects in qmlvideofxMichael Goddard2011-12-224-7/+8
| | | | | | | | | | | * TiltShift was sometimes applying the effect in the wrong place. * Blur had some QML properties duplicated * Blur kernel wasn't quite summing to 1, and was applying opacity twice * The target width for the second pass was incorrect, so it was blending darkness, resulting in a dreary image. Change-Id: Ib8ba93d979c597cf4d225b3d24d26a22d0cdffc2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Disable some build time messages.Michael Goddard2011-12-224-7/+0
| | | | | Change-Id: I5a46b36c72f4307471cfe77f055706539a77049c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Express qmlvideofx effect parameters declarativelyGareth Stockwell2011-12-2229-222/+225
| | | | | | | | | | Each effect item now exposes a ListModel property which describes the set of user-controllable parameters. This model is used by the ParameterPanel component to generate a ListView whose delegate displays the parameter name and a slider. Change-Id: Ib26877fe434d8b746ef621e0b4adbcbe1ed9aaa8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add qmlvideo and qmlvideofx examplesGareth Stockwell2011-12-22154-0/+11467
Based on code imported from master branch of QtMobility repo, ported to Qt Quick 2. Task-number: QTBUG-23118 Change-Id: Ifd297de0e595c675ff1a8e3218d91b03629295b9 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>