diff --git a/.gitignore b/.gitignore
index a12d4c8ec..fde161064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,251 @@ build/
*~
build-*/
.cache/
+install/
+
+conanfile.txt
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
\ No newline at end of file
diff --git a/src/arv-fake-camera.xml b/src/arv-fake-camera.xml
index 22bee1470..829184522 100644
--- a/src/arv-fake-camera.xml
+++ b/src/arv-fake-camera.xml
@@ -336,6 +336,21 @@
BigEndian
+
+ AcquisitionFrameCountRegister
+ 1
+ 65535
+
+
+
+ 0x310
+ 4
+ RW
+ Device
+ Unsigned
+ BigEndian
+
+
0
diff --git a/src/arvfakecamera.c b/src/arvfakecamera.c
index 3d8fda1d9..7f17b25a8 100644
--- a/src/arvfakecamera.c
+++ b/src/arvfakecamera.c
@@ -72,6 +72,7 @@ typedef struct {
guint32 frame_id;
double trigger_frequency;
+ int frameSeqCount;
GMutex fill_pattern_mutex;
@@ -218,10 +219,20 @@ arv_fake_camera_get_sleep_time_for_next_frame (ArvFakeCamera *camera, guint64 *n
g_return_val_if_fail (ARV_IS_FAKE_CAMERA (camera), 0);
- if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_MODE) == 1)
+ if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_MODE) == 1 &&
+ camera->priv->frameSeqCount >= _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
frame_period_time_us = 1000000L / camera->priv->trigger_frequency;
- else
- frame_period_time_us = (guint64) _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);
+
+ /*
+ //consider the time of the sequence inside the time between triggers?
+ frame_period_time_us -= _get_register(camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT) * _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US)
+ */
+ }
+ else {
+ frame_period_time_us =
+ (guint64) _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);
+ }
+
if (frame_period_time_us == 0) {
arv_warning_misc ("Invalid zero frame period, defaulting to 1 second");
@@ -866,9 +877,17 @@ arv_fake_camera_check_and_acknowledge_software_trigger (ArvFakeCamera *camera)
if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE) == 1) {
+
arv_fake_camera_write_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE, 0);
+ camera->priv->frameSeqCount = 1;
return TRUE;
- }
+ } else if (camera->priv->frameSeqCount < _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
+ camera->priv->frameSeqCount++;
+ if (camera->priv->frameSeqCount == _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
+ camera->priv->frameSeqCount = 65535;
+ }
+ return TRUE;
+ }
return FALSE;
}
@@ -906,6 +925,18 @@ arv_fake_camera_get_control_channel_privilege (ArvFakeCamera *camera)
return value;
}
+guint64
+arv_fake_camera_get_frame_period(ArvFakeCamera* camera)
+{
+ return _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);
+}
+
+int
+arv_fake_camera_get_acquisition_frame_count (ArvFakeCamera *camera)
+{
+ return _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT);
+}
+
void
arv_fake_camera_set_control_channel_privilege (ArvFakeCamera *camera, guint32 privilege)
{
@@ -1074,6 +1105,7 @@ arv_fake_camera_init (ArvFakeCamera *fake_camera)
fake_camera->priv->trigger_frequency = 25.0;
fake_camera->priv->frame_id = 65400; /* Trigger circular counter bugs sooner */
+ fake_camera->priv->frameSeqCount = 65535;//max possible value by default for acquisition count
}
static void
diff --git a/src/arvfakecamera.h b/src/arvfakecamera.h
index cf72fafd7..6dfc1993a 100644
--- a/src/arvfakecamera.h
+++ b/src/arvfakecamera.h
@@ -74,6 +74,7 @@ ARV_API void arv_set_fake_camera_genicam_filename (const char *filename);
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOURCE 0x304
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_ACTIVATION 0x308
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE 0x30c
+#define ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT 0x310
#define ARV_FAKE_CAMERA_REGISTER_ACQUISITION 0x124
#define ARV_FAKE_CAMERA_REGISTER_EXPOSURE_TIME_US 0x120
@@ -123,6 +124,9 @@ ARV_API gboolean arv_fake_camera_is_in_free_running_mode (ArvFakeCamera *camera
ARV_API gboolean arv_fake_camera_is_in_software_trigger_mode (ArvFakeCamera *camera);
ARV_API gboolean arv_fake_camera_check_and_acknowledge_software_trigger (ArvFakeCamera *camera);
+guint64 arv_fake_camera_get_frame_period (ArvFakeCamera *camera);
+int arv_fake_camera_get_acquisition_frame_count (ArvFakeCamera *camera);
+
ARV_API const char * arv_fake_camera_get_genicam_xml (ArvFakeCamera *camera, size_t *size);
G_END_DECLS
diff --git a/src/arvgvfakecamera.c b/src/arvgvfakecamera.c
index 1fe4c429c..86689b7d2 100644
--- a/src/arvgvfakecamera.c
+++ b/src/arvgvfakecamera.c
@@ -265,7 +265,6 @@ _thread (void *user_data)
do {
guint64 next_timestamp_us;
-
if (is_streaming) {
arv_fake_camera_get_sleep_time_for_next_frame (gv_fake_camera->priv->camera, &next_timestamp_us);
} else {
@@ -350,22 +349,22 @@ _thread (void *user_data)
packet_size = ARV_GV_FAKE_CAMERA_BUFFER_SIZE;
arv_gvsp_packet_new_data_leader (image_buffer->priv->frame_id,
- block_id,
- image_buffer->priv->timestamp_ns,
- image_buffer->priv->pixel_format,
- image_buffer->priv->width, image_buffer->priv->height,
- image_buffer->priv->x_offset, image_buffer->priv->y_offset,
- packet_buffer, &packet_size);
+ block_id,
+ image_buffer->priv->timestamp_ns,
+ image_buffer->priv->pixel_format,
+ image_buffer->priv->width, image_buffer->priv->height,
+ image_buffer->priv->x_offset, image_buffer->priv->y_offset,
+ packet_buffer, &packet_size);
if (g_random_double () >= gv_fake_camera->priv->gvsp_lost_packet_ratio)
g_socket_send_to (gv_fake_camera->priv->gvsp_socket, stream_address,
- packet_buffer, packet_size, NULL, &error);
+ packet_buffer, packet_size, NULL, &error);
else
arv_info_stream_thread ("Drop GVSP leader packet frame: %" G_GUINT64_FORMAT, image_buffer->priv->frame_id);
if (error != NULL) {
arv_warning_stream_thread ("[GvFakeCamera::thread] Failed to send leader for frame %" G_GUINT64_FORMAT
- ": %s", image_buffer->priv->frame_id, error->message);
+ ": %s", image_buffer->priv->frame_id, error->message);
g_clear_error (&error);
}
@@ -376,7 +375,7 @@ _thread (void *user_data)
size_t data_size;
data_size = MIN (gv_packet_size - ARV_GVSP_PACKET_PROTOCOL_OVERHEAD,
- payload - offset);
+ payload - offset);
packet_size = ARV_GV_FAKE_CAMERA_BUFFER_SIZE;
arv_gvsp_packet_new_data_block (image_buffer->priv->frame_id, block_id,
@@ -385,10 +384,10 @@ _thread (void *user_data)
if (g_random_double () >= gv_fake_camera->priv->gvsp_lost_packet_ratio)
g_socket_send_to (gv_fake_camera->priv->gvsp_socket, stream_address,
- packet_buffer, packet_size, NULL, &error);
+ packet_buffer, packet_size, NULL, &error);
else
arv_info_stream_thread ("Drop GVSP data packet frame:%" G_GUINT64_FORMAT
- ", block:%u", image_buffer->priv->frame_id, block_id);
+ ", block:%u", image_buffer->priv->frame_id, block_id);
if (error != NULL) {
arv_info_stream_thread ("[GvFakeCamera::thread] Failed to send frame block %d for frame"
@@ -403,18 +402,18 @@ _thread (void *user_data)
packet_size = ARV_GV_FAKE_CAMERA_BUFFER_SIZE;
arv_gvsp_packet_new_data_trailer (image_buffer->priv->frame_id, block_id,
- packet_buffer, &packet_size);
+ packet_buffer, &packet_size);
if (g_random_double () >= gv_fake_camera->priv->gvsp_lost_packet_ratio)
g_socket_send_to (gv_fake_camera->priv->gvsp_socket, stream_address,
- packet_buffer, packet_size, NULL, &error);
+ packet_buffer, packet_size, NULL, &error);
else
arv_info_stream_thread ("Drop GVSP trailer packet frame: %" G_GUINT64_FORMAT,
image_buffer->priv->frame_id);
if (error != NULL) {
arv_info_stream_thread ("[GvFakeCamera::thread] Failed to send trailer for frame %" G_GUINT64_FORMAT
- ": %s", image_buffer->priv->frame_id, error->message);
+ ": %s", image_buffer->priv->frame_id, error->message);
g_clear_error (&error);
}