branka-plateiq
34ad9b8a42
Pass RANSAC parameters as function input ( #10569 )
...
* Pass RANSAC parameters as function input
* Clean up unnecessary code
* Keep the original function signature
* Clean up based on PR comments
Replace array with vector.
Correct naming convention for input variables.
Add checks on input variables.
* Use vector instead of array for dynamic size
* Revert change.
* Use dynamic array
* Fix wrong syntax in array allocation
* Undo change
* Fix variable name
* Use vector and not array
* fixed compile warning on Windows
2018-06-26 16:40:28 +03:00
Dmitry Kurtaev
dbeb4a11be
Parse strides and convolution kernel shapes considering data layout
2018-06-26 16:18:21 +03:00
Dmitry Kurtaev
b11e22c25b
Update Inference Engine tests
2018-06-26 15:38:08 +03:00
Vadim Pisarevsky
53a475d63c
Merge pull request #11836 from terfendail:msmf_camfallback
2018-06-26 12:17:55 +00:00
Vadim Pisarevsky
e87425f047
Merge pull request #11835 from dkurt:dnn_tf_two_inputs
2018-06-26 12:12:24 +00:00
Vitaly Tuzov
67b67003c5
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
2018-06-26 14:04:02 +03:00
Dmitry Kurtaev
9510551c63
Multiple inputs for TensorFlow models
2018-06-26 14:03:59 +03:00
Alessandro de Oliveira Faria (A.K.A.CABELO)
cc8db99695
Include ELA example ( #11819 )
...
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* Include ELA example
* did some code cleanup
* fixed compile error
2018-06-26 12:10:52 +03:00
Vadim Pisarevsky
b80c7bca0d
Merge pull request #11826 from dkurt:dnn_tf_data_layouts
2018-06-26 06:36:27 +00:00
Vadim Pisarevsky
dc27d52221
temporarily disabled OpenCL use in DNN module on Mac ( #11828 )
...
* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail
* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)
2018-06-26 09:35:18 +03:00
Alexander Alekhin
b39cd06249
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-25 22:03:17 +03:00
Dmitry Kurtaev
715f40a48d
Use layers consumers to predict data layout
2018-06-25 18:25:40 +03:00
Li, Peng
ab8022f74e
update convolution opencl kernels in dnn module ( #11762 )
...
* optimize ocl kernel enqueue in fc layer
Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_LOG_INFO in convolution auto tuning
Signed-off-by: Li Peng <peng.li@intel.com>
* update convolution IDLF kernel
extend parameter tuning range, also cleanup
ocl kernel implementation
Signed-off-by: Li Peng <peng.li@intel.com>
* update in-memory convolution cache config
fp16 and fp32 cache config are stored separately
Signed-off-by: Li Peng <peng.li@intel.com>
2018-06-25 17:06:18 +03:00
Maksim Shabunin
a2bc075924
cmake: function for application creation ( #11736 )
...
* apps: add Win32 friendly opencv_version app
Improve experience of launching app from explorer:
- application just flash (open/close) the console window
Suggested Win32 application flavor additionally shows MessageBox
and waits for User interaction.
* cmake: added unified application creation function
2018-06-25 17:02:58 +03:00
Vadim Pisarevsky
e3dc7e5ec9
Merge pull request #11743 from alalek:samples_avoid_double_VideoCapture_open
2018-06-25 12:54:09 +00:00
Vadim Pisarevsky
46def2fdc1
Merge pull request #11757 from freiling:master
2018-06-25 12:53:07 +00:00
Rostislav Vasilikhin
18bc2a1a93
Kinect2 support added to OpenNI2 backend ( #11794 )
...
* Kinect2 support added to OpenNI2 backend
* more fixes for OpenNI2 backend
* whitespace fixed
* libfreenect2 support added
* const cast added
* mutable removed
2018-06-25 13:19:20 +03:00
Vadim Pisarevsky
df38624e10
Merge pull request #11812 from dkurt:dnn_interp_layer_impl
2018-06-25 10:16:28 +00:00
Alexander Alekhin
70d6b8774d
Merge pull request #11790 from berak:dnn_fix_coco_txt
2018-06-23 18:51:07 +00:00
Alexander Alekhin
2195f0cc62
Merge pull request #11795 from paroj:realsensev2
2018-06-23 18:50:43 +00:00
Alexander Alekhin
fa813d02fa
Merge pull request #11815 from tomoaki0705:suppressDeprecatedWarning
2018-06-23 17:55:12 +00:00
Tomoaki Teshima
ffb9ce8287
suppress warning while building the samples
2018-06-23 21:35:25 +09:00
Alexander Alekhin
8b5e29c234
Merge pull request #11808 from tomoaki0705:caroteneSuppressWarnings
2018-06-23 08:46:29 +00:00
Dmitry Kurtaev
e8e9d1d021
Implement Interp layer using Resize layer
2018-06-22 19:26:47 +03:00
Tomoaki Teshima
e324d2e534
suppress warning on Arm platform
2018-06-22 20:17:22 +09:00
Alexander Alekhin
1894f1a37f
Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag
2018-06-22 05:23:55 +00:00
Alexander Alekhin
50c607d206
dnn(ocl): fix external / predefined builtin configuration behavior
...
OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)
Prefer external configuration over builtin.
2018-06-21 20:59:03 +03:00
Alexander Alekhin
443670262d
Merge pull request #11791 from dkurt:dnn_shufflenet
2018-06-21 17:45:21 +00:00
Dmitry Kurtaev
4626246087
Add ShuffleChannel layer
2018-06-21 19:10:42 +03:00
Maksim Shabunin
fe20fa8326
gstreamer sample: fixed incorrect pipelines being generated
2018-06-21 17:14:42 +03:00
Alexander Alekhin
387e92353c
Merge pull request #11772 from PhilLab:patch-5
2018-06-21 11:57:24 +00:00
Alexander Alekhin
86c1114463
Merge pull request #11798 from dkurt:dnn_layers_names_with_dot
2018-06-21 11:51:54 +00:00
Dmitry Kurtaev
40b85c1cd9
Remove undocumented feature to retreive layers outputs by indices
2018-06-20 14:44:21 +03:00
Pavel Rojtberg
2047abd9c3
videoio: realsense - add cvtColor as the pixel-format is only a hint
2018-06-19 17:55:09 +02:00
berak
8f7a3b15b2
dnn: add a coco labels file for yolov3
2018-06-19 10:45:49 +02:00
Alexander Alekhin
64f2b1b250
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-17 16:26:48 +03:00
Alexander Alekhin
eed43a231b
Merge pull request #11775 from alalek:issue_11771
2018-06-17 13:25:44 +00:00
Alexander Alekhin
8622b1254e
Merge pull request #11774 from adamrankin:cap_dshow_autofocus
2018-06-16 14:11:44 +00:00
Alexander Alekhin
5e2c112697
photo: remove redundant broken check
...
`dest(roi_d)` operation contains similar check inside.
2018-06-16 11:36:51 +03:00
Adam Rankin
ecf4b639e1
Adding the ability to toggle autofocus on/off for DirectShow webcams
2018-06-15 12:32:12 -04:00
Philipp Hasper
577546ccd9
Added Size_::aspectRatio
2018-06-15 14:59:54 +02:00
Alexander Alekhin
db1550a410
Merge pull request #11760 from vishwesh5:patch-1
2018-06-14 15:59:49 +00:00
Alexander Alekhin
9629af1aa9
videoio: MSMF async reader for camera stream
...
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.
This mode is applied to cameras only (opened by 'index').
2018-06-14 18:37:05 +03:00
Alexander Alekhin
30d4e0261a
Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax
2018-06-14 13:18:30 +00:00
Alexander Alekhin
001f5faa0d
Merge pull request #11763 from dkurt:dnn_keras_relu6_v2
2018-06-14 13:17:54 +00:00
Alexander Alekhin
a6ad44a7c7
Merge pull request #11764 from alalek:videoio_msmf_refactor_ComPtr_wrapper
2018-06-14 13:01:22 +00:00
Dmitry Kurtaev
bd87eb6e66
Import average pooling and softmax layers from Darknet
2018-06-14 15:22:08 +03:00
Alexander Alekhin
2bb5d1bca3
videoio(msmf): cleanup unused methods from ComPtr wrapper
...
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
2018-06-14 14:15:09 +03:00
Dmitry Kurtaev
693a7663e7
Import ClipByValue from Keras
2018-06-14 13:30:30 +03:00
Alexander Alekhin
8f24db048c
Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition
2018-06-14 09:57:39 +00:00
