summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for 5.3.1.v5.3.15.3.1Yoann Lopes2014-06-181-0/+61
| | | | | Change-Id: I197a9c6a0fc623bdb3eafaa5fe970cb6a44546b4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Improved audiooutput and audioinput examples.Yoann Lopes2014-06-162-5/+12
| | | | | | | Always show the default audio device first in the drop-down box. Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-118-353/+353
|\ | | | | | | Change-Id: I689554fb6e47b8183013de271a776909a05398dc
| * Make multimedia QML types available for the 5.3 import version.stableYoann Lopes2014-06-101-0/+5
| | | | | | | | | | | | | | | | At least one type needs to be registered with the 5.3 version number to make it known to the QML engine. Change-Id: Iacfe62650b4194fbb89135fef7cb148309227ce2 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Fix static initialization order fiasco in some plugins.Yoann Lopes2014-06-065-347/+337
| | | | | | | | | | | | | | | | | | Some static variables were initialized using QMediaMetaData values, which are also statically initialized. Task-number: QTBUG-39202 Change-Id: Ibedc0a77d96cdfa575aad122c4ec654e6830e1f7 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| * Android: Use a file descriptor for all local media files.Christian Strømme2014-06-052-6/+11
|/ | | | | | | | | Using a fd is more consistent across different Android versions and also works with files that are in the applications private storage. Task-number: QTBUG-39346 Change-Id: I462822459d12d7842d15f1cb7caafc75c18fe32c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Improve default audio plugin selection.Yoann Lopes2014-06-051-6/+21
| | | | | | | | | When no audio plugin is marked as default, use the first plugin available. Change-Id: Ide8db0fe55f43c4881c24505c1e2821b0fc176f6 Reviewed-by: Dyami Caliri <dyami@dragonframe.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: don't start camera preview until the viewfinder is ready.Yoann Lopes2014-06-052-12/+26
| | | | | | | | | If no video output is set for a camera, don't try to start the camera and report an error. If the video output is not ready, delay starting until it is. Change-Id: Id08e31a4e795b71ac036a6532e9499ca5670d790 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: fix media player's volume.Yoann Lopes2014-06-051-11/+18
| | | | | | | | | - Preserve the volume when changing the current media. - Don't actually set a new volume when the media player is muted. Intead, save the value to apply it when setMuted(false) is called. Change-Id: I829eb280406ea35ff82a0c2638b2d19cf1d90643 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Doc: Remove comment about preliminary API for Qt 5.0Topi Reinio2014-06-051-7/+3
| | | | | | Task-number: QTBUG-39195 Change-Id: I193321a29d06760e4ad5aa2eaca99d98b2e1f65a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Android: Don't expose java calls in the control classes.Christian Strømme2014-06-0415-114/+238
| | | | | | | Makes the abstraction more clear. Change-Id: Ia9a7b0b157e1182158cd26b62775d13f6c5e1727 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Make it possible to build multimedia for embedded AndroidChristian Strømme2014-06-042-3/+3
| | | | | Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Rename the wrapper classesChristian Strømme2014-06-0434-533/+533
| | | | | Change-Id: I2ce15c8475da3186f128ba59b7c58f9b5b0a67e1 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-3025-271/+150
| | | | | | Task-number: QTBUG-39131 Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* OpenSL: don't try to enqueue new buffers when the buffer queue is full.Yoann Lopes2014-05-301-1/+1
| | | | | | | | | | It could lead to corrupted sound since we were overwritting buffers that weren't played yet. Task-number: QTBUG-39015 Change-Id: I4c015c5383b813955998145d6316acc8c22f19a3 Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove C++11 code in iMX6 video node plugin.Yoann Lopes2014-05-301-2/+2
| | | | | | | | | Use Q_FOREACH instead of C++11 range-based For loops. Task-number: QTBUG-38900 Change-Id: I2b9f8444f2ac3ae71811112244c687cab79753c9 Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Android: fix calling start() and stop() on the video surface.Yoann Lopes2014-05-301-1/+1
| | | | | | | | | We restart the surface when the frame size changes, though we were not using the correct function to get the surface's current frame size. This was causing start() and stop() to be called for every frame. Change-Id: I8ff4b4852cb7fcc92ac3b1b3ad7bf991d7bddc6b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Fix loading from qrcChristian Strømme2014-05-212-1/+6
| | | | | | | | | On Android < 4.1 our temporary file is discarded without checking the content. With this change we just open the file and pass the fd to the mediaplayer instead. Change-Id: I9233822725d8987c572b2d0b598721cee886de80 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* DirectShow: remove debug output.Yoann Lopes2014-05-191-7/+0
| | | | | | Task-number: QTBUG-38924 Change-Id: Ibc08fd99f6eb10035e4d7da963d4d384012bbdbf Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* WMF: fix video frames' viewport.Yoann Lopes2014-05-151-0/+12
| | | | | | | It was not taken into account at all. Change-Id: I4ce85aba214cb4d89dcd018b1616a2a38094b5a6 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: fix QMediaPlayer::bufferStatus value.Yoann Lopes2014-05-152-3/+17
| | | | | | | | | | | It was returning the buffering progress for the whole media, which is not what is expected according to the documentation. It should return instead how much the playback buffer is filled. This information is not available on Android so we simply return 100% when the status is BufferedMedia or BufferingMedia, 0% otherwise. Change-Id: I9fb55a9317948ba9375291a57bbf100f186382a2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix QSGVideoNode rendering of frames with stride != width.Andrew den Exter2014-05-152-18/+73
| | | | | | | | | | Adjust texture coordinates to not render padding at the end of lines, and better calculate the stride of UV planes. Task-number: QTBUG-38218 Task-number: QTBUG-30447 Change-Id: I7b7577979719c48460b838f7dcc89b9d17741f79 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Improve documentation for the QMediaPlayer::bufferStatus property.Yoann Lopes2014-05-152-7/+21
| | | | | | | | The corresponding properties in the Audio and MediaPlayer QML elements are also updated. Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Copy snippets from the Qt Multimedia moduleSze Howe Koh2014-05-142-0/+180
| | | | | | | | | | | | | | | Extract a compilable subsection of... - src/multimedia/doc/snippets/multimedia-snippets/camera.cpp - src/multimedia/doc/snippets/multimedia-snippets/video.cpp ...into the snippet folder searched by: - src/multimediawidgets/qcameraviewfinder.cpp - src/multimediawidgets/qgraphicsvideoitem.cpp - src/multimediawidgets/qvideowidget.cpp - src/multimediawidgets/qvideowidgetcontrol.cpp Change-Id: Ica3c21b65bc57d5686a594afca09e771cc376cc0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Android: Fix namespace usage.Christian Strømme2014-05-125-6/+12
| | | | | | | Make it possible to build multimedia with a Qt namespace Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-124-0/+10
| | | | | | | | | The module is not released yet; the current documentation is misleading. Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* PLS parser: Don't translate entries.Yoann Lopes2014-05-091-3/+3
| | | | | | | | | Each entry in a PLS file uses the keywords 'File', 'Title' and 'Length' in English, it should not be translated to the user's locale... Task-number: QTBUG-38755 Change-Id: Ibd5bee18a856b3ebc1fdb177241db7a39b65d264 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* GStreamer: disable clock syncing in video sink for live sources.Yoann Lopes2014-05-091-0/+1
| | | | | | Task-number: QTBUG-38465 Change-Id: Icdf2df36b9b3c09dd047e60ac24e221a3d233c6f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-098-49/+82
| | | | | | | | It's now a private API in the QtMultimedia library in order to be accessible in other plugins. Change-Id: I63541de1e8c540cebc210f9037646ce74d866c6f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-0116-64/+81
|\ | | | | | | Change-Id: I900412b4c6f894dec27b8158d498b2ff18404ced
| * Fix documentation of qmlvideofx examplev5.3.0-rc1v5.3.0releasebaserock/v5.3.05.3.0Niels Weber2014-04-3012-18/+9
| | | | | | | | | | | | | | | | | | | | Make the documentation fit to the current state of the example. Task-number: QTBUG-38121 Change-Id: I3379e3328d07ef8bcdb35a5e3821ab194c3443c4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Handle resizing of mainwindow betterNiels Weber2014-04-301-1/+2
| | | | | | | | | | | | | | Task-number: QTBUG-38121 Change-Id: I877fd5c626418a91850d43de31e71351c14eef25 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Selecting something now closes menuNiels Weber2014-04-301-28/+48
| | | | | | | | | | | | | | | | | | On a closed menu, the text is now hidden. Task-number: QTBUG-38121 Change-Id: I305fd4f24768115ed21495857cce672d8cbd2135 Reviewed-by: Petref Saraci <petref.saraci@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Add missing background for effect selection list.Niels Weber2014-04-302-17/+22
| | | | | | | | | | | | | | | | | | | | Also remove highlight and fix button text color. Make Menu animation faster. Task-number: QTBUG-38121 Change-Id: I7d5868d370a8dc7925cee5e694ae043970c569d9 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | [QNX] Introduce env variable for default audio sinkAndreas Holzammer2014-04-251-1/+2
| | | | | | | | | | | | | | | | Make it possible to change the default audio sink via a environment variable. Change-Id: Id0e14318fc99a896b8a41196941b758a31d23600 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix documentation errorFabian Bumberger2014-04-240-0/+0
| | | | | | | | | | Change-Id: I98f3e35677b5e07ea35898caec3f241b045b5033 Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
* | Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-2362-1115/+804
|\ \ | |/ | | | | Change-Id: Ieb521fb1e9f297a167eea19c771cb5915c01df97
| * Rework qmlvideofx exampleNiels Weber2014-04-1847-1037/+723
| | | | | | | | | | | | Task-number: QTBUG-38121 Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| * Doc: Improved example documentationJerome Pasion2014-04-1414-76/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -added instructions on how to run the example (using \include to insert a section from qtbase/doc/global/) -updated copyright year -removed links to Qt 4 API -rearranged some of the sections -created links from the example pages to Qt Multimedia -fixed QDoc warnings related to the example pages Task-number: QTBUG-33597 Change-Id: Id45ce5cbd40dbfa384abd7260a316f6f6837c186 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| * Android: Release the surface texture when not in useChristian Strømme2014-04-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | With some Android versions the preview texture is released when the application is suspended. If we don't release the texture in our code, the preview will be empty when the application resumes. Task-number: QTBUG-38165 Change-Id: I72244727081d8f94ee5f6cb0ab660ca59f4bb2de Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ie88b34ee769ab3abbd0a5ab0fd8b7938475916ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Camera code clean-upChristian Strømme2014-04-154-334/+304
| | | | | | | | | | Change-Id: Ib400afde12067764c3dcc0f44e40ddc1abb3012f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Android: Use QMutexLock in camera callbacks.Christian Strømme2014-04-151-8/+4
|/ | | | | | | We should not release the locks before the native callbacks returns. Change-Id: Ia2691f6c5be66a3dcf371e48e3bac7498b401833 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Use Q_GLOBAL_STATIC instead of a static QMapChristian Strømme2014-04-091-5/+6
| | | | | Change-Id: I7b65e0874051c4ef504914a0bd66e8471ec34fa7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Fix the signature for setOnInfoListener.Christian Strømme2014-04-091-1/+1
| | | | | | | | The argument part of the signature should be OnInfoListener and not OnErrorListener. Change-Id: I735fe1b0338b66c2f729254ed9e3251136781cbe Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix some MediaPlayer properties returning wrong values.Yoann Lopes2014-04-092-23/+23
| | | | | | | | Once the QML component is complete, don't cache any value anymore and always ask the backend for the actual value. Change-Id: I2c3ad55618e0532f713cfcc8258a70a1114fc975 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* WMF: improve changing playback rate on a media player.Yoann Lopes2014-04-092-6/+48
| | | | | | | | | | | | | | | | | | | | | | When going back to normal rate after playing in fast forward (greater than 2x), playback seemed frozen for some amount of time (up to 8 seconds). When playing in fast forward, only key frames are shown, ignoring all the others. When returning to a normal rate, the source reader will usually be pointing to a key frame in the future compared to the player clock position, meaning that all the frames in between won't be shown until the player clock catches up with the latest key frame that was read. When leaving fast-forward, we now reset the position on the player to force the source reader to point back to the frame at the current clock position and avoid the seamingly frozen playback. Also, emit playbackRateChanged() signal when changing the playback rate. Change-Id: I4f04f0f250083378e94fb4a47f9f917abeaaf24e Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* GStreamer: correctly get metadata from live sources.Yoann Lopes2014-04-092-23/+11
| | | | | | | | | | For some unknown reason, "iradio-mode" was set to false on the source element, which was preventing new metadata to be received when playing live streams. Task-number: QTBUG-37640 Change-Id: Ib90297e81e26a99c3dfc753bdcd5cbd1ee2f6764 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* WMF: more reliable video seeking.Yoann Lopes2014-04-081-10/+15
| | | | | | | | | | When seeking, the presentation clock can enter an undefined state until it is started again from the new position. Wait for the clock to be restarted before scheduling the prerolled frames, otherwise these frames might get a wrong presentation time. Change-Id: I02cb3338239775b7ef5d206ec5aa1b26719ac978 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Fix QtMediaRecorderChristian Strømme2014-04-083-12/+17
| | | | | | | | | | Don't extend the MediaRecorder class as this causes ART to fail when it doesn't find the postEventFromNative() function. Task-number: QTBUG-38166 Change-Id: Ia38ce4558a2cc95a9b4cd05b9f926d41e53fdc0d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
View Lorry Controller Status