From 8f4564a7448a429beb7be2292aa3b9e3b0145f6c Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Wed, 5 Nov 2014 14:41:49 +0200 Subject: [PATCH] android/client: Support new API for SCO HAL Add support for new parameters in open_output_stream() and open_inut_stream(). --- android/client/if-sco.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/android/client/if-sco.c b/android/client/if-sco.c index e7197b2d7..5a68ed57a 100644 --- a/android/client/if-sco.c +++ b/android/client/if-sco.c @@ -62,7 +62,14 @@ SINTMAP(audio_channel_mask_t, -1, "(AUDIO_CHANNEL_INVALID)") DELEMENT(AUDIO_CHANNEL_OUT_MONO), DELEMENT(AUDIO_CHANNEL_OUT_STEREO), DELEMENT(AUDIO_CHANNEL_OUT_QUAD), +#if ANDROID_VERSION < PLATFORM_VER(5, 0, 0) DELEMENT(AUDIO_CHANNEL_OUT_SURROUND), +#else + DELEMENT(AUDIO_CHANNEL_OUT_QUAD_BACK), + DELEMENT(AUDIO_CHANNEL_OUT_QUAD_SIDE), + DELEMENT(AUDIO_CHANNEL_OUT_5POINT1_BACK), + DELEMENT(AUDIO_CHANNEL_OUT_5POINT1_SIDE), +#endif DELEMENT(AUDIO_CHANNEL_OUT_5POINT1), DELEMENT(AUDIO_CHANNEL_OUT_7POINT1), DELEMENT(AUDIO_CHANNEL_OUT_ALL), @@ -509,12 +516,21 @@ static void open_output_stream_p(int argc, const char **argv) config->format = AUDIO_FORMAT_PCM_16_BIT; } +#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0) + err = if_audio_sco->open_output_stream(if_audio_sco, + 0, + AUDIO_DEVICE_OUT_ALL_SCO, + AUDIO_OUTPUT_FLAG_NONE, + config, + &stream_out, NULL); +#else err = if_audio_sco->open_output_stream(if_audio_sco, 0, AUDIO_DEVICE_OUT_ALL_SCO, AUDIO_OUTPUT_FLAG_NONE, config, &stream_out); +#endif if (err < 0) { haltest_error("open output stream returned %d\n", err); goto failed; @@ -572,11 +588,19 @@ static void open_input_stream_p(int argc, const char **argv) config->format = AUDIO_FORMAT_PCM_16_BIT; } +#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0) + err = if_audio_sco->open_input_stream(if_audio_sco, + 0, + AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, + config, + &stream_in, 0, NULL, 0); +#else err = if_audio_sco->open_input_stream(if_audio_sco, 0, AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, config, &stream_in); +#endif if (err < 0) { haltest_error("open output stream returned %d\n", err); goto failed; -- 2.47.3