diff options
| author | Mingshu Pang <mpang@codeaurora.org> | 2020-02-12 20:26:54 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-03-12 06:16:44 -0700 |
| commit | df4dc4ac23e0a21b9d84ae316e9b827c26af6c19 (patch) | |
| tree | 41383b21bde2993c5c423d9088015d949f0d2626 /visualizer/offload_visualizer.c | |
| parent | 7098e119a7ccf9440c0942d1dc5e4816e0868850 (diff) | |
visualizer: dynamically parse the sound card when opening mixer
Sound card number is not always 0 with USB headset, get it
dynamically when opening mixer.
CRs-Fixed: 2620185
Change-Id: I019e5988bc845af1f721ef00fbe874137c1811ef
Diffstat (limited to 'visualizer/offload_visualizer.c')
| -rw-r--r-- | visualizer/offload_visualizer.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c index e1a34a05..65b59383 100644 --- a/visualizer/offload_visualizer.c +++ b/visualizer/offload_visualizer.c @@ -192,11 +192,6 @@ int thread_status; #define DSP_OUTPUT_LATENCY_MS 0 /* Fudge factor for latency after capture point in audio DSP */ -/* Retry for delay for mixer open */ -#define RETRY_NUMBER 10 -#define RETRY_US 500000 - -#define MIXER_CARD 0 #define SOUND_CARD 0 #ifndef CAPTURE_DEVICE @@ -471,12 +466,12 @@ void *capture_thread_loop(void *arg) pthread_mutex_lock(&lock); - mixer = mixer_open(MIXER_CARD); - while (mixer == NULL && retry_num < RETRY_NUMBER) { - usleep(RETRY_US); - mixer = mixer_open(MIXER_CARD); - retry_num++; - } + sound_card = + parse_pcm_device("AFE-PROXY TX", SND_CARD_NUM); + sound_card = + (sound_card == -1)? SOUND_CARD : sound_card; + + mixer = mixer_open(sound_card); if (mixer == NULL) { pthread_mutex_unlock(&lock); return NULL; @@ -490,10 +485,6 @@ void *capture_thread_loop(void *arg) if (!capture_enabled) { ret = configure_proxy_capture(mixer, 1); if (ret == 0) { - sound_card = - parse_pcm_device("AFE-PROXY TX", SND_CARD_NUM); - sound_card = - (sound_card == -1)? SOUND_CARD : sound_card; capture_device = parse_pcm_device("AFE-PROXY TX", DEVICE_ID); capture_device = |