Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 12:24:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'perf-optimization'

Browse source
This commit is contained in:
Kenneth Keiter 2012-12-13 14:19:48 -08:00
commit 16583ca5b7
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main.cpp
View file

@ -944,7 +944,6 @@ void motionFunc( int x, int y)
void *poll_marker_capture(void *threadarg){ void *poll_marker_capture(void *threadarg){
while(1){ while(1){
marker_capturer.tick(); marker_capturer.tick();
usleep(1000 * MARKER_CAPTURE_INTERVAL);
} }
} }

2
markers.cpp
View file

@ -50,7 +50,7 @@ void MarkerCapture::acquire_color(CvScalar color){
/* Fetch a frame (if available) and process it, calling appropriate /* Fetch a frame (if available) and process it, calling appropriate
callbacks when data becomes available. */ callbacks when data becomes available. */
void MarkerCapture::tick(){ void MarkerCapture::tick(){
IplImage *thresh_frame; IplImage *thresh_frame = NULL;
CBlobResult blobs; CBlobResult blobs;
// Acquire the lock, update the current frame. // Acquire the lock, update the current frame.

4
markers.h
View file

@ -50,12 +50,12 @@ public:
MarkerCapture(int source_index); MarkerCapture(int source_index);
~MarkerCapture(); ~MarkerCapture();
int init_capture(); int init_capture();
void tick();
void end_capture(); void end_capture();
void tick();
void acquire_color(CvScalar color); void acquire_color(CvScalar color);
void frame_updated(void (*callback)(MarkerCapture* inst, IplImage* image, IplImage* thresh_image)); void frame_updated(void (*callback)(MarkerCapture* inst, IplImage* image, IplImage* thresh_image));
void position_updated(void (*callback)(MarkerCapture* inst, MarkerPositionEstimate position)); void position_updated(void (*callback)(MarkerCapture* inst, MarkerPositionEstimate position));
void glDrawIplImage(IplImage *img, int x, int, GLfloat xZoom, GLfloat yZoom); void glDrawIplImage(IplImage *img, int x, int, GLfloat xZoom, GLfloat yZoom);