Changeset 2555 for pjproject/trunk

Timestamp:

Mar 27, 2009 3:15:46 PM (16 years ago)

Author:

nanang

Message:

Ticket #771 (auddev-misc):
Updated audio test tool:

• Fixed playback report on avg interval.
• Added feature to set/get capture & playback latecies setting.
• Minor update on drift calculation, improve a bit readibility for debugging.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-audiodev/audiotest.c (modified) (2 diffs)
• pjsip-apps/src/samples/auddemo.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiotest.c

@@ -235 +235 @@
     result->play.min_interval = DIV_ROUND(test_data.playback_data.delay.min, 1000);
     result->play.max_interval = DIV_ROUND(test_data.playback_data.delay.max, 1000);
-    result->play.avg_interval = DIV_ROUND(test_data.capture_data.delay.mean, 1000);
+    result->play.avg_interval = DIV_ROUND(test_data.playback_data.delay.mean, 1000);
     result->play.dev_interval = DIV_ROUND(tmp, 1000);
     result->play.max_burst    = DIV_ROUND_UP(result->play.max_interval, ptime);
@@ -241 +241 @@
     /* Check drifting */
     if (param->dir == PJMEDIA_DIR_CAPTURE_PLAYBACK) {
-        int end_diff, start_diff, drift;
-
-        end_diff = test_data.capture_data.last_timestamp -
-                   test_data.playback_data.last_timestamp;
-        start_diff = test_data.capture_data.first_timestamp-
-                      test_data.playback_data.first_timestamp;
-        drift = end_diff > start_diff? end_diff - start_diff :
-                start_diff - end_diff;
+        int play_diff, cap_diff, drift;
+
+        play_diff = test_data.playback_data.last_timestamp -
+                    test_data.playback_data.first_timestamp;
+        cap_diff  = test_data.capture_data.last_timestamp -
+                    test_data.capture_data.first_timestamp;
+        drift = play_diff > cap_diff? play_diff - cap_diff :
+                cap_diff - play_diff;
 
         /* Allow one frame tolerance for clock drift detection */

pjproject/trunk/pjsip-apps/src/samples/auddemo.c

@@ -30 +30 @@
 
 static unsigned dev_count;
+static unsigned playback_lat = PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
+static unsigned capture_lat = PJMEDIA_SND_DEFAULT_REC_LATENCY;
 
 static void app_perror(const char *title, pj_status_t status)
@@ -178 +180 @@
     param.channel_count = chnum;
     param.samples_per_frame = clock_rate * chnum * ptime / 1000;
+
+    /* Latency settings */
+    param.flags |= (PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY | 
+                    PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY);
+    param.input_latency_ms = capture_lat;
+    param.output_latency_ms = playback_lat;
 
     PJ_LOG(3,(THIS_FILE, "Performing test.."));
@@ -384 +392 @@
     puts("  r RID [FILE]             Record capture device RID to WAV file");
     puts("  p PID [FILE]             Playback WAV file to device ID PID");
+    puts("  d [RLAT [PLAT]]          Get/set sound device latencies (in ms):");
+    puts("                             Specify no param to get current latencies setting");
+    puts("                             RLAT      :  record latency (-1 for default)");
+    puts("                             PLAT      :  playback latency (-1 for default)");
     puts("  v                        Toggle log verbosity");
     puts("  q                        Quit");
@@ -521 +533 @@
             break;
 
+        case 'd':
+            /* latencies */
+            {
+                int rec_lat, play_lat;
+
+                if (sscanf(line+2, "%d %d", &rec_lat, &play_lat) == 2) {
+                    capture_lat = (unsigned) 
+                         (rec_lat>=0? rec_lat:PJMEDIA_SND_DEFAULT_REC_LATENCY);
+                    playback_lat = (unsigned)
+                         (play_lat >= 0? play_lat : PJMEDIA_SND_DEFAULT_PLAY_LATENCY);
+                    printf("Recording latency=%ums, playback latency=%ums",
+                           capture_lat, playback_lat);
+                } else {
+                    printf("Current latencies: record=%ums, playback=%ums",
+                           capture_lat, playback_lat);
+                }
+                puts("");
+            }
+            break;
+
         case 'v':
             if (pj_log_get_level() <= 3) {