tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 07c80fdaa0

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I03d7042c652c6494ad4a8dd085a3895eba9b3c46
This commit is contained in:
Andy Hung 2021-07-05 07:41:36 +00:00 committed by Automerger Merge Worker
commit 8c6e35a9d8
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/usbaudio/audio_hal.c
View file

@ -1695,6 +1695,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) {
@ -1704,6 +1713,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) {