[aravis] fake_camera: really start frame_id from 65000.



commit b15d4ac837328c37ec4a39066bbf8019f05cca2c
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Thu May 19 22:23:33 2011 +0200

    fake_camera: really start frame_id from 65000.
    
    Using 65000 instead of 0 make bug releated to circular counter appear sooner.

 src/arvfakecamera.c   |    2 +-
 src/arvfakegvcamera.c |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/arvfakecamera.c b/src/arvfakecamera.c
index 6d0003f..02b6080 100644
--- a/src/arvfakecamera.c
+++ b/src/arvfakecamera.c
@@ -328,7 +328,6 @@ arv_fake_camera_set_trigger_frequency (ArvFakeCamera *camera, double frequency)
 	g_return_if_fail (frequency > 0.0);
 
 	camera->priv->trigger_frequency = frequency;
-	camera->priv->frame_id = 0;
 }
 
 guint32
@@ -481,6 +480,7 @@ arv_fake_camera_init (ArvFakeCamera *fake_camera)
 	fake_camera->priv = G_TYPE_INSTANCE_GET_PRIVATE (fake_camera, ARV_TYPE_FAKE_CAMERA, ArvFakeCameraPrivate);
 
 	fake_camera->priv->trigger_frequency = 25.0;
+	fake_camera->priv->frame_id = 65000; /* Trigger circular counter bugs sooner */
 }
 
 static void
diff --git a/src/arvfakegvcamera.c b/src/arvfakegvcamera.c
index d4671e4..492962a 100644
--- a/src/arvfakegvcamera.c
+++ b/src/arvfakegvcamera.c
@@ -93,7 +93,6 @@ arv_fake_gv_camera_thread (void *user_data)
 	void *packet_buffer;
 	size_t packet_size;
 	size_t payload = 0;
-	guint16 frame_id = 65500; /* Make circular counter bugs happen quicker */
 	guint16 block_id;
 	ptrdiff_t offset;
 	guint32 gv_packet_size;
@@ -180,8 +179,6 @@ arv_fake_gv_camera_thread (void *user_data)
 
 			g_socket_send_to (gv_camera->gvsp_socket, stream_address,
 					  packet_buffer, packet_size, NULL, NULL);
-
-			frame_id++;
 		}
 	} while (!cancel);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]