diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-06 01:07:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-06 01:07:22 +0000 |
| commit | a8568d0d3478cf8b75b36f9c7bd584cce5cfbd5c (patch) | |
| tree | b69723eebf023f54d0e71be94f0d74a98cbcf77e | |
| parent | a66d529cf3bcfa19f13befca5d62cb2d00933e1b (diff) | |
| parent | 61583424ff6f0135ebffda9507b085dc6839d430 (diff) | |
Snap for 7524638 from 61583424ff6f0135ebffda9507b085dc6839d430 to sc-release
Change-Id: Iad58734a0b28098795597890ad39bb13700578b2
| -rw-r--r-- | modules/usbaudio/audio_hal.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c index cc9e4f7c..39c0fb5c 100644 --- a/modules/usbaudio/audio_hal.c +++ b/modules/usbaudio/audio_hal.c @@ -1652,6 +1652,15 @@ static int adev_create_audio_patch(struct audio_hw_device *dev, stream_standby_l(alsa_devices, out == NULL ? &in->standby : &out->standby); device_unlock(adev); + // Timestamps: + // Audio timestamps assume continuous PCM frame counts which are maintained + // with the device proxy.transferred variable. Technically it would be better + // associated with in or out stream, not the device; here we save and restore + // using the first alsa device as a simplification. + uint64_t saved_transferred_frames = 0; + struct alsa_device_info *device_info = stream_get_first_alsa_device(alsa_devices); + if (device_info != NULL) saved_transferred_frames = device_info->proxy.transferred; + int ret = stream_set_new_devices(config, alsa_devices, num_configs, cards, devices, direction); if (ret != 0) { @@ -1661,6 +1670,13 @@ static int adev_create_audio_patch(struct audio_hw_device *dev, } else { *patch_handle = *handle; } + + // Timestamps: Restore transferred frames. + if (saved_transferred_frames != 0) { + device_info = stream_get_first_alsa_device(alsa_devices); + if (device_info != NULL) device_info->proxy.transferred = saved_transferred_frames; + } + if (!wasStandby) { device_lock(adev); if (in != NULL) { |