summaryrefslogtreecommitdiff
path: root/cras/src/tests/audio_thread_unittest.cc
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2014-11-25 17:26:23 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-11-27 10:27:27 +0000
commit249e72919eb928e107d251b262c305a8fe531641 (patch)
tree1ae0458ffc32aa6a23e171d8557e4daaea647b23 /cras/src/tests/audio_thread_unittest.cc
parente1cecd1c6e819c3a743da6f1e8fa4839f52674b7 (diff)
downloadadhd-249e72919eb928e107d251b262c305a8fe531641.tar.gz
CRAS: dev_stream - Mix proper format.
Mix the format that matches the device. This adds a format parameter to dev_stream_mix so the correct format can be used when mixing. BUG=chromium:219948 TEST=play through USB DAC that supports 32 bit samples only. Change-Id: I21863395b5c07284a95fdb93dcfbb7045d223aa6 Signed-off-by: Dylan Reid <dgreid@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/232085 Reviewed-by: Hsinyu Chao <hychao@chromium.org> Commit-Queue: Hsinyu Chao <hychao@chromium.org> Tested-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 71f2517b..793689e1 100644
--- a/cras/src/tests/audio_thread_unittest.cc
+++ b/cras/src/tests/audio_thread_unittest.cc
@@ -473,7 +473,7 @@ void dev_stream_destroy(struct dev_stream *dev_stream)
}
int dev_stream_mix(struct dev_stream *dev_stream,
- size_t num_channels,
+ const struct cras_audio_format *fmt,
uint8_t *dst,
unsigned int num_to_write)
{