From 619e4c94d5eba05e61237ac99f78b2db46628649 Mon Sep 17 00:00:00 2001 From: Arkadiusz Raj Date: Sun, 1 Apr 2018 15:37:10 +0200 Subject: [PATCH] Protection to not run Eth config when USB camera is connected --- modules/videoio/src/cap_aravis.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/videoio/src/cap_aravis.cpp b/modules/videoio/src/cap_aravis.cpp index 165284b917..1d09826a09 100644 --- a/modules/videoio/src/cap_aravis.cpp +++ b/modules/videoio/src/cap_aravis.cpp @@ -231,15 +231,16 @@ bool CvCaptureCAM_Aravis::init_buffers() stream = NULL; } if( (stream = arv_camera_create_stream(camera, NULL, NULL)) ) { - g_object_set(stream, - "socket-buffer", ARV_GV_STREAM_SOCKET_BUFFER_AUTO, - "socket-buffer-size", 0, NULL); - g_object_set(stream, - "packet-resend", ARV_GV_STREAM_PACKET_RESEND_NEVER, NULL); - g_object_set(stream, - "packet-timeout", (unsigned) 40000, - "frame-retention", (unsigned) 200000, NULL); - + if( arv_camera_is_gv_device(camera) ) { + g_object_set(stream, + "socket-buffer", ARV_GV_STREAM_SOCKET_BUFFER_AUTO, + "socket-buffer-size", 0, NULL); + g_object_set(stream, + "packet-resend", ARV_GV_STREAM_PACKET_RESEND_NEVER, NULL); + g_object_set(stream, + "packet-timeout", (unsigned) 40000, + "frame-retention", (unsigned) 200000, NULL); + } payload = arv_camera_get_payload (camera); for (int i = 0; i < num_buffers; i++)