Changeset 766

Timestamp:

Oct 12, 2006 4:00:02 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in pasound.c again, this time it is suspected that two input/output streams will be called by different threads, while pasound.c only expect it to be called by the same thread [thanks Norman Franke]

File:

• pjproject/trunk/pjmedia/src/pjmedia/pasound.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -64 +64 @@
     pj_bool_t            quit_flag;
 
-    pj_bool_t            thread_exited;
-    pj_bool_t            thread_initialized;
-    pj_thread_desc       thread_desc;
-    pj_thread_t         *thread;
+    pj_bool_t            rec_thread_exited;
+    pj_bool_t            rec_thread_initialized;
+    pj_thread_desc       rec_thread_desc;
+    pj_thread_t         *rec_thread;
+
+    pj_bool_t            play_thread_exited;
+    pj_bool_t            play_thread_initialized;
+    pj_thread_desc       play_thread_desc;
+    pj_thread_t         *play_thread;
 };
 
@@ -90 +95 @@
         return paContinue;
 
-    if (stream->thread_initialized == 0) {
-        status = pj_thread_register("pa_rec", stream->thread_desc, 
-                                    &stream->thread);
-        stream->thread_initialized = 1;
+    if (stream->rec_thread_initialized == 0) {
+        status = pj_thread_register("pa_rec", stream->rec_thread_desc, 
+                                    &stream->rec_thread);
+        stream->rec_thread_initialized = 1;
         PJ_LOG(5,(THIS_FILE, "Recorder thread started"));
     }
@@ -113 +118 @@
 
 on_break:
-    stream->thread_exited = 1;
+    stream->rec_thread_exited = 1;
     return paAbort;
 }
@@ -138 +143 @@
         return paContinue;
 
-    if (stream->thread_initialized == 0) {
-        status = pj_thread_register("portaudio", stream->thread_desc,
-                                    &stream->thread);
-        stream->thread_initialized = 1;
+    if (stream->play_thread_initialized == 0) {
+        status = pj_thread_register("portaudio", stream->play_thread_desc,
+                                    &stream->play_thread);
+        stream->play_thread_initialized = 1;
         PJ_LOG(5,(THIS_FILE, "Player thread started"));
     }
@@ -159 +164 @@
 
 on_break:
-    stream->thread_exited = 1;
+    stream->play_thread_exited = 1;
     return paAbort;
 }
@@ -744 +749 @@
 
     stream->quit_flag = 1;
-    for (i=0; !stream->thread_exited && i<100; ++i)
+    for (i=0; !stream->rec_thread_exited && i<100; ++i)
+        pj_thread_sleep(10);
+    for (i=0; !stream->play_thread_exited && i<100; ++i)
         pj_thread_sleep(10);
 
@@ -770 +777 @@
 
     stream->quit_flag = 1;
-    for (i=0; !stream->thread_exited && i<100; ++i) {
+    for (i=0; !stream->rec_thread_exited && i<100; ++i) {
+        pj_thread_sleep(1);
+    }
+    for (i=0; !stream->play_thread_exited && i<100; ++i) {
         pj_thread_sleep(1);
     }