From 719e60cc3290dce849349bcd305f77dc5b545fa1 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Fri, 27 Mar 2009 15:15:46 +0000 Subject: 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. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2555 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-audiodev/audiotest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pjmedia/src/pjmedia-audiodev/audiotest.c') diff --git a/pjmedia/src/pjmedia-audiodev/audiotest.c b/pjmedia/src/pjmedia-audiodev/audiotest.c index bf0ac1f2..77704306 100644 --- a/pjmedia/src/pjmedia-audiodev/audiotest.c +++ b/pjmedia/src/pjmedia-audiodev/audiotest.c @@ -234,20 +234,20 @@ PJ_DEF(pj_status_t) pjmedia_aud_test( const pjmedia_aud_param *param, result->play.frame_cnt = test_data.playback_data.delay.n; 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); /* 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 */ if (drift < (int)param->samples_per_frame) { -- cgit v1.2.3