diff options
| -rw-r--r-- | cmake/FindYAT.cmake | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/cameras/uca-pf-camera.c | 33 | ||||
| -rw-r--r-- | src/cameras/uca-pylon-camera.c | 17 | ||||
| -rw-r--r-- | src/cameras/uca-ufo-camera.c | 64 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/benchmark.c | 282 |
7 files changed, 297 insertions, 108 deletions
diff --git a/cmake/FindYAT.cmake b/cmake/FindYAT.cmake index 1f9a98b..0d3ec56 100644 --- a/cmake/FindYAT.cmake +++ b/cmake/FindYAT.cmake @@ -3,4 +3,3 @@ find_package(PkgConfig) pkg_check_modules(YAT yat>=1.7.7) find_library(YAT_LIB yat ${YAT_LIBRARY_DIRS}) - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4e14787..0a38e17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -160,6 +160,10 @@ set_target_properties(uca PROPERTIES target_link_libraries(uca ${uca_LIBS}) +if (NOT DEFINED WITH_REFERENCE) + set(WITH_REFERENCE TRUE) +endif() + # --- Build documentation ----------------------------------------------------- if (NOT DEFINED WITH_REFERENCE) @@ -300,6 +304,6 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "libuca-${UCA_VERSION_STRING}" CACHE INTERNAL set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${UCA_VERSION_STRING}-${CMAKE_SYSTEM_PROCESSOR}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../libuca.spec.in" - "${CMAKE_CURRENT_BINARY_DIR}/../libuca.spec" @ONLY IMMEDIATE) + "${CMAKE_CURRENT_BINARY_DIR}/../libuca.spec" @ONLY IMMEDIATE) include(CPack) diff --git a/src/cameras/uca-pf-camera.c b/src/cameras/uca-pf-camera.c index 90f887b..5bc8c6b 100644 --- a/src/cameras/uca-pf-camera.c +++ b/src/cameras/uca-pf-camera.c @@ -76,6 +76,8 @@ static gint base_overrideables[] = { PROP_ROI_Y, PROP_ROI_WIDTH, PROP_ROI_HEIGHT, + PROP_ROI_WIDTH_MULTIPLIER, + PROP_ROI_HEIGHT_MULTIPLIER, PROP_HAS_STREAMING, PROP_HAS_CAMRAM_RECORDING, 0 @@ -253,62 +255,52 @@ static void uca_pf_camera_get_property(GObject *object, guint property_id, GValu case PROP_SENSOR_WIDTH: g_value_set_uint(value, 1280); break; - case PROP_SENSOR_HEIGHT: g_value_set_uint(value, 1024); break; - case PROP_SENSOR_BITDEPTH: g_value_set_uint(value, 8); break; - case PROP_SENSOR_HORIZONTAL_BINNING: break; - case PROP_SENSOR_HORIZONTAL_BINNINGS: break; - case PROP_SENSOR_VERTICAL_BINNING: break; - case PROP_SENSOR_VERTICAL_BINNINGS: break; - case PROP_SENSOR_MAX_FRAME_RATE: g_value_set_float(value, 488.0); break; - case PROP_HAS_STREAMING: g_value_set_boolean(value, TRUE); break; - case PROP_HAS_CAMRAM_RECORDING: g_value_set_boolean(value, FALSE); break; - case PROP_EXPOSURE_TIME: break; - case PROP_ROI_X: g_value_set_uint(value, 0); break; - case PROP_ROI_Y: g_value_set_uint(value, 0); break; - case PROP_ROI_WIDTH: g_value_set_uint(value, 1280); break; - case PROP_ROI_HEIGHT: g_value_set_uint(value, 1024); break; - + case PROP_ROI_WIDTH_MULTIPLIER: + g_value_set_uint(value, 1); + break; + case PROP_ROI_HEIGHT_MULTIPLIER: + g_value_set_uint(value, 1); + break; case PROP_NAME: g_value_set_string(value, "Photon Focus MV2-D1280-640-CL"); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; @@ -317,6 +309,15 @@ static void uca_pf_camera_get_property(GObject *object, guint property_id, GValu static void uca_pf_camera_finalize(GObject *object) { + UcaPfCameraPrivate *priv = UCA_PF_CAMERA_GET_PRIVATE(object); + + if (priv->fg) { + if (priv->fg_mem) + Fg_FreeMemEx(priv->fg, priv->fg_mem); + + Fg_FreeGrabber(priv->fg); + } + G_OBJECT_CLASS(uca_pf_camera_parent_class)->finalize(object); } diff --git a/src/cameras/uca-pylon-camera.c b/src/cameras/uca-pylon-camera.c index 6fef112..373f713 100644 --- a/src/cameras/uca-pylon-camera.c +++ b/src/cameras/uca-pylon-camera.c @@ -30,7 +30,7 @@ "libpylon error %i", err); \ return; \ }*/ - + #define UCA_PYLON_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_PYLON_CAMERA, UcaPylonCameraPrivate)) G_DEFINE_TYPE(UcaPylonCamera, uca_pylon_camera, UCA_TYPE_CAMERA) @@ -53,7 +53,7 @@ enum { PROP_ROI_WIDTH_DEFAULT = N_BASE_PROPERTIES, PROP_ROI_HEIGHT_DEFAULT, PROP_GAIN, - N_PROPERTIES + N_PROPERTIES }; static gint base_overrideables[] = { @@ -148,7 +148,7 @@ static void uca_pylon_camera_grab(UcaCamera *camera, gpointer *data, GError **er UcaPylonCameraPrivate *priv = UCA_PYLON_CAMERA_GET_PRIVATE(camera); if (*data == NULL) { - *data = g_malloc0(priv->width * priv->height * priv->num_bytes); + *data = g_malloc0(priv->width * priv->height * priv->num_bytes); } pylon_camera_grab(data, error); } @@ -216,14 +216,14 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV GError* error = NULL; switch (property_id) { - - case PROP_SENSOR_WIDTH: + + case PROP_SENSOR_WIDTH: pylon_camera_get_sensor_size(&priv->width, &priv->height, &error); g_value_set_uint(value, priv->width); g_print("pylon_get_property sensor width %d\n", priv->width); break; - case PROP_SENSOR_HEIGHT: + case PROP_SENSOR_HEIGHT: pylon_camera_get_sensor_size(&priv->width, &priv->height, &error); g_value_set_uint(value, priv->height); g_print("pylon_get_property sensor height %d\n", priv->height); @@ -329,7 +329,7 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV } break; - case PROP_NAME: + case PROP_NAME: { //char *name = NULL; //pylon_get_name(priv->pylon, &name); @@ -385,7 +385,7 @@ static void uca_pylon_camera_class_init(UcaPylonCameraClass *klass) for (guint i = 0; base_overrideables[i] != 0; i++) g_object_class_override_property(gobject_class, base_overrideables[i], uca_camera_props[base_overrideables[i]]); - pylon_properties[PROP_NAME] = + pylon_properties[PROP_NAME] = g_param_spec_string("name", "Name of the camera", "Name of the camera", @@ -458,4 +458,3 @@ static void uca_pylon_camera_init(UcaPylonCamera *self) self->priv->binnings = g_value_array_new(1); g_value_array_append(self->priv->binnings, &val); } - diff --git a/src/cameras/uca-ufo-camera.c b/src/cameras/uca-ufo-camera.c index 66a42c4..51b984a 100644 --- a/src/cameras/uca-ufo-camera.c +++ b/src/cameras/uca-ufo-camera.c @@ -93,13 +93,25 @@ static guint N_PROPERTIES; static GHashTable *ufo_property_table; /* maps from prop_id to RegisterInfo* */ struct _UcaUfoCameraPrivate { - pcilib_t *handle; - guint n_bits; - guint bit_mode; + pcilib_t *handle; + pcilib_timeout_t timeout; + guint n_bits; + enum { + FPGA_48MHZ = 0, + FPGA_40MHZ + } frequency; }; -static void ignore_messages(const char *format, ...) +static void +error_handler (const char *format, ...) { + va_list args; + gchar *message; + + va_start (args, format); + message = g_strdup_vprintf (format, args); + g_warning ("%s", message); + va_end (args); } static guint @@ -145,7 +157,7 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error) return NULL; } - pcilib_set_error_handler(&ignore_messages, &ignore_messages); + pcilib_set_error_handler(&error_handler, &error_handler); /* Generate properties from model description */ model_description = pcilib_get_model_description(handle); @@ -194,7 +206,7 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error) UcaUfoCamera *camera = g_object_new(UCA_TYPE_UFO_CAMERA, NULL); UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera); - priv->bit_mode = read_register_value (handle, "bit_mode"); + priv->frequency = read_register_value (handle, "bit_mode"); adc_resolution = read_register_value (handle, "adc_resolution"); switch (adc_resolution) { @@ -216,16 +228,24 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error) static void uca_ufo_camera_start_recording(UcaCamera *camera, GError **error) { + UcaUfoCameraPrivate *priv; + gdouble exposure_time; + int err; + g_return_if_fail(UCA_IS_UFO_CAMERA(camera)); - UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera); - int err = pcilib_start(priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT); + + priv = UCA_UFO_CAMERA_GET_PRIVATE(camera); + err = pcilib_start(priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT); PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_START_RECORDING); gboolean transfer_async = FALSE; g_object_get(G_OBJECT(camera), "transfer-asynchronously", &transfer_async, + "exposure-time", &exposure_time, NULL); + priv->timeout = ((pcilib_timeout_t) (exposure_time * 1000 + 50.0) * 1000); + if (transfer_async) { pcilib_trigger(priv->handle, PCILIB_EVENT0, 0, NULL); pcilib_stream(priv->handle, &event_callback, camera); @@ -251,15 +271,16 @@ static void uca_ufo_camera_grab(UcaCamera *camera, gpointer *data, GError **erro { g_return_if_fail(UCA_IS_UFO_CAMERA(camera)); UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(camera); - const gsize size = SENSOR_WIDTH * SENSOR_HEIGHT * sizeof(guint16); - pcilib_event_id_t event_id; + pcilib_event_id_t event_id; pcilib_event_info_t event_info; - size_t err = 0; + size_t err; + + const gsize size = SENSOR_WIDTH * SENSOR_HEIGHT * sizeof(guint16); err = pcilib_trigger(priv->handle, PCILIB_EVENT0, 0, NULL); PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_TRIGGER); - err = pcilib_get_next_event(priv->handle, PCILIB_TIMEOUT_INFINITE, &event_id, sizeof(pcilib_event_info_t), &event_info); + err = pcilib_get_next_event(priv->handle, priv->timeout, &event_id, sizeof(pcilib_event_info_t), &event_info); PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_NEXT_EVENT); if (*data == NULL) @@ -289,15 +310,17 @@ static void uca_ufo_camera_grab(UcaCamera *camera, gpointer *data, GError **erro PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_MAYBE_CORRUPTED); } -static void uca_ufo_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +static void +uca_ufo_camera_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { UcaUfoCameraPrivate *priv = UCA_UFO_CAMERA_GET_PRIVATE(object); switch (property_id) { case PROP_EXPOSURE_TIME: { - pcilib_register_value_t reg_value = (pcilib_register_value_t) EXPOSURE_TIME_SCALE * g_value_get_double(value); - pcilib_write_register(priv->handle, NULL, "exp_time", reg_value); + const guint frequency = priv->frequency == FPGA_40MHZ ? 40 : 48; + pcilib_register_value_t reg_value = (pcilib_register_value_t) 129 / frequency * 1000 * 1000 * g_value_get_double(value); + pcilib_write_register(priv->handle, NULL, "cmosis_exp_time", reg_value); } break; case PROP_ROI_X: @@ -353,12 +376,12 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G break; case PROP_SENSOR_TEMPERATURE: { - const double a = priv->bit_mode == 0 ? 0.3 : 0.25; - const double b = priv->bit_mode == 0 ? 1000 : 1200; + const double a = priv->frequency == FPGA_48MHZ ? 0.3 : 0.25; + const double b = priv->frequency == FPGA_48MHZ ? 1000 : 1200; guint32 temperature; temperature = read_register_value (priv->handle, "sensor_temperature"); - g_value_set_double (value, a * temperature - b); + g_value_set_double (value, a * (temperature - b)); } break; case PROP_FPGA_TEMPERATURE: @@ -372,7 +395,10 @@ uca_ufo_camera_get_property(GObject *object, guint property_id, GValue *value, G } break; case PROP_EXPOSURE_TIME: - g_value_set_double (value, read_register_value (priv->handle, "exp_time") / EXPOSURE_TIME_SCALE); + { + const gdouble frequency = priv->frequency == FPGA_40MHZ ? 40.0 : 48.0; + g_value_set_double (value, read_register_value (priv->handle, "cmosis_exp_time") * 129 / frequency / 1000 / 1000 ); + } break; case PROP_HAS_STREAMING: g_value_set_boolean(value, TRUE); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5797621..4686b84 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -41,7 +41,9 @@ endif() add_executable(grab grab.c) add_executable(grab-async grab-async.c) +add_executable(benchmark benchmark.c) +target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) diff --git a/test/benchmark.c b/test/benchmark.c index 0d7962a..0b4f6f8 100644 --- a/test/benchmark.c +++ b/test/benchmark.c @@ -15,87 +15,245 @@ with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA */ -#define __USE_BSD -#include <unistd.h> -#undef __USE_BSD -#include <sys/time.h> -#include <stdio.h> +#include <glib-object.h> +#include <signal.h> +#include <string.h> #include <stdlib.h> +#include "uca-camera.h" -#include "uca.h" +typedef void (*GrabFrameFunc) (UcaCamera *camera, gpointer buffer, guint n_frames); -static __suseconds_t time_diff(struct timeval *start, struct timeval *stop) +static UcaCamera *camera = NULL; + +static void +sigint_handler(int signal) +{ + g_print ("Closing down libuca\n"); + uca_camera_stop_recording (camera, NULL); + g_object_unref (camera); + exit (signal); +} + +static void +print_usage (void) +{ + gchar **types; + + g_print ("Usage: benchmark ("); + types = uca_camera_get_types (); + + for (guint i = 0; types[i] != NULL; i++) { + if (types[i+1] == NULL) + g_print ("%s)", types[i]); + else + g_print ("%s | ", types[i]); + } + + g_print ("\n"); + g_strfreev (types); +} + +static void +log_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user) +{ + gsize n_written; + GError *error = NULL; + GIOChannel *channel = user; + +#if GLIB_CHECK_VERSION(2, 26, 0) + GTimeZone *tz; + GDateTime *date_time; + gchar *new_message; + + tz = g_time_zone_new_local (); + date_time = g_date_time_new_now (tz); + + new_message = g_strdup_printf ("[%s] %s\n", + g_date_time_format (date_time, "%FT%H:%M:%S%z"), message); + + g_time_zone_unref (tz); + g_date_time_unref (date_time); + + g_io_channel_write_chars (channel, new_message, strlen (new_message), &n_written, &error); + g_assert_no_error (error); + g_free (new_message); +#else + g_io_channel_write_chars (channel, message, strlen (message), &n_written, &error); + g_assert_no_error (error); +#endif + + g_io_channel_flush (channel, &error); + g_assert_no_error (error); +} + +static void +grab_frames_sync (UcaCamera *camera, gpointer buffer, guint n_frames) { - return (stop->tv_sec - start->tv_sec)*1000000 + (stop->tv_usec - start->tv_usec); + GError *error = NULL; + + uca_camera_start_recording (camera, &error); + + for (guint i = 0; i < n_frames; i++) { + uca_camera_grab(camera, &buffer, &error); + + if (error != NULL) { + g_warning ("Error grabbing frame %02i/%i: `%s'", i, n_frames, error->message); + g_error_free (error); + error = NULL; + } + } + + uca_camera_stop_recording (camera, &error); } -void grab_callback_raw(uint32_t image_number, void *buffer, void *meta_data, void *user) +static void +grab_callback (gpointer data, gpointer user_data) { - uint32_t *count = (uint32_t *) user; - *count = image_number; + guint *n_acquired_frames = user_data; + *n_acquired_frames += 1; +} + +static void +grab_frames_async (UcaCamera *camera, gpointer buffer, guint n_frames) +{ + GError *error = NULL; + guint n_acquired_frames = 0; + + uca_camera_set_grab_func (camera, grab_callback, &n_acquired_frames); + uca_camera_start_recording (camera, &error); + + /* + * Behold! Spinlooping is probably a bad idea but nowadays single core + * machines are relatively rare. + */ + while (n_acquired_frames < n_frames) + ; + + uca_camera_stop_recording (camera, &error); + } -void benchmark_cam(uca_camera *cam) +static void +benchmark_method (UcaCamera *camera, gpointer buffer, GrabFrameFunc func, guint n_runs, guint n_frames, guint n_bytes) { - char name[256]; - uca_cam_get_property(cam, UCA_PROP_NAME, name, 256); - - uint32_t val = 5000; - uca_cam_set_property(cam, UCA_PROP_EXPOSURE, &val); - val = 0; - uca_cam_set_property(cam, UCA_PROP_DELAY, &val); - - uint32_t width, height, bits; - uca_cam_get_property(cam, UCA_PROP_WIDTH, &width, 0); - uca_cam_get_property(cam, UCA_PROP_HEIGHT, &height, 0); - uca_cam_get_property(cam, UCA_PROP_BITDEPTH, &bits, 0); - int pixel_size = bits == 8 ? 1 : 2; - - struct timeval start, stop; - - for (int i = 0; i < 2; i++) { - char *buffer = (char *) malloc(width*height*pixel_size); - uca_cam_set_property(cam, UCA_PROP_HEIGHT, &height); - uca_cam_alloc(cam, 20); - - /* - * Experiment 1: Grab n frames manually - */ - gettimeofday(&start, NULL); - uca_cam_start_recording(cam); - for (int i = 0; i < 1000; i++) - uca_cam_grab(cam, (char *) buffer, NULL); - - uca_cam_stop_recording(cam); - gettimeofday(&stop, NULL); - - float seconds = time_diff(&start, &stop) / 1000000.0; - printf("%f,%s;%i;%i;1;%.2f;%.2f\n", seconds, - name, width, height, 1000.0 / seconds, - width*height*pixel_size*1000.0/ (1024*1024*seconds)); - - height /= 2; - free(buffer); + GTimer *timer; + gdouble fps; + gdouble bandwidth; + gdouble total_time = 0.0; + GError *error = NULL; + + g_print ("%-10i%-10i", n_frames, n_runs); + timer = g_timer_new (); + g_assert_no_error (error); + + for (guint run = 0; run < n_runs; run++) { + g_message ("Start run %i of %i", run, n_runs); + g_timer_start (timer); + + func (camera, buffer, n_frames); + + g_timer_stop (timer); + total_time += g_timer_elapsed (timer, NULL); } + + g_assert_no_error (error); + + fps = n_runs * n_frames / total_time; + bandwidth = n_bytes * fps / 1024 / 1024; + g_print ("%-16.2f%-16.2f\n", fps, bandwidth); + + g_timer_destroy (timer); +} + +static void +benchmark (UcaCamera *camera) +{ + const guint n_runs = 3; + const guint n_frames = 100; + + guint sensor_width; + guint sensor_height; + guint roi_width; + guint roi_height; + guint bits; + guint n_bytes_per_pixel; + guint n_bytes; + gdouble exposure = 0.00001; + gpointer buffer; + + g_object_set (G_OBJECT (camera), + "exposure-time", exposure, + NULL); + + g_object_get (G_OBJECT (camera), + "sensor-width", &sensor_width, + "sensor-height", &sensor_height, + "sensor-bitdepth", &bits, + "roi-width", &roi_width, + "roi-height", &roi_height, + "exposure-time", &exposure, + NULL); + + g_print ("# --- General information ---\n"); + g_print ("# Sensor size: %ix%i\n", sensor_width, sensor_height); + g_print ("# ROI size: %ix%i\n", roi_width, roi_height); + g_print ("# Exposure time: %fs\n", exposure); + + /* Synchronous frame acquisition */ + g_print ("# %-10s%-10s%-10s%-16s%-16s\n", "type", "n_frames", "n_runs", "frames/s", "MiB/s"); + g_print (" %-10s", "sync"); + + g_message ("Start synchronous benchmark"); + + n_bytes_per_pixel = bits > 8 ? 2 : 1; + n_bytes = roi_width * roi_height * n_bytes_per_pixel; + buffer = g_malloc0(n_bytes); + + benchmark_method (camera, buffer, grab_frames_sync, n_runs, n_frames, n_bytes); + + /* Asynchronous frame acquisition */ + g_object_set (G_OBJECT(camera), + "transfer-asynchronously", TRUE, + NULL); + + g_message ("Start asynchronous benchmark"); + g_print (" %-10s", "async"); + + benchmark_method (camera, buffer, grab_frames_async, n_runs, n_frames, n_bytes); + + g_free (buffer); } -int main(int argc, char *argv[]) +int +main (int argc, char *argv[]) { - uca *u = uca_init(NULL); - if (u == NULL) { - printf("Couldn't find a camera\n"); + GIOChannel *log_channel; + GError *error = NULL; + + (void) signal (SIGINT, sigint_handler); + + if (argc < 2) { + print_usage(); return 1; } - printf("# camera;width;height;experiment;frames-per-second;throughput in MB/s\n"); + log_channel = g_io_channel_new_file ("error.log", "a+", &error); + g_assert_no_error (error); + g_log_set_handler (NULL, G_LOG_LEVEL_MASK, log_handler, log_channel); + + g_type_init(); + camera = uca_camera_new(argv[1], &error); - /* take first camera */ - uca_camera *cam = u->cameras; - while (cam != NULL) { - benchmark_cam(cam); - cam = cam->next; + if (camera == NULL) { + g_error ("Initialization: %s", error->message); + return 1; } - uca_destroy(u); + benchmark (camera); + + g_object_unref (camera); + g_io_channel_shutdown (log_channel, TRUE, &error); + g_assert_no_error (error); + return 0; } |