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
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
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
db1550a410
Merge pull request #11760 from vishwesh5:patch-1
2018-06-14 15:59:49 +00: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
Alexander Alekhin
13a4700084
Merge pull request #11755 from alalek:dnn_backend_default_config
2018-06-14 09:57:03 +00:00
vishwesh5
018eab7040
Corrected formula
...
Corrected formula for weighted within-class variance
2018-06-14 12:30:06 +05:30
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
54e8487f56
Merge pull request #11707 from kdpatters:patch-1
2018-06-13 15:51:10 +00: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
Alexander Alekhin
ff3d4d8b7f
Merge pull request #11740 from catree:add_tutorial_imgproc_java_python3
2018-06-11 16:32:05 +00:00
catree
a11ef2650e
Add Java and Python code for the following imgproc tutorials: Finding contours in your image, Convex Hull, Creating Bounding boxes and circles for contours, Creating Bounding rotated boxes and ellipses for contours, Image Moments, Point Polygon Test.
2018-06-10 23:57:11 +02:00
Alexander Alekhin
8c4e0dfd13
Merge pull request #11738 from dkurt:dnn_batch_norm_fusion_base
2018-06-10 17:12:04 +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
Alexander Alekhin
93f2fd396b
Merge pull request #11723 from alalek:sample_videocapture_camera
2018-06-09 13:49:21 +00:00
Alexander Alekhin
d068ec3a3d
Merge pull request #11734 from alalek:opencv_version_win32
2018-06-09 13:48:06 +00:00
Dmitry Kurtaev
2c291bc2fb
Enable FastNeuralStyle and OpenFace networks with IE backend
2018-06-09 15:57:12 +03:00
Alexander Alekhin
95360a5539
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.
2018-06-09 15:55:35 +03:00
Alexander Alekhin
8221f57c26
Merge pull request #11729 from alalek:ffmpeg_update_3.4
2018-06-09 12:25:23 +00:00
Alexander Alekhin
c198a35368
Merge pull request #11733 from alalek:opencv_ffmpeg_download_ps1
2018-06-09 12:11:39 +00:00
Alexander Alekhin
c0feea50a9
Merge pull request #11732 from alalek:cmake_build_apps_list
2018-06-09 12:10:49 +00:00
Alexander Alekhin
34fc8e9260
Merge pull request #11714 from alalek:win32_waitKey_accuracy
2018-06-09 12:10:24 +00:00
Alexander Alekhin
390f0a5dcd
cmake: generate and install ffmpeg-download.ps1
...
64-bit only
2018-06-09 13:19:48 +03:00
Alexander Alekhin
e8a520ed96
cmake: add BUILD_APPS_LIST
...
- build "opencv_version" only: `cmake -DBUILD_APPS_LIST=version ...`
- option 'BUILD_opencv_apps' should be 'ON'
2018-06-09 12:52:27 +03:00
Alexander Alekhin
0614ee3f95
Merge pull request #11726 from catree:add_tutorial_java_ld_preload_mkl
2018-06-08 19:10:38 +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
486f31fae9
Merge pull request #11715 from catree:add_tutorial_objDetect_HDR_java_python
2018-06-08 18:59:29 +00:00
Alexander Alekhin
c05180ccce
Merge pull request #11702 from terfendail:msmf_sizefix
2018-06-08 18:56:31 +00:00
catree
afa5b0cc93
Add Java and Python code for cascade classifier and HDR tutorials.
2018-06-08 19:30:30 +02:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
d3696f3ad2
ffmpeg: update OpenCV FFmpeg wrapper (3.4)
2018-06-08 18:47:00 +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