AudioFlinger: Fix resampler tests
Test: Run resampler tests on Pixel XL
Bug: 34113617
Change-Id: Idee23b90bd1a353f841beab95c74a7b0ddb13783
diff --git a/services/audioflinger/tests/build_and_run_all_unit_tests.sh b/services/audioflinger/tests/build_and_run_all_unit_tests.sh
index 7f4d456..9a71096 100755
--- a/services/audioflinger/tests/build_and_run_all_unit_tests.sh
+++ b/services/audioflinger/tests/build_and_run_all_unit_tests.sh
@@ -15,7 +15,9 @@
echo "waiting for device"
adb root && adb wait-for-device remount
adb push $OUT/system/lib/libaudioresampler.so /system/lib
-adb push $OUT/data/nativetest/resampler_tests /system/bin
+adb push $OUT/system/lib64/libaudioresampler.so /system/lib64
+adb push $OUT/data/nativetest/resampler_tests/resampler_tests /data/nativetest/resampler_tests/resampler_tests
+adb push $OUT/data/nativetest64/resampler_tests/resampler_tests /data/nativetest64/resampler_tests/resampler_tests
sh $ANDROID_BUILD_TOP/frameworks/av/services/audioflinger/tests/run_all_unit_tests.sh
diff --git a/services/audioflinger/tests/resampler_tests.cpp b/services/audioflinger/tests/resampler_tests.cpp
index 406b960..fbc8cc5 100644
--- a/services/audioflinger/tests/resampler_tests.cpp
+++ b/services/audioflinger/tests/resampler_tests.cpp
@@ -106,7 +106,7 @@
// set up the reference run
std::vector<size_t> refIncr;
refIncr.push_back(outputFrames);
- void* reference = malloc(outputSize);
+ void* reference = calloc(outputFrames, outputFrameSize);
resample(channels, reference, outputFrames, refIncr, &provider, resampler);
provider.reset();
@@ -127,7 +127,7 @@
outIncr.push_back(1);
outIncr.push_back(2);
outIncr.push_back(3);
- void* test = malloc(outputSize);
+ void* test = calloc(outputFrames, outputFrameSize);
inputIncr.push_back(1);
inputIncr.push_back(3);
provider.setIncr(inputIncr);
@@ -194,7 +194,7 @@
// set up the reference run
std::vector<size_t> refIncr;
refIncr.push_back(outputFrames);
- void* reference = malloc(outputSize);
+ void* reference = calloc(outputFrames, outputFrameSize);
resample(channels, reference, outputFrames, refIncr, &provider, resampler);
TO *out = reinterpret_cast<TO *>(reference);
diff --git a/services/audioflinger/tests/run_all_unit_tests.sh b/services/audioflinger/tests/run_all_unit_tests.sh
index 113f39e..15a94c2 100755
--- a/services/audioflinger/tests/run_all_unit_tests.sh
+++ b/services/audioflinger/tests/run_all_unit_tests.sh
@@ -8,5 +8,5 @@
echo "waiting for device"
adb root && adb wait-for-device remount
-#adb shell /system/bin/resampler_tests
adb shell /data/nativetest/resampler_tests/resampler_tests
+adb shell /data/nativetest64/resampler_tests/resampler_tests