mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

motioncells: turn two global vars into static variables

Browse source 
Move 2 variable to motioncells_warpper and make them static.
This commit is contained in:
Stefan Sauer 2011-08-04 13:33:20 +02:00
parent 3d86389e06
commit f241dafe5c
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/opencv/gstmotioncells.c
View file

@ -105,9 +105,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_motion_cells_debug);
POINTER = NULL;\ POINTER = NULL;\
} }
int instanceCounter = 0;
gboolean element_id_was_max = false;
/* Filter signals and args */ /* Filter signals and args */
enum enum
{ {
@ -396,8 +393,7 @@ gst_motion_cells_init (GstMotioncells * filter, GstMotioncellsClass * gclass)
filter->datafileidx = 0; filter->datafileidx = 0;
g_mutex_lock (filter->propset_mutex); g_mutex_lock (filter->propset_mutex);
filter->id = instanceCounter; filter->id = motion_cells_init ();
motion_cells_init ();
g_mutex_unlock (filter->propset_mutex); g_mutex_unlock (filter->propset_mutex);
} }

8
ext/opencv/motioncells_wrapper.cpp
View file

@ -46,12 +46,13 @@
#include <limits.h> #include <limits.h>
#include "motioncells_wrapper.h" #include "motioncells_wrapper.h"
extern int instanceCounter; static int instanceCounter = 0;
extern bool element_id_was_max; static gboolean element_id_was_max = false;
MotionCells *mc; MotionCells *mc;
char p_str[] = "idx failed"; char p_str[] = "idx failed";
void int
motion_cells_init () motion_cells_init ()
{ {
mc = new MotionCells (); mc = new MotionCells ();
@ -67,6 +68,7 @@ motion_cells_init ()
instanceCounter = motioncellsfreeids.back (); instanceCounter = motioncellsfreeids.back ();
motioncellsfreeids.pop_back (); motioncellsfreeids.pop_back ();
} }
return tmpmc.id;
} }
int int

2
ext/opencv/motioncells_wrapper.h
View file

@ -62,7 +62,7 @@ extern "C"
{ {
#endif #endif
void motion_cells_init (); int motion_cells_init ();
int perform_detection_motion_cells (IplImage * p_image, double p_sensitivity, int perform_detection_motion_cells (IplImage * p_image, double p_sensitivity,
double p_framerate, int p_gridx, int p_gridy, double p_framerate, int p_gridx, int p_gridy,
long int p_timestamp_millisec, bool p_isVisible, bool p_useAlpha, long int p_timestamp_millisec, bool p_isVisible, bool p_useAlpha,