From 069bc4504485711a8c8b7bfd47ffcf2c6c43ae0d Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Thu, 20 Sep 2018 14:28:46 -0700 Subject: [PATCH] Audio VTS: Do not constrain implementation frameCount The test was assuming Stream::getFrameCount() would return the AudioConfig::frameCount used to create the stream, similarly to the sampleRate or the channelMask. Nevertheless this is not the case as the AudioConfig::frameCount field is not to used by Stream::openOutputStream (nor Input) as the buffer size is chosen by the HAL, not the framework. Thus the test can not assume the frameCount chosen by the HAL and must not test for a particular value. Test: atest VtsHalAudioV4_0TargetTest Bug: 116169974 Change-Id: Ibbf0825f540957e01e7c512d851cb9628991f4c4 Signed-off-by: Kevin Rocard --- audio/core/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp | 4 ++-- audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/core/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/core/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp index bb1d26f928..a08a2d62bb 100644 --- a/audio/core/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp @@ -661,8 +661,8 @@ static R extract(Return ret) { code; \ } -TEST_IO_STREAM(GetFrameCount, "Check that the stream frame count == the one it was opened with", - ASSERT_EQ(audioConfig.frameCount, extract(stream->getFrameCount()))) +TEST_IO_STREAM(GetFrameCount, "Check that getting stream frame count does not crash the HAL.", + ASSERT_TRUE(stream->getFrameCount().isOk())) TEST_IO_STREAM(GetSampleRate, "Check that the stream sample rate == the one it was opened with", ASSERT_EQ(audioConfig.sampleRateHz, extract(stream->getSampleRate()))) diff --git a/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp index 4dc01e7ed9..46c228a19f 100644 --- a/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/4.0/vts/functional/AudioPrimaryHidlHalTest.cpp @@ -823,8 +823,8 @@ static R extract(Return ret) { code; \ } -TEST_IO_STREAM(GetFrameCount, "Check that the stream frame count == the one it was opened with", - ASSERT_EQ(audioConfig.frameCount, extract(stream->getFrameCount()))) +TEST_IO_STREAM(GetFrameCount, "Check that getting stream frame count does not crash the HAL.", + ASSERT_TRUE(stream->getFrameCount().isOk())) TEST_IO_STREAM(GetSampleRate, "Check that the stream sample rate == the one it was opened with", ASSERT_EQ(audioConfig.sampleRateHz, extract(stream->getSampleRate())))