Changeset 451 for pjproject/trunk/pjmedia/src/pjmedia/dsound.c

Timestamp:

May 17, 2006 5:15:48 PM (18 years ago)

Author:

bennylp

Message:

Rearrange DirectSound? closing steps to reduce blocking delay

File:

• pjproject/trunk/pjmedia/src/pjmedia/dsound.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -751 +751 @@
     pjmedia_snd_stream_stop(stream);
 
+    if (stream->play_strm.ds.play.lpDsBuffer) {
+        IDirectSoundBuffer_Release( stream->play_strm.ds.play.lpDsBuffer );
+        stream->play_strm.ds.play.lpDsBuffer = NULL;
+    }
+
+    if (stream->play_strm.ds.play.lpDs) {
+        IDirectSound_Release( stream->play_strm.ds.play.lpDs );
+        stream->play_strm.ds.play.lpDs = NULL;
+    }
+
     if (stream->play_strm.lpDsNotify) {
-        IDirectSoundNotify_Release( stream->play_strm.lpDsNotify );
+        //No need?
+        //IDirectSoundNotify_Release( stream->play_strm.lpDsNotify );
         stream->play_strm.lpDsNotify = NULL;
     }
@@ -761 +772 @@
     }
 
-    if (stream->play_strm.ds.play.lpDsBuffer) {
-        IDirectSoundBuffer_Release( stream->play_strm.ds.play.lpDsBuffer );
-        stream->play_strm.ds.play.lpDsBuffer = NULL;
-    }
-
-    if (stream->play_strm.ds.play.lpDs) {
-        IDirectSound_Release( stream->play_strm.ds.play.lpDs );
-        stream->play_strm.ds.play.lpDs = NULL;
+
+    if (stream->rec_strm.ds.capture.lpDsBuffer) {
+        IDirectSoundCaptureBuffer_Release( stream->rec_strm.ds.capture.lpDsBuffer );
+        stream->rec_strm.ds.capture.lpDsBuffer = NULL;
+    }
+
+    if (stream->rec_strm.ds.capture.lpDs) {
+        IDirectSoundCapture_Release( stream->rec_strm.ds.capture.lpDs );
+        stream->rec_strm.ds.capture.lpDs = NULL;
     }
 
     if (stream->rec_strm.lpDsNotify) {
-        IDirectSoundNotify_Release( stream->rec_strm.lpDsNotify );
+        //No need?
+        //IDirectSoundNotify_Release( stream->rec_strm.lpDsNotify );
         stream->rec_strm.lpDsNotify = NULL;
     }
@@ -779 +792 @@
         CloseHandle(stream->rec_strm.hEvent);
         stream->rec_strm.hEvent = NULL;
-    }
-
-    if (stream->rec_strm.ds.capture.lpDsBuffer) {
-        IDirectSoundCaptureBuffer_Release( stream->rec_strm.ds.capture.lpDsBuffer );
-        stream->rec_strm.ds.capture.lpDsBuffer = NULL;
-    }
-
-    if (stream->rec_strm.ds.capture.lpDs) {
-        IDirectSoundCapture_Release( stream->rec_strm.ds.capture.lpDs );
-        stream->rec_strm.ds.capture.lpDs = NULL;
     }