summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * | DirectShow: fix media player seeking.Yoann Lopes2015-11-044-24/+43
| | | | | | | | | | | | | | | | | | | | | Correctly handle seek requests happening when the media is not playing. Change-Id: I82c508dae41792b75a26e86512da66a4871f6352 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | DirectShow: fix some media player status issue.Yoann Lopes2015-11-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change the status to LoadedMedia if the media position is changed while in the EndOfMedia status. Change-Id: I6614fc184be80b11952b0e45af22ef030cfc36c5 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | DirectShow: clear current video frame when stopping.Yoann Lopes2015-11-041-0/+8
| | | | | | | | | | | | | | | Change-Id: I063d8a1b95f3d751f55dfce7fa2cb749177dc906 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | DirectShow: set timestamp on media player frames.Yoann Lopes2015-11-041-4/+18
| | | | | | | | | | | | | | | Change-Id: Ie3d395c7ac4a9c1f52c3dedfd5bc3993744aa503 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | DirectShow: fix setting volume when a media is not loaded.Yoann Lopes2015-11-042-38/+26
| | | | | | | | | | | | | | | | | | | | | Store the pending volume and apply it once the media is loaded. Change-Id: I6998e9139aa3680220faa871b3116409855a1b35 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | AVFoundation: don't automatically rotate camera captures.Yoann Lopes2015-11-042-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't do this automatically, as different kind of orientations might be wanted (sensor, device, UI). The default should be sensor orientation (no rotation applied). We should add an API to QCamera to enable automatic orientation of captured images. Change-Id: I56fff7f0c4aaaee37eb6ae2628e27073b4946b66 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Remove superfluous includeMaurice Kalinowski2015-11-031-1/+0
| | | | | | | | | | | | | | | Change-Id: Ic8855911515b5fb5283536c4ee73e6f0203ece1e Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * | Blacklist qmediaplayerbackend test on Windows 64-bits.Yoann Lopes2015-10-301-0/+1
| | | | | | | | | | | | | | | Change-Id: I3cdb89a0189c5089a4e65218db9604010da97a2c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | winrt: Fix crash when focus operation in progress.Samuel Nevala2015-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If focus is locked repeatedly and fast on Lumia 920 FocusAsync returns null IAsyncAction and ::await crash on null pointer. Fix crash by returning early from method when operation in progress. Change-Id: Ie268fd2276d3e9090a47bf362cd58743bb83284a Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: Idb61addec1cc8a01c31cfa05a2424a2b4ac85a91 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | AVFoundation: fix camera capture previews.Yoann Lopes2015-10-204-38/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the preview from a viewfinder frame and not from the final JPG image. In addition, the preview is now rotated to always be in the same orientation as the device at the time of capture. Task-number: QTBUG-46971 Change-Id: I48851225738e50fbd89c2f94904bac366303a9ad Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Add private API for conversion from QVideoFrame to QImage.Yoann Lopes2015-10-2013-567/+905
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android plugin had a function to convert from NV21 to RGB32. It's now moved to the Qt Multimedia library and it supports additional source formats. It could be further improved with more SIMD code, it could then become a public API. Change-Id: Ibee349027048a263a1a7ea74dc51237f7747912c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Yoann Lopes2015-10-2015-45/+220
| |\| | | | | | | | | | Change-Id: Ie1e478eca1cdfd99ccd3a3c8a07aefbfa27ccbdb
| | * GStreamer: fix compilation with version < 0.10.31.Yoann Lopes2015-10-2012-30/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.4 and earlier required GStreamer 0.10.24 as minimum version. Qt 5.5 added code that requires 0.10.31, this code is now ifdef'd and we now support again 0.10.24. Task-number: QTBUG-48353 Change-Id: Ie708a33c0515874b003ce26a3400475075d316ca Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Fix signal/slot declaration in QVideoOutputOrientationHandler.Yoann Lopes2015-10-161-2/+2
| | | | | | | | | | | | | | | Change-Id: I03cdd677feaf06ac2d61682cab46232f983e6494 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * AVFoundation: fix camera frames texture format.Yoann Lopes2015-10-161-13/+3
| | | | | | | | | | | | | | | Change-Id: I87ca4abf80a5be9983aefc791b8a0ef0cd4ac33d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.5.1' into 5.5Liang Qi2015-10-131-0/+68
| | |\ | | | | | | | | | | | | Change-Id: I9c55b5a63321475a468fb3a1b6ab775a9fe12689
| | | * Add 5.5.1 change file.v5.5.1Yoann Lopes2015-09-151-0/+68
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb8094e4d6ae94be43b726a25881350a6f266ef4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | | winrt: Unload camera when application is suspended.Samuel Nevala2015-10-152-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera needs to be unloaded when going to suspend. Otherwise resume from suspend will hang and application will be terminated. Change-Id: Idc8bd47e56c99ebd53a1a4632338cf977317a495 Task-Id: QTBUG-48569 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * | | winrt: Prevent camera device from being suspended.Samuel Nevala2015-10-153-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On certain Lumia devices video buffer gets page locked when camera is stopped. Subsequent call to video frame map/unmap leads to camera device suspension. As a fix delay camera unload until all mapped video frames are unmapped and return early from video frame map when camera is not active. Task-Id: QTBUG-48672 Change-Id: If547b9d430727bbe0e12cd8c07a30aeff81d13e3 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1475-261/+1362
|\| | | | | | | | | | | | | | | Change-Id: Ia6a6b6fce7aeca446b5e87ff72076fb8be2ada04
| * | | winrt: Fix two possible null pointer exceptionsSamuel Nevala2015-10-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If camera state is changed rapidly these can occur. Change-Id: Ia9ccf9e03162350cd411ff9fc059c14f47b9a42e Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| * | | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2015-10-0614-134/+491
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-0214-134/+491
| | |\| | | | | | | | | | | | | | | | | Change-Id: I1373622a6d1fd0e2d35df2da79860a373056387f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 16:47:08 +0000