gvstream: put a lower limit to socket buffer size

Fix #865
AravisProject · Feb 22, 2024 · 90d0cb4 · 90d0cb4
1 parent fc3fe8f
commit 90d0cb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/arvgvdevice.c b/src/arvgvdevice.c
@@ -1876,14 +1876,14 @@ arv_gv_device_create_stream (ArvDevice *device, ArvStreamCallback callback, void
 	      priv->packet_size_adjustment != ARV_GV_PACKET_SIZE_ADJUSTMENT_ON_FAILURE_ONCE) ||
 	     !priv->first_stream_created)) {
 		auto_packet_size (gv_device,
-				  priv->packet_size_adjustment == ARV_GV_PACKET_SIZE_ADJUSTMENT_ON_FAILURE ||
-				      priv->packet_size_adjustment == ARV_GV_PACKET_SIZE_ADJUSTMENT_ON_FAILURE_ONCE,
-				  &local_error);
-		if (local_error != NULL) {
-			g_propagate_error (error, local_error);
-			return NULL;
-		}
-	}
+                                  priv->packet_size_adjustment == ARV_GV_PACKET_SIZE_ADJUSTMENT_ON_FAILURE ||
+                                  priv->packet_size_adjustment == ARV_GV_PACKET_SIZE_ADJUSTMENT_ON_FAILURE_ONCE,
+                                  &local_error);
+                if (local_error != NULL) {
+                        g_propagate_error (error, local_error);
+                        return NULL;
+                }
+        }
 
 	stream = arv_gv_stream_new (gv_device, callback, user_data, destroy, error);
 	if (!ARV_IS_STREAM (stream))

diff --git a/src/arvgvstream.c b/src/arvgvstream.c
@@ -59,6 +59,8 @@
 #endif
 
 #define ARV_GV_STREAM_DISCARD_LATE_FRAME_THRESHOLD	100
+#define ARV_GV_STREAM_BUFFER_SIZE_PROTOCOL_OVERHEAD     1024 /* Some room for protocol overhead (IP + UDP + GV) */
+#define ARV_GV_STREAM_MIN_BUFFER_SIZE                   20 * 1024
 
 enum {
 	ARV_GV_STREAM_PROPERTY_0,
@@ -237,12 +239,16 @@ _update_socket (ArvGvStreamThreadData *thread_data, ArvBuffer *buffer)
 			break;
 		case ARV_GV_STREAM_SOCKET_BUFFER_AUTO:
 			if (thread_data->socket_buffer_size <= 0)
-				buffer_size = buffer->priv->allocated_size;
+				buffer_size = buffer->priv->allocated_size + ARV_GV_STREAM_BUFFER_SIZE_PROTOCOL_OVERHEAD;
 			else
-				buffer_size = MIN (buffer->priv->allocated_size, thread_data->socket_buffer_size);
+				buffer_size = MIN (buffer->priv->allocated_size +
+                                                   ARV_GV_STREAM_BUFFER_SIZE_PROTOCOL_OVERHEAD,
+                                                   thread_data->socket_buffer_size);
 			break;
 	}
 
+        buffer_size = MAX (buffer_size, ARV_GV_STREAM_MIN_BUFFER_SIZE);
+
 	if (buffer_size != thread_data->current_socket_buffer_size) {
 		gboolean result;