| commit | 966afbd88f0bfc325bf80274ad2723c238883fa1 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Fri Mar 16 19:31:15 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Fri Mar 16 19:31:15 2012 -0700 |
| tree | ddcaa3835140774540d02cc0099c4d131c6f83cf | |
| parent | 11db147d66fb1339054414318d13f090d6905e77 [diff] | |
| parent | 8951edbf0c011b8c2017ce16c532890c83ca3639 [diff] |
merge in ics-mr1-release history after reset to ics-mr1
diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c index e552f7a..348ad14 100644 --- a/audio/android_audio_hw.c +++ b/audio/android_audio_hw.c
@@ -180,7 +180,7 @@ { const struct astream_out *out = (const struct astream_out *)stream; - return (out->buffer_duration_us / 1000) + 200; + return ((out->buffer_duration_us * BUF_NUM_PERIODS) / 1000) + 200; } static int out_set_volume(struct audio_stream_out *stream, float left,