Changeset 767:de19eb8842c4 in mediastreamer2

Timestamp:

Nov 9, 2009 8:39:26 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

fix race condition

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@755 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2/src

Files:

• winsnd2.c (modified) (4 diffs)
• winsndds.cpp (modified) (4 diffs)

linphone/mediastreamer2/src/winsnd2.c

@@ -902 +902 @@
 static void winsndcard_detect(MSSndCardManager *m){
         _winsndcard_detect(m);
-        ms_thread_create(&poller_thread,NULL,new_device_polling_thread,NULL);
+        if (poller_thread==NULL)
+                ms_thread_create(&poller_thread,NULL,new_device_polling_thread,NULL);
 }
 
@@ -1106 +1107 @@
                 }
         }
+#ifndef _TRUE_TIME
+        ms_mutex_lock(&f->ticker->lock);
+        ms_ticker_set_time_func(f->ticker,winsnd_get_cur_time,d);
+        ms_mutex_unlock(&f->ticker->lock);
+#endif
+
         bsize=WINSND_NSAMPLES*d->wfx.nAvgBytesPerSec/8000;
         ms_debug("Using input buffers of %i bytes",bsize);
@@ -1116 +1123 @@
         if (mr != MMSYSERR_NOERROR){
                 ms_error("waveInStart() error");
+#ifndef _TRUE_TIME
+                ms_mutex_lock(&f->ticker->lock);
+                ms_ticker_set_time_func(f->ticker,NULL,NULL);
+                ms_mutex_unlock(&f->ticker->lock);
+#endif
                 return ;
         }
-#ifndef _TRUE_TIME
-        ms_ticker_set_time_func(f->ticker,winsnd_get_cur_time,d);
-#endif
 }
 
@@ -1128 +1137 @@
         int i;
 #ifndef _TRUE_TIME
+        ms_mutex_lock(&f->ticker->lock);
         ms_ticker_set_time_func(f->ticker,NULL,NULL);
+        ms_mutex_unlock(&f->ticker->lock);
 #endif
         d->running=FALSE;

linphone/mediastreamer2/src/winsndds.cpp

@@ -1148 +1148 @@
 static void winsnddscard_detect(MSSndCardManager *m){
         _winsnddscard_detect(m);
-        ms_thread_create(&poller_thread,NULL,new_device_polling_thread,NULL);
+        if (poller_thread==NULL)
+                ms_thread_create(&poller_thread,NULL,new_device_polling_thread,NULL);
 }
 
@@ -1351 +1352 @@
         hr = IDirectSoundCaptureBuffer_Start( d->lpDirectSoundInputBuffer, DSCBSTART_LOOPING );
 
+        ms_mutex_lock(&f->ticker->lock);
         ms_ticker_set_time_func(f->ticker,winsndds_get_cur_time,d);
+        ms_mutex_unlock(&f->ticker->lock);
 
         d->thread_running=TRUE;
@@ -1371 +1374 @@
         ms_thread_join(d->thread,NULL);
 
+        ms_mutex_lock(&f->ticker->lock);
         ms_ticker_set_time_func(f->ticker,NULL,NULL);
+        ms_mutex_unlock(&f->ticker->lock);
 
         if( d->lpDirectSoundInputBuffer )
@@ -1520 +1525 @@
                 hr = IDirectSoundCaptureBuffer_Start( d_capture_filter->lpDirectSoundInputBuffer, DSCBSTART_LOOPING );
 
+                ms_mutex_lock(&f->ticker->lock);
                 ms_ticker_set_time_func(f_capture_filter->ticker,winsndds_get_cur_time,d_capture_filter);
+                ms_mutex_unlock(&f->ticker->lock);
 
                 d_capture_filter->thread_running=TRUE;