Changeset 1641 for pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp

Timestamp:

Dec 28, 2007 6:55:02 PM (16 years ago)

Author:

bennylp

Message:

Ticket #435: Fixed and tested audio on Symbian device

File:

• pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp

@@ -29 +29 @@
 #define CHANNEL_COUNT           1
 #define PTIME                   100
-#define SAMPLES_PER_FRAME       (2048)
+#define SAMPLES_PER_FRAME       (80)
 #define BITS_PER_SAMPLE         16
-
+#define LOOPBACK_BUFF_COUNT 100
 
 extern CConsoleBase* console;
@@ -40 +40 @@
 static pj_time_val t_start;
 
+
+static pj_int16_t buff_loopback[SAMPLES_PER_FRAME*LOOPBACK_BUFF_COUNT];
+static pj_uint32_t pointer_w, pointer_r;
 
 /* Logging callback */
@@ -71 +74 @@
     pj_log_set_log_func((void (*)(int,const char*,int)) &log_writer);
     pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
+    pj_log_set_level(5);
     
     /* Init pjlib */
@@ -115 +119 @@
     PJ_UNUSED_ARG(input);
     PJ_UNUSED_ARG(size);
+
+    pj_memcpy(&buff_loopback[pointer_w*SAMPLES_PER_FRAME], input, size);
+
+    if (size != SAMPLES_PER_FRAME*2) {
+                PJ_LOG(3, (THIS_FILE, "Size captured = %u",
+                           size));
+                pj_bzero(&buff_loopback[pointer_w*SAMPLES_PER_FRAME]+size/2, SAMPLES_PER_FRAME*2 - size);
+    }
+
+    if (++pointer_w >= LOOPBACK_BUFF_COUNT) {
+        pointer_w = 0;
+    }
     
     ++rec_cnt;
@@ -129 +145 @@
     PJ_UNUSED_ARG(timestamp);
     
-    pj_bzero(output, size);
+    //pj_bzero(output, size);
+    pj_memcpy(output, &buff_loopback[pointer_r*SAMPLES_PER_FRAME], SAMPLES_PER_FRAME*2);
+
+    if (++pointer_r >= LOOPBACK_BUFF_COUNT) {
+        pointer_r = 0;
+    }
     
     ++play_cnt;
@@ -174 +195 @@
     }
 
+    pointer_w = LOOPBACK_BUFF_COUNT/2;
+    pointer_r = 0;
+    
     return PJ_SUCCESS;
 }
@@ -298 +322 @@
     case 'p':
         snd_start(PJMEDIA_DIR_PLAYBACK);
-        break;
+    break;
     case 'c':
         snd_stop();