Dmitry Kurtaev
e8e9d1d021
Implement Interp layer using Resize layer
2018-06-22 19:26:47 +03: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
Dmitry Kurtaev
4626246087
Add ShuffleChannel layer
2018-06-21 19:10:42 +03:00
Dmitry Kurtaev
40b85c1cd9
Remove undocumented feature to retreive layers outputs by indices
2018-06-20 14:44:21 +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
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
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
Alexander Alekhin
5fd7cfbcad
dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT
...
to control DNN_BACKEND_DEFAULT enumeration value behavior
2018-06-13 19:00:04 +03:00
Alexander Alekhin
1c2ee8a5f1
Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print
2018-06-13 13:31:31 +00:00
Alexander Alekhin
09c63e4f00
videoio(msmf): fix reopen condition in configureHW()
...
`camid` value is always -1 after close().
2018-06-13 16:29:45 +03:00
Alexander Alekhin
f040282bf8
Merge pull request #11739 from dkurt:more_ie_models
2018-06-13 13:26:50 +00:00
yuki takehara
4fe648b15c
Merge pull request #11706 from take1014:setTo_Nan_10507
...
* setTo_#10507
* setTo_Nan_10507
* setTo: update check / test for NaNs
2018-06-12 18:05:44 +00:00
Dmitry Kurtaev
7d727ac2fb
Fuse top layers to batch normalization
2018-06-09 18:06:53 +03:00
Alexander Alekhin
0d249c7448
videoio(msmf): replace custom debug print function
2018-06-09 17:38:32 +03:00
Dmitry Kurtaev
2c291bc2fb
Enable FastNeuralStyle and OpenFace networks with IE backend
2018-06-09 15:57:12 +03:00
Alexander Alekhin
34fc8e9260
Merge pull request #11714 from alalek:win32_waitKey_accuracy
2018-06-09 12:10:24 +00:00
Alexander Alekhin
929d39f69a
Merge pull request #11728 from dkurt:dnn_update_tf_ssd
2018-06-08 19:04:28 +00:00
Alexander Alekhin
f72633b9f5
Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D
2018-06-08 19:01:40 +00:00
Alexander Alekhin
c05180ccce
Merge pull request #11702 from terfendail:msmf_sizefix
2018-06-08 18:56:31 +00:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22
videoio(MSMF): refactor grabFrame() / retrieveFrame() methods
...
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
2018-06-08 17:20:47 +03:00
Dmitry Kurtaev
40765c5f8d
Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine
2018-06-08 16:55:21 +03:00
gnthibault
b46fef327e
Fixed Assertin error due to Size.area() overflowing
2018-06-08 11:22:36 +02:00
Alexander Alekhin
8620bd5a84
highgui(win32): improve waitKey() timeout condition
...
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
2018-06-07 19:31:08 +03:00
rockzhan
1187a7fa34
Merge pull request #11649 from rockzhan:dnn_dw_prelu
...
dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu] (#11649 )
* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift
* add TEST to show the output mismatch in [DWconv+Prelu]
* fix typo
* change loading image to init cvMat directly
* build runtime model, without loading external model
* remove whitespace
* change way to create a cvmat
* add bias_term, add target output
* fix [dwconv + prelu] value mismatch when no optimizations
* fix Test error when change output channels
* add parametric test
* change num_output to group value
* change conv code and change test back
2018-06-07 13:45:54 +00:00
David
7175f257b5
Added ResizeBilinear op for tf ( #11050 )
...
* Added ResizeBilinear op for tf
Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).
Minor changes to tf_importer and resize layer to save some code lines
Minor changes in init.cpp
Minor changes in tf_importer.cpp
* Replaced implementation of a custom ResizeBilinear layer to all layers
* Use Mat::ptr. Replace interpolation flags
2018-06-07 16:29:04 +03:00
Maksim Shabunin
60fa6bea70
Merge pull request #11711 from alalek:python_standalone
2018-06-07 13:27:19 +00:00
Alexander Alekhin
dd7f88bd68
python: support standalone Python bindings build
...
- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target
2018-06-07 15:16:39 +03:00
Vadim Pisarevsky
5e5d997dff
Merge pull request #11620 from terfendail:hmmorph_fix
2018-06-07 11:19:21 +00:00
Sayed Adel
e0d28aa893
core:ppc Fix java CoreTest/testMahalanobis ( #11677 )
...
* core:ppc Fix java CoreTest/testMahalanobis
* core:ppc Fix warning unused variable on clang
2018-06-07 14:16:48 +03:00
Vadim Pisarevsky
828f33311f
Merge pull request #11700 from dkurt:dnn_ie_try_catch
2018-06-07 11:09:00 +00:00
Dmitry Kurtaev
f3a6ae5f00
Wrap Inference Engine init to try-catch
2018-06-07 12:55:52 +03:00
Vitaly Tuzov
2e22f8e790
Fix for morphologyEx MORPH_HITMISS mode
2018-06-06 21:04:17 +03:00
Vadim Pisarevsky
7c3090ddcf
Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code
2018-06-06 12:21:00 +00:00
Vadim Pisarevsky
3cbd2e2764
Merge pull request #11650 from dkurt:dnn_default_backend
2018-06-06 09:30:39 +00:00
Alexander Alekhin
afaf5f940e
Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings
2018-06-05 20:07:39 +00:00
Alexander Alekhin
31a1df0fae
Merge pull request #11692 from alalek:default_log_level_warnings
2018-06-05 20:07:15 +00:00
Alexander Alekhin
b0ae357cfb
Merge pull request #11687 from alalek:gstreamer_write_pipeline
2018-06-05 20:06:55 +00:00
Alexander Alekhin
4091ced5ab
core: set default logger level to 'warning' in Release builds
...
should hide unnecessary 'info' messages
2018-06-05 18:39:47 +03:00
Alexander Alekhin
6816495bee
dnn(test): reuse test/test_common.hpp, eliminate dead code warning
2018-06-05 12:52:53 +03:00
Alexander Alekhin
277e9279cc
videoio(gstreamer): support dumping of VideoWriter pipeline
2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599
videoio: fix capture modes
2018-06-04 19:48:51 +03:00