summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clean up qmake-generated projectsOswald Buddenhagen2012-02-2214-49/+0
| | | | | | | | 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>
* Update audioengine overview doc & reference docLing Hu2012-02-219-96/+103
| | | | | Change-Id: If1061b3dc113f4354d741c536d63cbe36e7a65eb Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a few audiodecoder things.Michael Goddard2012-02-216-87/+322
| | | | | | | | Beef up the autotest a little, and check the conversion. Change-Id: Ifffca118e092eb6c388db50a6eb12810a87aa32a Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix QAudioBuffer sampleCount vs. channelCount.Michael Goddard2012-02-212-13/+48
| | | | | | | | | | | There were some inconsistencies in when the sample count was per channel or in total. The docs mention that it is in total, so fix a few cases where it went wrong and test it. Change-Id: I55c855911fcde66a218d6cdd327e09ad5406d5a4 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the hasAudio/hasVideo properties from MediaPlayer to Video.Michael Goddard2012-02-172-0/+16
| | | | | | Change-Id: I167184c3622c4fcb0843b17f2ab803b0bbf104fa Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend for audio decoder service.Lev Zelenskiy2012-02-178-74/+413
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QAudioDecoderControl::sourceChanged signal.Lev Zelenskiy2012-02-173-0/+10
| | | | | | | | | | The signal is mentioned in QAudioDecoder but is missing from QAudioDecoderControl. Change-Id: I0cd13c53541585098edd02093858501ffb5af1fb Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a partial gstreamer based audio decoder service.Michael Goddard2012-02-1712-11/+916
| | | | | | | Doesn't work yet. Change-Id: Iebd085d68346cb73af8df59c84e8e52a17de2a52 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use QTESTFINDDATA to FIND TEST DATA.Michael Goddard2012-02-171-24/+30
| | | | | | Change-Id: I5fd222e562045085b3d08e19c6544f674e9429d4 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use a PA function to compare specs instead of memcmp.Michael Goddard2012-02-171-1/+1
| | | | | | | | Otherwise valgrind complains a lot. Probably holes in the spec structure. Change-Id: I9580a73255820f49c0ac947eed1595a758f19ccd Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add Video_4.qml to the packaging.Michael Goddard2012-02-171-1/+1
| | | | | | Change-Id: I0a6036a979ab00a2885c56450d1db9497b1cff0c Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QMediaRecorder: GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-163-0/+113
| | | | | | | | QGstreamerCaptureSession: Using GStreamer buffer probe to access media data. Change-Id: I2ee38e864fbd69fcba9efe90d4dcf138528e00c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-1613-24/+777
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some compiler warnings.Michael Goddard2012-02-1413-36/+39
| | | | | | | | | 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>
* Tweak some more documentation.Michael Goddard2012-02-148-149/+107
| | | | | | | | | | | A lot of the previous Qt Mobility API methods were still present, so they are gone now. Also removed some of the C++ documentation since it's not public API anyway. Made a group for camera QML APIs and used that for the list in the camera overview documentation. Change-Id: I0864bd2230a42596e951b68d0df1211766c90dfc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated audio recorder example with screenshot and correct information.Jonas Rabbe2012-02-142-26/+62
| | | | | | | Change-Id: Ibf0dc8df55f20988a949e49b1b434710373f0095 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Documentation updates for declarative camera elements.Michael Goddard2012-02-137-38/+358
| | | | | | | A number of things were missing. Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove duplicates definitions of QTRY_VERIFY and QTRY_COMPARE.Jason McDonald2012-02-132-48/+0
| | | | | | | | | These definitions were already ignored due to #ifndef directives surrounding them, so presumably the differences in timeout values between these definitions and those in testlib are acceptable. Change-Id: Ib860fc1ed27ef0690e619ffeed516f7417ae4cd0 Reviewed-by: Rohan McGovern <rohan.mcgovern@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 gst bus helper when qt build without glib supportDmytro Poplavskiy2012-02-101-92/+39
| | | | | | | | The bus helper should not be singleton. Also combined glib and non glib cases. Change-Id: Ie18a94bfdb5413a92a5c4ff4283527360737d52d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to media probing API.Lev Zelenskiy2012-02-108-2/+56
| | | | | | | Added flush signals. Change-Id: I9c124317e843c9b9011e69c44649ae9a4e974161 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added location specific metadata keys.Dmytro Poplavskiy2012-02-092-0/+76
| | | | | | | | Tags names and meaning matches the exif specification, except of latitude and longitude following Qt Location format. Change-Id: I2acc0194f129ccc737b0fd00ca4ebfb6b62ebdca Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Moved camera testsdakovaci2012-02-092-133/+2
| | | | | | | Moved camera tests out of Qt5Multimedia Change-Id: I571332217dac885810c8fb7a6d28020d4578e55f Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Add some recent things to the overview docs.Michael Goddard2012-02-0918-18/+276
| | | | | | | Also clean up a few other doc related bits and pieces. Change-Id: I56714e1811e38a7225131c1d141430b49f5f509c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated documentation for the QAudioRecorder classJonas Rabbe2012-02-092-3/+29
| | | | | Change-Id: I93ab03e9a386578f0b43ba0e966b1570163ff056 Reviewed-by: Michael Goddard <michael.goddard@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>
* Add the audio decoder variant of QMediaPlayer.Michael Goddard2012-02-0813-4/+1596
| | | | | | | | Rather than the probe based way of doing it. Initially private. Change-Id: I30005f8da22f6451cb9de8eb3f0e193838d48c93 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed possible dependency problem in the qmake structureJonas Rabbe2012-02-081-1/+7
| | | | | | | | | If gstreamer is present, then the gstreamer plugin (and hence the plugins sub directory) should depend on the gst tools library. Change-Id: I6012df02d14731107fc0656089aa27ae61f0ef71 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Remove some more QTest::qWait(10) calls.Michael Goddard2012-02-083-20/+6
| | | | | | | | Since it seems to have changed slightly recently. Just use QTRY_COMPARE instead. Change-Id: I802c2e26acf5418bb5904fadd2a978a44fd9eb01 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added loading of video node factories from pluginsJonas Rabbe2012-02-0812-11/+180
| | | | | | | | | | | | | | | This change will allow us to add new video node factories that can be loaded dynamically at runtime. The previous video node factories, I420 and RGB have been kept as static parts of the Qt Multimedia imports, but can be moved to plugins at a later date. For plugins to be able to find and use QSGVideoNode, the class has to be exported. Change-Id: Idbead9a8ad33619cebe90fcec92eb29cf52ae9bd Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* API changes to QML element MediaPlayer aka AudioAngus Cummings2012-02-0817-585/+3385
| | | | | | | | | | | | | | | | | | Changed Video.qml for new API Removed lowercase enum copies, replaced with calling parent (VideoOutput, MediaPlayer) enums Removed properties playing, paused Removed signals started, resumed Added readonly property playbackState Added signal playing Added autoPlay property Fixed unit tests for new API Added backwards compatibility for QtMultimedia 4 Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add exports for probe classes.Michael Goddard2012-02-074-4/+4
| | | | | | | Oops. Change-Id: I2273ac6789d2eb1042aa1d4b6ec64dac1904ce55 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative camera image processing with C++ API changesDmytro Poplavskiy2012-02-072-41/+42
| | | | | | | | | Changed ranges and meaning of image adjustments parameters. Change-Id: I1710bfabc4f216c83df7983a871bffb474cfbcc2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative camera recorder with C++ API changes.Dmytro Poplavskiy2012-02-072-12/+46
| | | | | | | | | | | Added key,value parameters to metadataChanged() signal; Added a separate actualLocation property to desribe the path of recorded file. It may be different from outputLocation when default location is used. Change-Id: I5a4b77833b6458a19ed7e1dcf7e53fc7400cdf21 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Expose capture request id in the declarative camera.Dmytro Poplavskiy2012-02-072-28/+34
| | | | | | | | It's useful to associate imageCaptured/Saved signals data with capture requests. Change-Id: I3e98c4a194403bd338a1b5313d8736b4baf79961 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add some media probing API.Michael Goddard2012-02-0711-6/+906
| | | | | Change-Id: Ib83918f99b699ac3fbc7ede82a392d00d4c18005 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* tst_qmediaplayerbackend: try to load test file from the current dir.Dmytro Poplavskiy2012-02-071-0/+3
| | | | | | | This makes testing easier on other system than test was build. Change-Id: I75c4d620c8132a7fd298fe735dfdc1bf6f775e08 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a QAudioBuffer class.Michael Goddard2012-02-067-1/+1080
| | | | | | | | Prereq for probing or decoding. The abstract API probably needs to change. Change-Id: Ie0bf796c1f581f34bbc0a8af2dffc387c513a330 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-0622-205/+211
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-065-6/+199
| | | | | | | | | | Do not display prerolled frames in stopped state. Instead store prerolled frame and display it only after switching to pause or playback state. Added new unit test with a sample video file to check this functionality. Change-Id: I3fd159a199b65ca10fdf9843af5675c5ae9dad05 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: fixed prerolled frames renderingLev Zelenskiy2012-02-061-6/+9
| | | | | | | | Don't use queued render request if it's called from the object own thread. Change-Id: I61ac11f5cf68edf82d0681c95123e804869d0647 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Documentation tweaks.Michael Goddard2012-02-0611-9/+72
| | | | | | | | | Mostly move widgets classes into the QtMultimediaWidgets module, but also mark a few mostly internal playlist classes as \internal. A few other tweaks. Change-Id: If0e376410bf2187cafb24f583108c6beb7b910a9 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* QMediaPlayer::setPosition: do not check isSeekable and do not bound by durationLev Zelenskiy2012-02-062-7/+2
| | | | | | | | | | | To allow setPosition to be called in stopped state we no longer check if the player is in seekable state and allow position to be greater than duration. Unit test has been updated accordingly. Change-Id: I29447ffe797a7cc3dcc80d20b2527e9eda493ab6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix some warnings.Michael Goddard2012-02-062-2/+4
| | | | | Change-Id: I2ea7f6f016d34490a41e4c9449cbc92bd040de49 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-0639-6/+6592
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 10:06:47 +0000