diff options
| author | Fletcher Woodruff <fletcherw@chromium.org> | 2019-05-30 13:36:49 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-06-10 00:24:57 -0700 |
| commit | 6e6b72df399d71dc933d89e50f145a2adabfb35d (patch) | |
| tree | db858df492af20a6a9e972971c5dde22fe320f76 /cras/src/server/dev_stream.c | |
| parent | efa48a08c8e16078036b5b9312e8f7b328a99509 (diff) | |
| download | adhd-6e6b72df399d71dc933d89e50f145a2adabfb35d.tar.gz | |
CRAS: move creation of audio_shm into cras_shm
cras_rstream was handling initialization of the audio shared memory
area. Move that code into cras_shm so that the abstraction is a little
less leaky.
Also create a cras_shm_info struct that is used to initialize
cras_audio_shm. This will allow us to de-duplicate code from the client
library, and to cleanly transition to a split shm.
BUG=chromium:968724
TEST=unit tests, basic playback tests on-device
Change-Id: I456f81254b21332f8d0a1ab276a2df5ec888d0b3
Reviewed-on: https://chromium-review.googlesource.com/1637726
Commit-Ready: Fletcher Woodruff <fletcherw@chromium.org>
Tested-by: Fletcher Woodruff <fletcherw@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org>
Diffstat (limited to 'cras/src/server/dev_stream.c')
| -rw-r--r-- | cras/src/server/dev_stream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cras/src/server/dev_stream.c b/cras/src/server/dev_stream.c index 34341879..9b445a2e 100644 --- a/cras/src/server/dev_stream.c +++ b/cras/src/server/dev_stream.c @@ -566,10 +566,8 @@ int dev_stream_capture_update_rstream(struct dev_stream *dev_stream) if (rstream->flags & BULK_AUDIO_OK) frames_ready = cras_rstream_level(rstream); - ATLOG(atlog, AUDIO_THREAD_CAPTURE_POST, - rstream->stream_id, - frames_ready, - rstream->shm.area->read_buf_idx); + ATLOG(atlog, AUDIO_THREAD_CAPTURE_POST, rstream->stream_id, + frames_ready, rstream->shm->area->read_buf_idx); rc = cras_rstream_audio_ready(rstream, frames_ready); |