Changeset 358 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Mar 24, 2006 8:41:20 PM (18 years ago)

Author:

bennylp

Message:

Added WAVE writer and resample port, and also found out why audio quality is poor with DirectSound?

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (20 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -29 +29 @@
 #include <pj/string.h>
 
+/* CONF_DEBUG enables detailed operation of the conference bridge.
+ * Beware that it prints large amounts of logs (several lines per frame).
+ */
 //#define CONF_DEBUG
 #ifdef CONF_DEBUG
 #   include <stdio.h>
-#   define TRACE_(x)   {printf x; fflush(stdout); }
+#   define TRACE_(x)   PJ_LOG(5,x)
 #else
 #   define TRACE_(x)
+#endif
+
+
+/* REC_FILE macro enables recording of the samples written to the sound
+ * device. The file contains RAW PCM data with no header, and has the
+ * same settings (clock rate etc) as the conference bridge.
+ * This should only be enabled when debugging audio quality *only*.
+ */
+//#define REC_FILE    "confrec.pcm"
+#ifdef REC_FILE
+static FILE *fhnd_rec;
 #endif
 
@@ -967 +981 @@
     pj_assert(count == conf->samples_per_frame);
 
+    TRACE_((THIS_FILE, "read_port %.*s: count=%d", 
+                       (int)cport->name.slen, cport->name.ptr,
+                       count));
+
     /* If port's samples per frame and sampling rate matches conference
      * bridge's settings, get the frame directly from the port.
@@ -976 +994 @@
         f.buf = frame;
         f.size = count * BYTES_PER_SAMPLE;
+
+        TRACE_((THIS_FILE, "  get_frame %.*s: count=%d", 
+                   (int)cport->name.slen, cport->name.ptr,
+                   count));
 
         status = (cport->port->get_frame)(cport->port, &f);
@@ -998 +1020 @@
             f.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
 
+            TRACE_((THIS_FILE, "  get_frame, count=%d", 
+                       cport->samples_per_frame));
+
             status = pjmedia_port_get_frame(cport->port, &f);
 
@@ -1006 +1031 @@
 
             if (f.type != PJMEDIA_FRAME_TYPE_AUDIO) {
+                TRACE_((THIS_FILE, "  get_frame returned non-audio"));
                 zero_samples( cport->rx_buf + cport->rx_buf_count,
                               cport->samples_per_frame);
@@ -1011 +1037 @@
 
             cport->rx_buf_count += cport->samples_per_frame;
+
+            TRACE_((THIS_FILE, "  rx buffer size is now %d",
+                    cport->rx_buf_count));
 
             pj_assert(cport->rx_buf_count <= cport->rx_buf_cap);
@@ -1023 +1052 @@
             unsigned src_count;
 
+            TRACE_((THIS_FILE, "  resample, input count=%d", 
+                    pjmedia_resample_get_input_size(cport->rx_resample)));
+
             pjmedia_resample_run( cport->rx_resample,cport->rx_buf, frame);
 
@@ -1033 +1065 @@
             }
 
+            TRACE_((THIS_FILE, "  rx buffer size is now %d",
+                    cport->rx_buf_count));
+
         } else {
 
@@ -1068 +1103 @@
         frame.size = 0;
 
-        if (cport->port && cport->port->put_frame)
+        if (cport->port && cport->port->put_frame) {
             pjmedia_port_put_frame(cport->port, &frame);
+        }
 
         cport->tx_level = 0;
@@ -1112 +1148 @@
         }
 
-    } else {
+    } else if (cport->sources) {
         /* No need to adjust signal level. */
         for (j=0; j<conf->samples_per_frame; ++j) {
             buf[j] = unsigned2pcm(cport->mix_buf[j] / cport->sources);
         }
+    } else {
+        // Not necessarry. Buffer has been zeroed before.
+        // zero_samples(buf, conf->samples_per_frame);
+        pj_assert(buf[0] == 0);
     }
 
@@ -1155 +1195 @@
             frame.timestamp.u64 = timestamp;
 
+            TRACE_((THIS_FILE, "put_frame %.*s, count=%d", 
+                               (int)cport->name.slen, cport->name.ptr,
+                               frame.size / BYTES_PER_SAMPLE));
+
             return pjmedia_port_put_frame(cport->port, &frame);
         } else
@@ -1186 +1230 @@
         pj_status_t status;
 
+        TRACE_((THIS_FILE, "write_port %.*s: count=%d", 
+                           (int)cport->name.slen, cport->name.ptr,
+                           cport->samples_per_frame));
+
         if (cport->port) {
             pjmedia_frame frame;
@@ -1193 +1241 @@
             frame.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
             frame.timestamp.u64 = timestamp;
+
+            TRACE_((THIS_FILE, "put_frame %.*s, count=%d", 
+                               (int)cport->name.slen, cport->name.ptr,
+                               frame.size / BYTES_PER_SAMPLE));
 
             status = pjmedia_port_put_frame(cport->port, &frame);
@@ -1206 +1258 @@
         }
 
+        TRACE_((THIS_FILE, " tx_buf count now is %d", 
+                           cport->tx_buf_count));
+
         return status;
     }
@@ -1222 +1277 @@
     unsigned ci, cj, i, j;
     
+    TRACE_((THIS_FILE, "- clock -"));
+
     /* Check that correct size is specified. */
     pj_assert(frame->size == conf->samples_per_frame *
@@ -1228 +1285 @@
     /* Must lock mutex (must we??) */
     pj_mutex_lock(conf->mutex);
-
-    TRACE_(("p"));
 
     /* Zero all port's temporary buffers. */
@@ -1245 +1300 @@
         mix_buf = conf_port->mix_buf;
 
-        for (j=0; j<conf->samples_per_frame; ++j)
-            mix_buf[j] = 0;
+        for (j=0; j<conf->samples_per_frame; ++j) mix_buf[j] = 0;
     }
 
@@ -1422 +1476 @@
     /* Return sound playback frame. */
     if (conf->ports[0]->sources) {
+        TRACE_((THIS_FILE, "write to audio, count=%d", 
+                           conf->samples_per_frame));
+
         copy_samples( frame->buf, (pj_int16_t*)conf->ports[0]->mix_buf, 
                       conf->samples_per_frame);
@@ -1432 +1489 @@
 
     pj_mutex_unlock(conf->mutex);
+
+#ifdef REC_FILE
+    if (fhnd_rec == NULL)
+        fhnd_rec = fopen(REC_FILE, "wb");
+    if (fhnd_rec)
+        fwrite(frame->buf, frame->size, 1, fhnd_rec);
+#endif
 
     return PJ_SUCCESS;
@@ -1448 +1512 @@
     pj_int16_t *target_snd_buf;
     unsigned i;
-
-    TRACE_(("r"));
 
     /* Check for correct size. */