loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-18 13:09:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix audio generation in silence skipping test

Browse Source 
Tests in `SilenceSkippingAudioProcessorTest` used half as many short integers as needed for channel values when generating alternating silence/noise input. Fix this by passing left and right channel input.

PiperOrigin-RevId: 509188074
This commit is contained in:
andrewlewis 2023-02-13 12:19:31 +00:00 committed by christosts
parent 117ce33af2
commit 88a97fdb6f
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
View File

@ -15,13 +15,14 @@
*/
package com.google.android.exoplayer2.audio;
import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.common.truth.Truth.assertThat;
import static java.lang.Math.min;
import static java.lang.Short.MAX_VALUE;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat;
import com.google.android.exoplayer2.util.Assertions;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ShortBuffer;
@ -144,9 +145,10 @@ public final class SilenceSkippingAudioProcessorTest {
long totalOutputFrames =
process(silenceSkippingAudioProcessor, inputBufferProvider, INPUT_BUFFER_SIZE);
// The right number of frames are skipped/output.
assertThat(totalOutputFrames).isEqualTo(57980);
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(42020);
// The output consists of 50000 frames of noise, plus 20 frames of padding at the start and 99 *
// 40 frames of padding after that.
assertThat(totalOutputFrames).isEqualTo(50000 + (20 + 99 * 40));
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(50000 - (20 + 99 * 40));
}
@Test
@ -169,9 +171,10 @@ public final class SilenceSkippingAudioProcessorTest {
long totalOutputFrames =
process(silenceSkippingAudioProcessor, inputBufferProvider, /* inputBufferSize= */ 80);
// The right number of frames are skipped/output.
assertThat(totalOutputFrames).isEqualTo(57980);
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(42020);
// The output consists of 50000 frames of noise, plus 20 frames of padding at the start and 99 *
// 40 frames of padding after that.
assertThat(totalOutputFrames).isEqualTo(50000 + (20 + 99 * 40));
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(50000 - (20 + 99 * 40));
}
@Test
@ -194,9 +197,10 @@ public final class SilenceSkippingAudioProcessorTest {
long totalOutputFrames =
process(silenceSkippingAudioProcessor, inputBufferProvider, /* inputBufferSize= */ 120);
// The right number of frames are skipped/output.
assertThat(totalOutputFrames).isEqualTo(57980);
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(42020);
// The output consists of 50000 frames of noise, plus 20 frames of padding at the start and 99 *
// 40 frames of padding after that.
assertThat(totalOutputFrames).isEqualTo(50000 + (20 + 99 * 40));
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(50000 - (20 + 99 * 40));
}
@Test
@ -221,9 +225,10 @@ public final class SilenceSkippingAudioProcessorTest {
long totalOutputFrames =
process(silenceSkippingAudioProcessor, inputBufferProvider, /* inputBufferSize= */ 120);
// The right number of frames are skipped/output.
assertThat(totalOutputFrames).isEqualTo(58379);
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(41621);
// The output consists of 50000 frames of noise, plus 21 frames of padding at the start and 99 *
// 42 frames of padding after that.
assertThat(totalOutputFrames).isEqualTo(50000 + (21 + 99 * 42));
assertThat(silenceSkippingAudioProcessor.getSkippedFrames()).isEqualTo(50000 - (21 + 99 * 42));
}
@Test
@ -289,11 +294,13 @@ public final class SilenceSkippingAudioProcessorTest {
Pcm16BitAudioBuilder audioBuilder = new Pcm16BitAudioBuilder(channelCount, totalFrameCount);
while (!audioBuilder.isFull()) {
int silenceDurationFrames = (silenceDurationMs * sampleRate) / 1000;
// Append stereo silence.
audioBuilder.appendFrames(
/* count= */ silenceDurationFrames, /* channelLevels...= */ (short) 0);
/* count= */ silenceDurationFrames, /* channelLevels...= */ (short) 0, (short) 0);
int noiseDurationFrames = (noiseDurationMs * sampleRate) / 1000;
// Append stereo noise.
audioBuilder.appendFrames(
/* count= */ noiseDurationFrames, /* channelLevels...= */ Short.MAX_VALUE);
/* count= */ noiseDurationFrames, /* channelLevels...= */ MAX_VALUE, MAX_VALUE);
}
return new InputBufferProvider(audioBuilder.build());
}
@ -345,7 +352,8 @@ public final class SilenceSkippingAudioProcessorTest {
* Appends {@code count} audio frames, using the specified {@code channelLevels} in each frame.
*/
public void appendFrames(int count, short... channelLevels) {
Assertions.checkState(!built);
checkState(!built);
checkState(channelLevels.length == channelCount);
for (int i = 0; i < count; i += channelCount) {
for (short channelLevel : channelLevels) {
buffer.put(channelLevel);
@ -355,13 +363,13 @@ public final class SilenceSkippingAudioProcessorTest {
/** Returns whether the buffer is full. */
public boolean isFull() {
Assertions.checkState(!built);
checkState(!built);
return !buffer.hasRemaining();
}
/** Returns the built buffer. After calling this method the builder should not be reused. */
public ShortBuffer build() {
Assertions.checkState(!built);
checkState(!built);
built = true;
buffer.flip();
return buffer;