sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-31 10:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Account for endTimeUs when outputting with no sources.

Browse source 
When endTimeUs is set, restrict output to that point.

PiperOrigin-RevId: 551555392
This commit is contained in:
samrobinson 2023-07-27 17:33:46 +01:00 committed by Rohit Singh
parent 5ba0ec9b40
commit ccdde8806e
2 changed files with 102 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixerImpl.java
View file

@ -228,7 +228,10 @@ import java.nio.ByteOrder;
return EMPTY_BUFFER;
}
long minSourcePosition = sources.size() == 0 ? maxPositionOfRemovedSources : endPosition;
long minSourcePosition = endPosition;
if (sources.size() == 0) {
minSourcePosition = min(minSourcePosition, maxPositionOfRemovedSources);
}
for (int i = 0; i < sources.size(); i++) {
minSourcePosition = min(minSourcePosition, sources.valueAt(i).position);

100
libraries/transformer/src/test/java/androidx/media3/transformer/AudioMixerImplTest.java
View file

@ -32,11 +32,25 @@ import org.robolectric.ParameterizedRobolectricTestRunner;
import org.robolectric.ParameterizedRobolectricTestRunner.Parameter;
import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
/** Unit tests for {@link AudioMixerImpl}. */
/**
* Unit tests for {@link AudioMixerImpl}.
*
* <p>The duration of a given buffer can be calculated with the {@link AudioFormat}:
*
* <ul>
* <li>{@link #SAMPLE_RATE} of 1000Hz means a frame is 1000us long (100Hz would mean frames are
* 10_000us each).
* <li>Channel count of stereo means there are two values for each frame.
* </ul>
*
* For example, a buffer containing 4 float values (of {@link #AUDIO_FORMAT_STEREO_PCM_FLOAT}) would
* be 2000us of data (4 values = 2 frames).
*/
// TODO(b/290002720): Expand and generalize parameterized test cases.
@RunWith(ParameterizedRobolectricTestRunner.class)
public final class AudioMixerImplTest {
@Parameters(name = "{0}")
@Parameters(name = "outputSilenceWithNoSources={0}")
public static ImmutableList<Boolean> parameters() {
return ImmutableList.of(false, true);
}
@ -290,6 +304,88 @@ public final class AudioMixerImplTest {
assertThat(mixer.isEnded()).isTrue();
}
@Test
public void output_withOneSource_queueSetEnd_outputsToEndTime() throws Exception {
mixer.configure(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* bufferSizeMs= */ 4, /* startTimeUs= */ 0);
int sourceId = mixer.addSource(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* startTimeUs= */ 0);
ByteBuffer sourceBuffer =
createByteBuffer(new float[] {0.1f, -0.1f, 0.2f, -0.2f, 0.3f, -0.3f, 0.4f, -0.4f});
mixer.queueInput(sourceId, sourceBuffer);
mixer.setEndTimeUs(3000);
// All input consumed because queued before end time set.
assertThat(sourceBuffer.hasRemaining()).isFalse();
// Last frame not in output due to end time.
assertThat(createFloatArray(mixer.getOutput()))
.isEqualTo(new float[] {0.1f, -0.1f, 0.2f, -0.2f, 0.3f, -0.3f});
assertThat(mixer.isEnded()).isTrue();
}
@Test
public void output_withOneSource_queueSetEndRemove_outputsToEndTime() throws Exception {
mixer.configure(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* bufferSizeMs= */ 4, /* startTimeUs= */ 0);
int sourceId = mixer.addSource(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* startTimeUs= */ 0);
ByteBuffer sourceBuffer =
createByteBuffer(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f, 0.25f, 0.25f});
mixer.queueInput(sourceId, sourceBuffer);
mixer.setEndTimeUs(3000);
mixer.removeSource(sourceId);
// All input consumed because queued before end time set.
assertThat(sourceBuffer.hasRemaining()).isFalse();
// Last frame not in output due to end time.
assertThat(createFloatArray(mixer.getOutput()))
.usingTolerance(1f / Short.MAX_VALUE)
.containsExactly(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f})
.inOrder();
assertThat(mixer.isEnded()).isTrue();
}
@Test
public void output_withOneSource_queueRemoveSetEnd_outputsToEndTime() throws Exception {
mixer.configure(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* bufferSizeMs= */ 4, /* startTimeUs= */ 0);
int sourceId = mixer.addSource(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* startTimeUs= */ 0);
ByteBuffer sourceBuffer =
createByteBuffer(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f, 0.25f, 0.25f});
mixer.queueInput(sourceId, sourceBuffer);
mixer.removeSource(sourceId);
mixer.setEndTimeUs(3000);
// All input consumed because queued before end time set.
assertThat(sourceBuffer.hasRemaining()).isFalse();
// Last frame not in output due to end time.
assertThat(createFloatArray(mixer.getOutput()))
.usingTolerance(1f / Short.MAX_VALUE)
.containsExactly(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f})
.inOrder();
assertThat(mixer.isEnded()).isTrue();
}
@Test
public void output_withOneSource_setEndQueueRemove_outputsToEndTime() throws Exception {
mixer.configure(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* bufferSizeMs= */ 4, /* startTimeUs= */ 0);
int sourceId = mixer.addSource(AUDIO_FORMAT_STEREO_PCM_FLOAT, /* startTimeUs= */ 0);
ByteBuffer sourceBuffer =
createByteBuffer(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f, 0.25f, 0.25f});
mixer.setEndTimeUs(3000);
mixer.queueInput(sourceId, sourceBuffer);
mixer.removeSource(sourceId);
// Last frame of input not consumed because end time set before queue.
assertThat(sourceBuffer.remaining()).isEqualTo(AUDIO_FORMAT_STEREO_PCM_FLOAT.bytesPerFrame);
// All queued input (3 frames) in output.
assertThat(createFloatArray(mixer.getOutput()))
.usingTolerance(1f / Short.MAX_VALUE)
.containsExactly(new float[] {-0.5f, -0.5f, 0.25f, 0.25f, -0.25f, -0.25f})
.inOrder();
assertThat(mixer.isEnded()).isTrue();
}
@Test
public void input_whileIsEnded_isNotConsumed() throws Exception {
mixer.configure(