diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-01 00:19:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-01 00:19:04 +0000 |
| commit | ff24fe5a1fec2c8cb2129027a513b6c1cd7d81a2 (patch) | |
| tree | b69723eebf023f54d0e71be94f0d74a98cbcf77e | |
| parent | 6c4ceb6471a51039cc36fdf259ca95ebd0a5caef (diff) | |
| parent | 07c80fdaa0340d60e5be2ceff31037712859412b (diff) | |
| download | libhardware-android12-mainline-art-release.tar.gz | |
Snap for 7692221 from 07c80fdaa0340d60e5be2ceff31037712859412b to mainline-art-releaseandroid-mainline-12.0.0_r98android-mainline-12.0.0_r69android-mainline-12.0.0_r5android-mainline-12.0.0_r42android-mainline-12.0.0_r22android-mainline-12.0.0_r115android12-mainline-art-release
Change-Id: If03767631bbfb37c7258c891fe95fe2b21133b6a
| -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) { |