diff options
| -rw-r--r-- | cras/src/server/cras_rclient.c | 1 | ||||
| -rw-r--r-- | cras/src/server/cras_rstream.c | 2 | ||||
| -rw-r--r-- | cras/src/server/cras_rstream.h | 4 | ||||
| -rw-r--r-- | cras/src/tests/rclient_unittest.cc | 1 | ||||
| -rw-r--r-- | cras/src/tests/rstream_unittest.cc | 6 |
5 files changed, 14 insertions, 0 deletions
diff --git a/cras/src/server/cras_rclient.c b/cras/src/server/cras_rclient.c index 42f0b510..f28a76bf 100644 --- a/cras/src/server/cras_rclient.c +++ b/cras/src/server/cras_rclient.c @@ -54,6 +54,7 @@ static int handle_client_stream_connect(struct cras_rclient *client, rc = cras_rstream_create(msg->stream_id, msg->stream_type, msg->direction, + msg->flags, &remote_fmt, msg->buffer_frames, msg->cb_threshold, diff --git a/cras/src/server/cras_rstream.c b/cras/src/server/cras_rstream.c index 77b97c46..adf09bcf 100644 --- a/cras/src/server/cras_rstream.c +++ b/cras/src/server/cras_rstream.c @@ -125,6 +125,7 @@ static int verify_rstream_parameters(enum CRAS_STREAM_DIRECTION direction, int cras_rstream_create(cras_stream_id_t stream_id, enum CRAS_STREAM_TYPE stream_type, enum CRAS_STREAM_DIRECTION direction, + uint32_t flags, const struct cras_audio_format *format, size_t buffer_frames, size_t cb_threshold, @@ -147,6 +148,7 @@ int cras_rstream_create(cras_stream_id_t stream_id, stream->stream_id = stream_id; stream->stream_type = stream_type; stream->direction = direction; + stream->flags = flags; stream->format = *format; stream->buffer_frames = buffer_frames; stream->cb_threshold = cb_threshold; diff --git a/cras/src/server/cras_rstream.h b/cras/src/server/cras_rstream.h index d7ba0d8f..474ac6d7 100644 --- a/cras/src/server/cras_rstream.h +++ b/cras/src/server/cras_rstream.h @@ -41,6 +41,7 @@ struct master_dev_info { * stream_id - identifier for this stream. * stream_type - not used. * direction - input or output. + * flags - Indicative of what special handling is needed. * fd - Socket for requesting and sending audio buffer events. * buffer_frames - Buffer size in frames. * cb_threshold - Callback client when this much is left. @@ -59,6 +60,7 @@ struct cras_rstream { cras_stream_id_t stream_id; enum CRAS_STREAM_TYPE stream_type; enum CRAS_STREAM_DIRECTION direction; + uint32_t flags; int fd; size_t buffer_frames; size_t cb_threshold; @@ -79,6 +81,7 @@ struct cras_rstream { * Args: * stream_type - CRAS_STREAM_TYPE. * direction - CRAS_STREAM_OUTPUT or CRAS_STREAM_INPUT. + * flags - Any special handling for this stream. * format - The audio format the stream wishes to use. * buffer_frames - Total number of audio frames to buffer. * cb_threshold - # of frames when to request more from the client. @@ -91,6 +94,7 @@ struct cras_rstream { int cras_rstream_create(cras_stream_id_t stream_id, enum CRAS_STREAM_TYPE stream_type, enum CRAS_STREAM_DIRECTION direction, + uint32_t flags, const struct cras_audio_format *format, size_t buffer_frames, size_t cb_threshold, diff --git a/cras/src/tests/rclient_unittest.cc b/cras/src/tests/rclient_unittest.cc index 29a7b471..aa50583c 100644 --- a/cras/src/tests/rclient_unittest.cc +++ b/cras/src/tests/rclient_unittest.cc @@ -412,6 +412,7 @@ int cras_iodev_set_format(struct cras_iodev *iodev, int cras_rstream_create(cras_stream_id_t stream_id, enum CRAS_STREAM_TYPE stream_type, enum CRAS_STREAM_DIRECTION direction, + uint32_t flags, const struct cras_audio_format *format, size_t buffer_frames, size_t cb_threshold, diff --git a/cras/src/tests/rstream_unittest.cc b/cras/src/tests/rstream_unittest.cc index 20f67b05..db858265 100644 --- a/cras/src/tests/rstream_unittest.cc +++ b/cras/src/tests/rstream_unittest.cc @@ -39,6 +39,7 @@ TEST_F(RstreamTestSuite, InvalidDirection) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, (enum CRAS_STREAM_DIRECTION)66, + 0, &fmt_, 4096, 2048, @@ -54,6 +55,7 @@ TEST_F(RstreamTestSuite, InvalidBufferSize) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, CRAS_STREAM_OUTPUT, + 0, &fmt_, 3, 2048, @@ -69,6 +71,7 @@ TEST_F(RstreamTestSuite, InvalidCallbackThreshold) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, CRAS_STREAM_OUTPUT, + 0, &fmt_, 4096, 3, @@ -83,6 +86,7 @@ TEST_F(RstreamTestSuite, InvalidStreamPointer) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, CRAS_STREAM_OUTPUT, + 0, &fmt_, 4096, 2048, @@ -102,6 +106,7 @@ TEST_F(RstreamTestSuite, CreateOutput) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, CRAS_STREAM_OUTPUT, + 0, &fmt_, 4096, 2048, @@ -146,6 +151,7 @@ TEST_F(RstreamTestSuite, CreateInput) { rc = cras_rstream_create(555, CRAS_STREAM_TYPE_DEFAULT, CRAS_STREAM_INPUT, + 0, &fmt_, 4096, 2048, |