From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv0 04/14] android/hal-sco: Make use of config parameter
Date: Thu, 22 May 2014 15:05:57 +0300 [thread overview]
Message-ID: <1400760367-24915-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1400760367-24915-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Use config parameter when opening output stream.
---
android/hal-sco.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/android/hal-sco.c b/android/hal-sco.c
index 5cd63c2..402b184 100644
--- a/android/hal-sco.c
+++ b/android/hal-sco.c
@@ -582,7 +582,7 @@ static int sco_open_output_stream(struct audio_hw_device *dev,
size_t resample_size;
uint16_t mtu;
- DBG("");
+ DBG("config %p device flags 0x%02x", config, devices);
if (ipc_connect_sco(&fd, &mtu) != SCO_STATUS_SUCCESS) {
error("sco: cannot get fd");
@@ -612,10 +612,20 @@ static int sco_open_output_stream(struct audio_hw_device *dev,
out->stream.write = out_write;
out->stream.get_render_position = out_get_render_position;
- /* Configuration for Android */
- out->cfg.format = AUDIO_STREAM_DEFAULT_FORMAT;
- out->cfg.channels = AUDIO_CHANNEL_OUT_STEREO;
- out->cfg.rate = AUDIO_STREAM_DEFAULT_RATE;
+ if (config) {
+ DBG("config: rate %u chan mask %x format %d offload %p",
+ config->sample_rate, config->channel_mask,
+ config->format, &config->offload_info);
+
+ out->cfg.format = config->format;
+ out->cfg.channels = config->channel_mask;
+ out->cfg.rate = config->sample_rate;
+ } else {
+ out->cfg.format = AUDIO_STREAM_DEFAULT_FORMAT;
+ out->cfg.channels = AUDIO_CHANNEL_OUT_STEREO;
+ out->cfg.rate = AUDIO_STREAM_DEFAULT_RATE;
+ }
+
out->cfg.frame_num = OUT_STREAM_FRAMES;
/* we get wrong mtu size for some reason */
--
1.8.3.2
next prev parent reply other threads:[~2014-05-22 12:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 12:05 [RFCv0 01/14] android/hal-sco: Use nanosleep for SCO synchronization Andrei Emeltchenko
2014-05-22 12:05 ` [RFCv0 02/14] android/hal-sco: Fixes for unreliable mtu Andrei Emeltchenko
2014-05-22 12:05 ` [RFCv0 03/14] android/hal-sco: Add SCO packet cache Andrei Emeltchenko
2014-05-22 12:05 ` Andrei Emeltchenko [this message]
2014-05-22 12:05 ` [RFCv0 05/14] android/hal-sco: Implement open input stream Andrei Emeltchenko
2014-05-22 12:05 ` [RFCv0 06/14] android/hal-sco: Check file descriptor >= 0 Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 07/14] android/hal-sco: Use global sco file descriptor Andrei Emeltchenko
2014-05-27 13:08 ` Luiz Augusto von Dentz
2014-05-28 10:24 ` Andrei Emeltchenko
2014-05-28 10:32 ` Luiz Augusto von Dentz
2014-05-22 12:06 ` [RFCv0 08/14] android/haltest: Add open/close input stream commands Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 09/14] android/haltest: Add read command Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 10/14] android/haltest: Add loop command Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 11/14] android/hal-sco: Make debug more readable Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 12/14] android/hal-sco: Fix memory leak Andrei Emeltchenko
2014-05-27 13:40 ` Luiz Augusto von Dentz
2014-05-22 12:06 ` [RFCv0 13/14] android/hal-sco: Implement read Andrei Emeltchenko
2014-05-22 12:06 ` [RFCv0 14/14] android/haltest: Implement read to file Andrei Emeltchenko
2014-05-27 13:26 ` [RFCv0 01/14] android/hal-sco: Use nanosleep for SCO synchronization Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400760367-24915-4-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).