Changeset 1825 for pjproject/trunk

Timestamp:

Feb 28, 2008 2:16:43 PM (17 years ago)

Author:

bennylp

Message:

Ticket #496: Crash on sound port when only player is opened and delaybuf enabled

File:

• pjproject/trunk/pjmedia/src/pjmedia/sound_port.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -100 +100 @@
 
 #if PJMEDIA_SOUND_USE_DELAYBUF
-    status = pjmedia_delay_buf_get(snd_port->delay_buf, (pj_int16_t*)output);
-    if (status != PJ_SUCCESS) {
-        pj_bzero(output, size);
-    }
-
-    pjmedia_port_put_frame(port, &frame);
+    if (snd_port->delay_buf) {
+        status = pjmedia_delay_buf_get(snd_port->delay_buf, (pj_int16_t*)output);
+        if (status != PJ_SUCCESS) {
+            pj_bzero(output, size);
+        }
+
+        frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+        pjmedia_port_put_frame(port, &frame);
+    }
 #endif
 
@@ -201 +204 @@
 
 #if PJMEDIA_SOUND_USE_DELAYBUF
-    PJ_UNUSED_ARG(size);
-    PJ_UNUSED_ARG(timestamp);
-    PJ_UNUSED_ARG(frame);
-    pjmedia_delay_buf_put(snd_port->delay_buf, (pj_int16_t*)input);
+    if (snd_port->delay_buf) {
+        pjmedia_delay_buf_put(snd_port->delay_buf, (pj_int16_t*)input);
+    } else {
+        frame.buf = (void*)input;
+        frame.size = size;
+        frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+        frame.timestamp.u32.lo = timestamp;
+
+        pjmedia_port_put_frame(port, &frame);
+    }
 #else
     frame.buf = (void*)input;