diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-02 15:47:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-02 15:47:25 -0700 |
| commit | 7e1bc3f2ad915331df9a34303e17d59798baf02c (patch) | |
| tree | 472d88a2b6d6d871c23185b2f3edd539d94af4d3 /audio | |
| parent | d08cb98026f49d7f6b29bfa892a0d35e87343f9e (diff) | |
| parent | 22ab522f99b48bf3c3d5850c72bc270a021258e7 (diff) | |
| download | device_samsung_tuna-7e1bc3f2ad915331df9a34303e17d59798baf02c.zip device_samsung_tuna-7e1bc3f2ad915331df9a34303e17d59798baf02c.tar.gz device_samsung_tuna-7e1bc3f2ad915331df9a34303e17d59798baf02c.tar.bz2 | |
Merge "audio: fix error in capture path delay calculation"
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index fe3dce3..b4138a6 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1828,8 +1828,11 @@ static void get_capture_delay(struct tuna_stream_in *in, /* read frames available in audio HAL input buffer * add number of frames being read as we want the capture time of first sample * in current buffer */ - buf_delay = (long)(((int64_t)(in->frames_in + in->proc_frames_in) * 1000000000) - / in->config.rate); + /* frames in in->buffer are at driver sampling rate while frames in in->proc_buf are + * at requested sampling rate */ + buf_delay = (long)(((int64_t)(in->frames_in) * 1000000000) / in->config.rate + + ((int64_t)(in->proc_frames_in) * 1000000000) / in->requested_rate); + /* add delay introduced by resampler */ rsmp_delay = 0; if (in->resampler) { |