Fixing problem trying to use channel-position mask for AudioBox 44VSL.
We had moved to channel position masks in the recorder to patch around
a problem. However, there are no legitimate channel position masks
for this 4-channel interface. Converted back to channel-index masks.
Bug: 112578495
Test: Run CTS Verifier with AudioBox 44VSL, note correct behavior.
Run w/ AudioBox 22VSL, note correct behavior (no regression)
Change-Id: I88207acd02f83309c886117a0c12bd2f0ee8ef42
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
index 12f1853..bebc2a7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
@@ -131,7 +131,7 @@
allocBurstBuffer();
return true;
} catch (UnsupportedOperationException ex) {
- Log.i(TAG, "Couldn't open AudioTrack: " + ex);
+ Log.e(TAG, "Couldn't open AudioTrack: " + ex);
mAudioTrack = null;
return false;
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
index d9094e5..7cdff34 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
@@ -120,7 +120,7 @@
mNumChannels = numChans;
mSampleRate = sampleRate;
- int chanPosMask = AudioUtils.countToInPositionMask(numChans);
+ int chanIndexMask = AudioUtils.countToIndexMask(numChans);
int bufferSizeInBytes = 2048; // Some, non-critical value
try {
@@ -128,14 +128,14 @@
.setAudioFormat(new AudioFormat.Builder()
.setEncoding(AudioFormat.ENCODING_PCM_FLOAT)
.setSampleRate(mSampleRate)
- .setChannelMask(chanPosMask)
+ .setChannelIndexMask(chanIndexMask)
.build())
.setBufferSizeInBytes(bufferSizeInBytes)
.build();
return true;
} catch (UnsupportedOperationException ex) {
- Log.i(TAG, "Couldn't open AudioRecord: " + ex);
+ Log.e(TAG, "Couldn't open AudioRecord: " + ex);
mAudioRecord = null;
return false;
}
