diff options
| author | Fletcher Woodruff <fletcherw@chromium.org> | 2019-06-06 16:48:00 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-06-11 16:07:52 -0700 |
| commit | 2f265de12903e1176123a1fd57387044661cb241 (patch) | |
| tree | d9e345680e8e76c9b501162bdbb54de1d67927ee /cras/src/tests/rstream_unittest.cc | |
| parent | de3492d0b22c9c5cfac3325fcabfea6ec0a52fc0 (diff) | |
| download | adhd-2f265de12903e1176123a1fd57387044661cb241.tar.gz | |
CRAS: rstream: unsplit output and input shm
rstream has separate functions for output and input shm, but they
refer to the same pointer. Combine the two functions.
BUG=chromium:968724
TEST=unit tests, playback on device
Change-Id: Ib02acab1578cba7083006e01ce294d4d234bd969
Reviewed-on: https://chromium-review.googlesource.com/1649043
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: Chih-Yang Hsia <paulhsia@chromium.org>
Diffstat (limited to 'cras/src/tests/rstream_unittest.cc')
| -rw-r--r-- | cras/src/tests/rstream_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cras/src/tests/rstream_unittest.cc b/cras/src/tests/rstream_unittest.cc index 9c381cec..8b04f7af 100644 --- a/cras/src/tests/rstream_unittest.cc +++ b/cras/src/tests/rstream_unittest.cc @@ -134,15 +134,15 @@ TEST_F(RstreamTestSuite, CreateOutput) { EXPECT_EQ(2048, cras_rstream_get_cb_threshold(s)); EXPECT_EQ(CRAS_STREAM_TYPE_DEFAULT, cras_rstream_get_type(s)); EXPECT_EQ(CRAS_STREAM_OUTPUT, cras_rstream_get_direction(s)); - EXPECT_NE((void *)NULL, cras_rstream_output_shm(s)); + EXPECT_NE((void*)NULL, cras_rstream_shm(s)); rc = cras_rstream_get_format(s, &fmt_ret); EXPECT_EQ(0, rc); EXPECT_TRUE(format_equal(&fmt_ret, &fmt_)); // Check if shm is really set up. - shm_ret = cras_rstream_output_shm(s); + shm_ret = cras_rstream_shm(s); ASSERT_NE((void *)NULL, shm_ret); - fd_ret = cras_rstream_output_shm_fd(s); + fd_ret = cras_rstream_shm_fd(s); shm_size = cras_rstream_get_total_shm_size(s); EXPECT_GT(shm_size, 4096); shm_mapped.area = (struct cras_audio_shm_area *)mmap( @@ -171,15 +171,15 @@ TEST_F(RstreamTestSuite, CreateInput) { EXPECT_EQ(2048, cras_rstream_get_cb_threshold(s)); EXPECT_EQ(CRAS_STREAM_TYPE_DEFAULT, cras_rstream_get_type(s)); EXPECT_EQ(CRAS_STREAM_INPUT, cras_rstream_get_direction(s)); - EXPECT_NE((void *)NULL, cras_rstream_input_shm(s)); + EXPECT_NE((void*)NULL, cras_rstream_shm(s)); rc = cras_rstream_get_format(s, &fmt_ret); EXPECT_EQ(0, rc); EXPECT_TRUE(format_equal(&fmt_ret, &fmt_)); // Check if shm is really set up. - shm_ret = cras_rstream_input_shm(s); + shm_ret = cras_rstream_shm(s); ASSERT_NE((void *)NULL, shm_ret); - fd_ret = cras_rstream_input_shm_fd(s); + fd_ret = cras_rstream_shm_fd(s); shm_size = cras_rstream_get_total_shm_size(s); EXPECT_GT(shm_size, 4096); shm_mapped.area = (struct cras_audio_shm_area *)mmap( |