From b7c9da0eef694fbd2b21ea6671e8af1fc0fd6002 Mon Sep 17 00:00:00 2001 From: stenkinevgeniy Date: Sun, 20 May 2018 14:18:53 +0000 Subject: [PATCH] Audio: remove separated bt_sco playback profile Myabe this related to htc flounder hw but this not needed for samsung and this cause bug when hal trying open bt pcm device for system sounds while voice call active on sco and bt pcm device opened with start_voice_session_bt_sco. Change-Id: I75482dad42feccae5e8ca9df2623ef4693a7bdb0 --- audio/audio_hw.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 6843fd2..8f83fb8 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -72,7 +72,9 @@ static struct pcm_device_profile pcm_device_playback = { .id = SOUND_PLAYBACK_DEVICE, .type = PCM_PLAYBACK, .devices = AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE| - AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE, + AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE| + AUDIO_DEVICE_OUT_BLUETOOTH_SCO|AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET| + AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, }; static struct pcm_device_profile pcm_device_deep_buffer = { @@ -90,7 +92,9 @@ static struct pcm_device_profile pcm_device_deep_buffer = { .id = SOUND_DEEP_BUFFER_DEVICE, .type = PCM_PLAYBACK, .devices = AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE| - AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE, + AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE| + AUDIO_DEVICE_OUT_BLUETOOTH_SCO|AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET| + AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, }; static struct pcm_device_profile pcm_device_capture = { @@ -129,26 +133,6 @@ static struct pcm_device_profile pcm_device_capture_low_latency = { .devices = AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC, }; -static struct pcm_device_profile pcm_device_playback_sco = { - .config = { - .channels = SCO_DEFAULT_CHANNEL_COUNT, - .rate = SCO_DEFAULT_SAMPLING_RATE, - .period_size = SCO_PERIOD_SIZE, - .period_count = SCO_PERIOD_COUNT, - .format = PCM_FORMAT_S16_LE, - .start_threshold = SCO_START_THRESHOLD, - .stop_threshold = SCO_STOP_THRESHOLD, - .silence_threshold = 0, - .avail_min = SCO_AVAILABLE_MIN, - }, - .card = SOUND_CARD, - .id = SOUND_PLAYBACK_SCO_DEVICE, - .type = PCM_PLAYBACK, - .devices = - AUDIO_DEVICE_OUT_BLUETOOTH_SCO|AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET| - AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT, -}; - static struct pcm_device_profile pcm_device_capture_sco = { .config = { .channels = SCO_DEFAULT_CHANNEL_COUNT, @@ -171,7 +155,6 @@ static struct pcm_device_profile * const pcm_devices[] = { &pcm_device_playback, &pcm_device_capture, &pcm_device_capture_low_latency, - &pcm_device_playback_sco, &pcm_device_capture_sco, NULL, }; -- 2.20.1