diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:28:43 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:28:43 +0000 |
commit | f5cd6ab16491ccd1ca90f0611281f0e8d999b240 (patch) | |
tree | 8c013069e7442e5c4e240b876dccf71f6de28ee2 | |
parent | b5cfb4632e922f1cae29d2ca01f447dc1236e86d (diff) | |
parent | 643e59a3056ea3f1fd4e791a818229fbb42cabf7 (diff) | |
download | libhardware-aml_rkp_341012000.tar.gz |
Snap for 10453563 from 643e59a3056ea3f1fd4e791a818229fbb42cabf7 to mainline-rkpd-releaseaml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000
Change-Id: I5470d27baf7fb1fd99f46bc0bf9a72b0ffa9bead
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | modules/audio_remote_submix/audio_hw.cpp | 3 | ||||
-rw-r--r-- | modules/usbaudio/audio_hal.c | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -64,6 +64,7 @@ cc_library_headers { apex_available: [ "//apex_available:platform", "com.android.btservices", + "com.android.media", "com.android.media.swcodec", ], min_sdk_version: "29", diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index f96854b5..5019ae5b 100644 --- a/modules/audio_remote_submix/audio_hw.cpp +++ b/modules/audio_remote_submix/audio_hw.cpp @@ -679,7 +679,8 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) // FIXME this is using hard-coded strings but in the future, this functionality will be // converted to use audio HAL extensions required to support tunneling - if ((parms.getInt(String8("exiting"), exiting) == NO_ERROR) && (exiting > 0)) { + if ((parms.getInt(String8(AUDIO_PARAMETER_KEY_EXITING), exiting) == NO_ERROR) + && (exiting > 0)) { struct submix_audio_device * const rsxadev = audio_stream_get_submix_stream_out(stream)->dev; pthread_mutex_lock(&rsxadev->lock); diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c index 43f8d240..d77f7ec6 100644 --- a/modules/usbaudio/audio_hal.c +++ b/modules/usbaudio/audio_hal.c @@ -1510,6 +1510,8 @@ static int adev_open_input_stream(struct audio_hw_device *hw_dev, ret = 0; } } + } else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) { + in->config.rate = config->sample_rate; } } else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) { in->config.rate = config->sample_rate; |