summaryrefslogtreecommitdiff
path: root/cras/src/tests/audio_thread_unittest.cc
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2014-09-02 17:23:05 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-09-19 02:59:52 +0000
commitb9a58b6cf58ce1fde5e8b94577fc9faf476c0d56 (patch)
tree3eb89bb5af42470873b3021c3a5664e968067c02 /cras/src/tests/audio_thread_unittest.cc
parent0df9b2c9c0b87e30e8b958264a82c56c2cd964e8 (diff)
downloadadhd-b9a58b6cf58ce1fde5e8b94577fc9faf476c0d56.tar.gz
CRAS: Only set dev format from the audio thread.
Since the format converter now lives in the audio thread, there is no need to update the format of the rstream based on the device format. Now set the device format when adding the first stream in the audio thread. BUG=none TEST=unittest, plus play and record audio with multiple test clients. Change-Id: I7288529e73a27b78a60c9076442577018e4aa47e Signed-off-by: Dylan Reid <dgreid@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/217174 Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Diffstat (limited to 'cras/src/tests/audio_thread_unittest.cc')
-rw-r--r--cras/src/tests/audio_thread_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cras/src/tests/audio_thread_unittest.cc b/cras/src/tests/audio_thread_unittest.cc
index bcdb727d..0b937e26 100644
--- a/cras/src/tests/audio_thread_unittest.cc
+++ b/cras/src/tests/audio_thread_unittest.cc
@@ -2001,7 +2001,7 @@ TEST_F(ActiveDevicesSuite, CloseActiveDevices) {
EXPECT_EQ(2, cras_iodev_set_format_called);
thread_add_stream(thread_, rstream2_);
- EXPECT_EQ(2, cras_iodev_set_format_called);
+ EXPECT_EQ(4, cras_iodev_set_format_called);
thread_remove_stream(thread_, rstream2_);