Changeset 1663

Timestamp:

Jan 4, 2008 6:00:11 PM (16 years ago)

Author:

bennylp

Message:

Fixed bug in sndtest: drift detection was wrong since it assumes that the drift value would be positive. Also added mutex protection just in case

File:

• pjproject/trunk/pjsip-apps/src/samples/sndtest.c (modified) (13 diffs)

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

@@ -80 +80 @@
     pj_bool_t running;
     pj_bool_t has_error;
+    pj_mutex_t *mutex;
 
     struct stream_data capture_data;
@@ -137 +138 @@
     struct stream_data *strm_data = &test_data->playback_data;
 
+    pj_mutex_lock(test_data->mutex);
+
     /* Skip frames when test is not started or test has finished */
     if (!test_data->running) {
         pj_bzero(output, size);
+
+        pj_mutex_unlock(test_data->mutex);
         return PJ_SUCCESS;
     }
@@ -180 +185 @@
 
     pj_bzero(output, size);
+
+    pj_mutex_unlock(test_data->mutex);
+
     return PJ_SUCCESS;
 }
@@ -190 +198 @@
     struct stream_data *strm_data = &test_data->capture_data;
 
+    pj_mutex_lock(test_data->mutex);
+
     PJ_UNUSED_ARG(input);
     PJ_UNUSED_ARG(size);
@@ -195 +205 @@
     /* Skip frames when test is not started or test has finished */
     if (!test_data->running) {
+        pj_mutex_unlock(test_data->mutex);
         return PJ_SUCCESS;
     }
@@ -234 +245 @@
     }
 
+    pj_mutex_unlock(test_data->mutex);
     return PJ_SUCCESS;
 }
@@ -354 +366 @@
 
 
-static int perform_test(int dev_id, pjmedia_dir dir,
+static int perform_test(pj_pool_t *pool, int dev_id, pjmedia_dir dir,
                         unsigned clock_rate, unsigned samples_per_frame, 
                         unsigned nchannel, int verbose)
@@ -362 +374 @@
     struct test_data test_data;
     pjmedia_snd_stream_info si;
-
-
+    
     /*
      * Init test parameters
@@ -372 +383 @@
     test_data.samples_per_frame = samples_per_frame;
     test_data.channel_count = nchannel;
+
+    pj_mutex_create_simple(pool, "sndtest", &test_data.mutex); 
 
     /*
@@ -467 +480 @@
         start_diff = test_data.capture_data.first_timestamp-
                       test_data.playback_data.first_timestamp;
-        drift = end_diff - start_diff;
+        drift = end_diff > start_diff? end_diff - start_diff :
+                start_diff - end_diff;
 
         PJ_LOG(3,(THIS_FILE, "  Checking for clock drifts:"));
@@ -508 +522 @@
 {
     pj_caching_pool cp;
+    pj_pool_t *pool;
     pjmedia_endpt *med_endpt;
     int id = -1, verbose = 0;
@@ -533 +548 @@
     /* Must create a pool factory before we can allocate any memory. */
     pj_caching_pool_init(&cp, &pj_pool_factory_default_policy, 0);
+
+    /* Also create pool for misc purposes */
+    pool = pj_pool_create(&cp.factory, "sndtest", 1000, 1000, NULL);
 
     /* 
@@ -589 +607 @@
 
 
-    status = perform_test(id, PJMEDIA_DIR_CAPTURE_PLAYBACK, 
+    status = perform_test(pool, id, PJMEDIA_DIR_CAPTURE_PLAYBACK, 
                           clock_rate, frame, channel, verbose);
-    if (status != 0)
-        return 1;
-
+
+    pjmedia_endpt_destroy(med_endpt);
+    pj_pool_release(pool);
+    pj_caching_pool_destroy(&cp);
+    pj_shutdown();
     
-    return 0;
+    return status == PJ_SUCCESS ? 0 : 1;
 }