Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OboeTester: limit number of channels tested in Data Paths #2088

Merged
merged 1 commit into from
Aug 14, 2024
Merged

OboeTester: limit number of channels tested in Data Paths #2088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 28 additions & 18 deletions apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestDataPathsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,12 +708,14 @@ public static int findLargestInt(int[] arr) {
}

private void testOutputChannelCounts(AudioDeviceInfo inputDeviceInfo, AudioDeviceInfo outputDeviceInfo) throws InterruptedException {
final int maxOutputChannelsToTest = 4; // takes too long
logSection("Output Channel Counts");
ArrayList<Integer> channelCountsTested = new ArrayList<Integer>();
StreamConfiguration requestedInConfig = mAudioInputTester.requestedConfiguration;
StreamConfiguration requestedOutConfig = mAudioOutTester.requestedConfiguration;

int[] outputChannelCounts = outputDeviceInfo.getChannelCounts();
// Are the output channels mixed together in the air or in a loopback plug?
if (isDeviceTypeMixedForLoopback(outputDeviceInfo.getType())) {
requestedInConfig.setChannelCount(1);
setInputChannel(0);
Expand All @@ -729,22 +731,30 @@ private void testOutputChannelCounts(AudioDeviceInfo inputDeviceInfo, AudioDevic
testPerformancePaths();
setOutputChannel(1);
testPerformancePaths();

// Test channels for each channelCount above 2
for (int numChannels : outputChannelCounts) {
log("numChannels = " + numChannels);
if (numChannels > 4) {
log("numChannels forced to 4!");
}
if (!channelCountsTested.contains(numChannels)) {
requestedOutConfig.setChannelCount(numChannels);
channelCountsTested.add(numChannels);
for (int channel = 0; channel < numChannels; channel++) {
setOutputChannel(channel);
testPerformancePaths();
if (numChannels > maxOutputChannelsToTest) {
log("skip numChannels = " + numChannels);
} else {
if (!channelCountsTested.contains(numChannels)) {
log("--- test numChannels = " + numChannels);
requestedOutConfig.setChannelCount(numChannels);
channelCountsTested.add(numChannels);
for (int channel = 0; channel < numChannels; channel++) {
setOutputChannel(channel);
testPerformancePaths();
}
}
}

}
} else {
// This device does not mix so we have to match the input and output channel indices.
// Find the maximum number of input channels.
int[] inputChannelCounts = inputDeviceInfo.getChannelCounts();
int maxInputChannels = findLargestChannelCount(inputChannelCounts);
int maxInputChannelsToTest = Math.min(maxOutputChannelsToTest, maxInputChannels);
// test mono
testMatchingChannels(1);
channelCountsTested.add(1);
Expand All @@ -753,14 +763,14 @@ private void testOutputChannelCounts(AudioDeviceInfo inputDeviceInfo, AudioDevic
channelCountsTested.add(2);
// Test matching channels for each channelCount above 2
for (int numChannels : outputChannelCounts) {
log("numChannels = " + numChannels);
if (numChannels > 4) {
log("numChannels forced to 4!");
numChannels = 4;
}
if (!channelCountsTested.contains(numChannels)) {
testMatchingChannels(numChannels);
channelCountsTested.add(numChannels);
if (numChannels > maxInputChannelsToTest) {
log("skip numChannels = " + numChannels + " because > #inputs");
} else {
if (!channelCountsTested.contains(numChannels)) {
log("--- test numChannels = " + numChannels);
testMatchingChannels(numChannels);
channelCountsTested.add(numChannels);
}
}
}
}
Expand Down