summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | QGstTools: replace foreach with range-based forAnton Kudryavtsev2016-01-155-22/+31
| | | | | | | | | | | | | | | Change-Id: I4e93978fc41788ac7f524c7c290a9ce25452f04e Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | imports: replace foreach with range-based forAnton Kudryavtsev2016-01-153-11/+14
| | | | | | | | | | | | | | | Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QtMultimediaQuickTools: replace foreach with range-based forAnton Kudryavtsev2016-01-152-5/+7
| | | | | | | | | | | | | | | Change-Id: I729375c1de712f1fb7915c95ce9eb7dcd00fe757 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Camera: replace foreach with range-based forAnton Kudryavtsev2016-01-152-15/+15
| | | | | | | | | | | | | | | Change-Id: Iedaad3bccea7a5d830f713d87240f5f957ae12c5 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Video, Playback: replace foreach with range-based forAnton Kudryavtsev2016-01-153-5/+9
| | | | | | | | | | | | | | | Change-Id: I46031547447669925cdd747f5ac6259acab9a410 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Multimedia, MultimediaWidgets: replace foreach with range-based forAnton Kudryavtsev2016-01-156-26/+37
| | | | | | | | | | | | | | | Change-Id: I6d291fb1a46686c9e7d5974c831d4d798de2f03a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Gstreamer plugin: replace foreach with range-based forAnton Kudryavtsev2016-01-1514-37/+51
| | | | | | | | | | | | | | | Change-Id: Ic6d0f9d6b45eae1cdadc46783cb6f5bb7c64ac8c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Replace foreach with range-based forAnton Kudryavtsev2016-01-153-5/+6
| | | | | | | | | | | | | | | | | | | | | ... in Android, AudioCapture and m3u plugins. Change-Id: If06a97e49cfa4d32a41da2f043710cfdbd8a7b20 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | AVFoundation: replace foreach with range-based forAnton Kudryavtsev2016-01-153-4/+6
| | | | | | | | | | | | | | | Change-Id: I7a2f563f74fc67b55ea9b00f0e87d8ddaa2659c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | DirectShow plugin: replace foreach with range-based forAnton Kudryavtsev2016-01-156-12/+13
| | | | | | | | | | | | | | | Change-Id: Id1a0b4d2c3defe254e503079faa8b35eaaba8c08 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QNX plugin: replace foreach with range-based forAnton Kudryavtsev2016-01-153-5/+7
| | | | | | | | | | | | | | | Change-Id: Ia95da6282ae4dcbeff024655b78788e15ad0e18c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | WinRT, WindowsAudio plugins: replace foreach with range-based forAnton Kudryavtsev2016-01-155-10/+11
| | | | | | | | | | | | | | | Change-Id: I37ab3239aeaa01ecd033bfe7d9c8885511844d4d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | WMF plugin: replace foreach with range-based forAnton Kudryavtsev2016-01-155-11/+11
| | | | | | | | | | | | | | | Change-Id: I041496a88ac26d5db6bb65f61ff88a3aea01e3a4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Audio: replace foreach with range-based forAnton Kudryavtsev2016-01-153-12/+15
| | | | | | | | | | | | | | | Change-Id: I5c9f7554f3ef1c93a0041afcf1331d092e5ec405 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QSGVivanteVideoMaterial: fix expensive iteration over QMap::values()Anton Kudryavtsev2016-01-151-1/+2
| | | | | | | | | | | | | | | Change-Id: I04b0fbe248e33821c93661b684b2e423f57e0f2f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | fix expensive iteration over QMap::keys() and QHash::keys()Anton Kudryavtsev2016-01-144-9/+10
| | | | | | | | | | | | | | | Change-Id: I244aa1ecf006774ebe5fb9bb5b22d37142186e39 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | tvOS supportMike Krus2016-01-1312-28/+33
| | | | | | | | | | | | | | | | | | | | | Builds, tested simple video playback Change-Id: I04e1da050c587cba3609107dc88a155a6949f2c3 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Enable using the module in a statically built applicationAndy Shaw2016-01-113-0/+21
| | | | | | | | | | | | | | | | | | Change-Id: Iafdb4359f051fcd20178f3c5f42f2cff2bf8c359 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Add moveItem(from, to) to QMediaPlaylist.Jim Hodapp2015-12-188-0/+56
| | | | | | | | | | | | | | | Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Added insertItems and removeItems to QML Playlist.Jim Hodapp2015-12-182-0/+39
| | | | | | | | | | | | | | | Change-Id: Iba4d08551016c486e88e738e35fb590d82a058a2 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Added addItems to QML Playlist for batch adding of tracks.Jim Hodapp2015-12-182-0/+24
| | | | | | | | | | | | | | | Change-Id: Ieb7df35ad9dd50bbc68e5305e0de9fb26c64b540 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | QSampleCache: use prefix ++ for iterator in setCapacityAnton Kudryavtsev2015-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | because it's useful for non-primitive types Change-Id: I59099d18ad8811601d09f76b6b30a95721e6e82f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Remove insignificant flag from qsoundTony Sarajärvi2015-12-031-2/+0
| | | | | | | | | | | | | | | | | | Change-Id: I8f48c2487795a1c53e73d51da1e88fb2aaacffaa Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Remove insignificant flag from qaudiooutput testTony Sarajärvi2015-12-031-2/+0
| | | | | | | | | | | | | | | Change-Id: Ic59685f4091ce33bdc644a8af517f0b9a1e344e9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Remove insignificant from qdeclarativevideooutput testTony Sarajärvi2015-11-251-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28541 Change-Id: I926e47b145d5ead2d4a8e99f453742095afac925 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Remove insignificant from tst_qpaintervideosurface testTony Sarajärvi2015-11-241-2/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28542 Change-Id: If44652c36c09d3367197a0366b42b62aab565ff9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Add camera brightness adjustment API.Denis Shienkov2015-11-234-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The brightness adjustment already exists in the control API but not in the QCamera and QML Camera APIs. Simply add the missing functions which call into the control API. Change-Id: I56a5aef3ae8bef9ca13c5a01d8282014f6e20830 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devYoann Lopes2015-11-2371-340/+1083
|\| | | | | | | | | | | Change-Id: I0bee3f4e8721b9d2067495dde17be87a4b906245
| * | Implement volume in audiocapture plugin.Yoann Lopes2015-11-233-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | This plugin uses QAudioInput as audio source for the recording, just forward the volume to it. Change-Id: Ice3ec5e48195b13d5f738b79a357dfc261ad8955 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-11-2023-65/+321
| |\| | | | | | | | | | Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2
| | * Add qt_real_to_fraction() helper function.Yoann Lopes2015-11-196-46/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private API meant to be used by plugins whose backends expect frame rate values represented by a ratio. The function implementation was moved from the AVFoundation plugin to the QtMultimedia library. Change-Id: I555b9d5da5ca3bae88992ed03501869fb731e45f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Support compiling with GStreamer < 0.10.32 in the camerabin plugin.Yoann Lopes2015-11-1915-18/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documented minimum GStreamer version for Qt Multimedia is 0.10.24, however, the camerabin plugin actually required 0.10.32 to compile successfully. The reason is mainly due to the GstEncodingProfiles API, which is used to implement the audio and video encoding settings controls. There's no hard requirement for that API anymore and the aforementioned controls simply don't do anything when the GStreamer version used to compile is older than 0.10.32. A few other GStreamer calls had to be ifdef'd or replaced in order to compile with 0.10.24. Note that this patch only makes sure it compiles with older versions, running the camerabin plugin with GStreamer < 0.10.32 is currently untested and it might not work as expected. Task-number: QTBUG-48914 Change-Id: I4ce8e932f24a33e919e29326729e12bbae561faf Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Don't initialize volume on pulse audio input by default.Morten Minde Neergaard2015-11-192-1/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-49461 Change-Id: I32b707e19091ab8344175b2dc0cdd1747f1186b3 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * | winrt: Wait for focus to finish when camera stoppedSamuel Nevala2015-11-201-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53918a8f7c5f50331593ad09233cd737e040e650 Task-Id: QTBUG-49527 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Matti Malinen <matti.malinen@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * | Fix use-after-free in AVFCameraService during renderer destructionJohn Brooks2015-11-191-7/+4
| | | | | | | | | | | | | | | Change-Id: I10a994b71e55565c0de31aa0c34f32964e2e3a1b Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
| * | winrt: Early return from searchAndLock if camera not active.Samuel Nevala2015-11-191-5/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: If2279db9cffbc5d06f0d662b6f942b6985034675 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Matti Malinen <matti.malinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-11-181-2/+2
| |\ \
| | * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-171-2/+2
| | |\| | | | | | | | | | | | | Change-Id: I72dc669a746c7685874afced3ee0f2f899aaf1cc
| | | * GStreamer camerabin: always provide the zoom control.Yoann Lopes2015-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't actually require GstPhotography to be available at compile time. Change-Id: I738e71e4a108a40e79440096be6607afff0134fa Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | | winrt: Fix toggling camera position.Samuel Nevala2015-11-171-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change scanline direction every time camera position changes. Change-Id: I8673eabe361c951f97f4422a682d11e862f8b27a Task-Id: QTBUG-47809 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * | winrt: Fix crash when camera unloaded while searching focus.Samuel Nevala2015-11-112-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return early from focus related methods when async operation reports that it is write protected. Change-Id: I41bf9121e7ae431e5158b5e4c43cde582c30dfd7 Task-Id: QTBUG-49347 Reviewed-by: Peng Wu <peng.wu@intopalo.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * | QtMultimedia: Fix build with CONFIG+=use_gstreamer_camera optionDenis Shienkov2015-11-111-1/+1
| | | | | | | | | | | | | | | Change-Id: If2d996545cc61c019f44c3c4f311b659513ff754 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * | DirectShow: Avoid warning about unresolved error when file is missing.Nodir Temirkhodjaev2015-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | AddSourceFilter() can return E_FAIL. Change-Id: Idbd8ec5a4a3c9b9d8fef9ff690cc0169f4027666 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| * | Remove RHEL blacklisting for tests that passFrederik Gladhorn2015-11-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | After installing the gstreamer plugins, these tests that used to be blacklisted pass now. Change-Id: I9be38ceb45f007930257d72d6b22a44ae661ad07 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Blacklist a few test functions for RHELFrederik Gladhorn2015-11-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | After installing the gstreamer-plugins, these tests still fail. Blacklist them until they get fixed. Change-Id: I5acbd5a4911253e96e40e30a2faf161bfa387989 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | DirectShow: fix custom renderer reference counting.Yoann Lopes2015-11-062-5/+7
| | | | | | | | | | | | | | | Change-Id: Iadefd4d72bdafb982a79b99ee5880dba32f3e920 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Fix for disallowed property bindings in qml effect filesPaolo Angelelli2015-11-0612-17/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation of ListModel.get, "The returned object is not guaranteed to remain valid. It should not be used in property bindings." So the property bindings have been removed, and a js function has been introduced to update the properties upon list change. Task-number: QTBUG-49221 Change-Id: Idaed746ca237198b52a3aff0234076331e1512c1 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | DirectShow: use the EVR in the window control.Yoann Lopes2015-11-0524-191/+549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse existing code from the WMF plugin, which already uses the EVR. This enables HW-accelerated video decoding when using QMediaPlayer with a QVideoWidget. Task-number: QTBUG-45593 Change-Id: I757e4d53cd2c648aee6ba33a4851a8c6adc62843 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Remove unused configuration test.Yoann Lopes2015-11-053-50/+0
| | | | | | | | | | | | | | | Change-Id: Id406146995dfb0dd8534a00b62c471d430a7366f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-0544-724/+1375
|\| | | | | | | | | | | Change-Id: I64a2e98adeb387e532f0b22129ade7ca7e8dc22a