From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/8] android/haltest: Add loop command
Date: Tue, 15 Jul 2014 10:59:22 +0300 [thread overview]
Message-ID: <1405411167-15638-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1405411167-15638-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
loop command makes stream_in->read() and then stream_out->write(). At
the moment buffers shall be equal.
---
android/client/if-sco.c | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/android/client/if-sco.c b/android/client/if-sco.c
index b4c3506..39c3e3a 100644
--- a/android/client/if-sco.c
+++ b/android/client/if-sco.c
@@ -148,6 +148,11 @@ static int feed_from_generator(short *buffer, void *data)
return buffer_size;
}
+static int feed_from_in(short *buffer, void *data)
+{
+ return stream_in->read(stream_in, buffer, buffer_size_in);
+}
+
static void prepare_sample(void)
{
int x;
@@ -179,8 +184,12 @@ static void *playback_thread(void *data)
/* Use file or fall back to generator */
if (in) {
- filbuff_cb = feed_from_file;
- cb_data = in;
+ if (data == stream_in)
+ filbuff_cb = feed_from_in;
+ else {
+ filbuff_cb = feed_from_file;
+ cb_data = in;
+ }
} else {
prepare_sample();
filbuff_cb = feed_from_generator;
@@ -218,7 +227,7 @@ static void *playback_thread(void *data)
pthread_mutex_unlock(&outstream_mutex);
} while (len && w_len > 0);
- if (in)
+ if (in && data != stream_in)
fclose(in);
pthread_mutex_lock(&state_mutex);
@@ -315,6 +324,35 @@ fail:
fclose(in);
}
+static void loop_p(int argc, const char **argv)
+{
+ RETURN_IF_NULL(if_audio_sco);
+ RETURN_IF_NULL(stream_out);
+ RETURN_IF_NULL(stream_in);
+
+ if (!buffer_size || !buffer_size_in) {
+ haltest_error("Invalid buffer sizes. Streams opened\n");
+ return;
+ }
+
+ if (buffer_size != buffer_size_in) {
+ haltest_error("read/write buffers differ, not supported\n");
+ return;
+ }
+
+ pthread_mutex_lock(&state_mutex);
+ if (current_state != STATE_STOPPED) {
+ haltest_error("Already playing or stream suspended!\n");
+ pthread_mutex_unlock(&state_mutex);
+ return;
+ }
+ pthread_mutex_unlock(&state_mutex);
+
+ if (pthread_create(&play_thread, NULL, playback_thread,
+ stream_in) != 0)
+ haltest_error("Cannot create playback thread!\n");
+}
+
static void read_p(int argc, const char **argv)
{
RETURN_IF_NULL(if_audio_sco);
@@ -615,6 +653,7 @@ static struct method methods[] = {
STD_METHOD(close_input_stream),
STD_METHODH(play, "<path to pcm file>"),
STD_METHOD(read),
+ STD_METHOD(loop),
STD_METHOD(stop),
STD_METHOD(suspend),
STD_METHOD(resume),
--
1.9.1
next prev parent reply other threads:[~2014-07-15 7:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 7:59 [PATCH 0/8] haltest support for Audio SCO HAL testing Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 1/8] android/haltest: Add open/close input stream commands Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 2/8] android/haltest: Add read command Andrei Emeltchenko
2014-07-15 7:59 ` Andrei Emeltchenko [this message]
2014-07-15 7:59 ` [PATCH 4/8] android/haltest: Implement read to file Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 5/8] android/haltest: Add sample rate parameter when opening audio streams Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 6/8] android/haltest: Correct check for similar buffer size Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 7/8] android/haltest: Add mono to stereo conversion for loopback Andrei Emeltchenko
2014-07-15 7:59 ` [PATCH 8/8] android/haltest: Refactor stop and closing streams Andrei Emeltchenko
2014-07-16 10:06 ` [PATCH 0/8] haltest support for Audio SCO HAL testing Szymon Janc
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=1405411167-15638-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