sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-07 11:35:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve CompositionExportTest assertions by using dump files.

Browse source 
PiperOrigin-RevId: 563708666
This commit is contained in:
samrobinson 2023-09-08 04:05:05 -07:00 committed by Copybara-Service
parent 007b7dbbf1
commit 866d62dd34
8 changed files with 11000 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1258
libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump Normal file
View file

File diff suppressed because it is too large Load diff

1306
libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump Normal file
View file

File diff suppressed because it is too large Load diff

1197
libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump Normal file
View file

File diff suppressed because it is too large Load diff

3537
libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump Normal file
View file

File diff suppressed because it is too large Load diff

3537
libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump Normal file
View file

File diff suppressed because it is too large Load diff

67
libraries/test_data/src/test/assets/transformerdumps/wav/sample.wav/mixed_sample.wav.dump Normal file
View file

@ -0,0 +1,67 @@
format audio:
averageBitrate = 131072
sampleMimeType = audio/mp4a-latm
channelCount = 1
sampleRate = 44100
pcmEncoding = 2
sample:
trackType = audio
dataHashCode = 1365664853
size = 8820
isKeyFrame = true
presentationTimeUs = 0
sample:
trackType = audio
dataHashCode = -1466730976
size = 8820
isKeyFrame = true
presentationTimeUs = 100000
sample:
trackType = audio
dataHashCode = 1178728837
size = 8820
isKeyFrame = true
presentationTimeUs = 200000
sample:
trackType = audio
dataHashCode = -216459624
size = 8820
isKeyFrame = true
presentationTimeUs = 300000
sample:
trackType = audio
dataHashCode = 1990341112
size = 8820
isKeyFrame = true
presentationTimeUs = 400000
sample:
trackType = audio
dataHashCode = 1561236782
size = 8820
isKeyFrame = true
presentationTimeUs = 500000
sample:
trackType = audio
dataHashCode = 1146352887
size = 8820
isKeyFrame = true
presentationTimeUs = 600000
sample:
trackType = audio
dataHashCode = 1061204212
size = 8820
isKeyFrame = true
presentationTimeUs = 700000
sample:
trackType = audio
dataHashCode = 840187559
size = 8820
isKeyFrame = true
presentationTimeUs = 800000
sample:
trackType = audio
dataHashCode = -29240395
size = 8820
isKeyFrame = true
presentationTimeUs = 900000
released = true

115
libraries/transformer/src/test/java/androidx/media3/transformer/CompositionExportTest.java
View file

@ -18,13 +18,16 @@ package androidx.media3.transformer;
import static androidx.media3.transformer.TestUtil.ASSET_URI_PREFIX;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_ONLY;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_RAW;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_RAW_STEREO_48000KHZ;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_RAW_VIDEO;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_VIDEO;
import static androidx.media3.transformer.TestUtil.FILE_AUDIO_VIDEO_INCREASING_TIMESTAMPS_15S;
import static androidx.media3.transformer.TestUtil.FILE_VIDEO_ONLY;
import static androidx.media3.transformer.TestUtil.addAudioDecoders;
import static androidx.media3.transformer.TestUtil.addAudioEncoders;
import static androidx.media3.transformer.TestUtil.createAudioEffects;
import static androidx.media3.transformer.TestUtil.createTransformerBuilder;
import static androidx.media3.transformer.TestUtil.createVolumeScalingAudioProcessor;
import static androidx.media3.transformer.TestUtil.getDumpFileName;
import static androidx.media3.transformer.TestUtil.removeEncodersAndDecoders;
import static com.google.common.truth.Truth.assertThat;
@ -66,13 +69,11 @@ public class CompositionExportTest {
}
@Test
public void start_audioVideoTransmuxedFromDifferentSequences_producesExpectedResult()
public void start_audioVideoTransmuxedFromDifferentSequences_matchesSingleSequenceResult()
throws Exception {
Transformer transformer =
createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
MediaItem mediaItem = MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_VIDEO);
transformer.start(mediaItem, outputDir.newFile().getPath());
ExportResult expectedExportResult = TransformerTestRunner.runLooper(transformer);
EditedMediaItem audioEditedMediaItem =
new EditedMediaItem.Builder(mediaItem).setRemoveVideo(true).build();
@ -85,16 +86,11 @@ public class CompositionExportTest {
.setTransmuxAudio(true)
.setTransmuxVideo(true)
.build();
transformer.start(composition, outputDir.newFile().getPath());
ExportResult exportResult = TransformerTestRunner.runLooper(transformer);
TransformerTestRunner.runLooper(transformer);
// We can't compare the muxer output against a dump file because the asset loaders in each
// sequence load samples from their own thread, independently of each other, which makes the
// output non-deterministic.
assertThat(exportResult.channelCount).isEqualTo(expectedExportResult.channelCount);
assertThat(exportResult.videoFrameCount).isEqualTo(expectedExportResult.videoFrameCount);
assertThat(exportResult.durationMs).isEqualTo(expectedExportResult.durationMs);
DumpFileAsserts.assertOutput(
context, muxerFactory.getCreatedMuxer(), getDumpFileName(FILE_AUDIO_VIDEO));
}
@Test
@ -104,8 +100,7 @@ public class CompositionExportTest {
EditedMediaItem audioEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_ONLY)).build();
EditedMediaItemSequence loopingAudioSequence =
new EditedMediaItemSequence(
ImmutableList.of(audioEditedMediaItem, audioEditedMediaItem), /* isLooping= */ true);
new EditedMediaItemSequence(ImmutableList.of(audioEditedMediaItem), /* isLooping= */ true);
EditedMediaItem videoEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY)).build();
EditedMediaItemSequence videoSequence =
@ -121,10 +116,14 @@ public class CompositionExportTest {
ExportResult exportResult = TransformerTestRunner.runLooper(transformer);
assertThat(exportResult.processedInputs).hasSize(6);
assertThat(exportResult.channelCount).isEqualTo(1);
assertThat(exportResult.videoFrameCount).isEqualTo(90);
assertThat(exportResult.durationMs).isEqualTo(2977);
assertThat(exportResult.fileSizeBytes).isEqualTo(293660);
DumpFileAsserts.assertOutput(
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
FILE_AUDIO_ONLY,
/* modifications...= */ "looping",
"mixedWith",
getFileName(FILE_VIDEO_ONLY)));
}
@Test
@ -139,8 +138,7 @@ public class CompositionExportTest {
EditedMediaItem videoEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_VIDEO_ONLY)).build();
EditedMediaItemSequence loopingVideoSequence =
new EditedMediaItemSequence(
ImmutableList.of(videoEditedMediaItem, videoEditedMediaItem), /* isLooping= */ true);
new EditedMediaItemSequence(ImmutableList.of(videoEditedMediaItem), /* isLooping= */ true);
Composition composition =
new Composition.Builder(audioSequence, loopingVideoSequence)
.setTransmuxAudio(true)
@ -151,14 +149,18 @@ public class CompositionExportTest {
ExportResult exportResult = TransformerTestRunner.runLooper(transformer);
assertThat(exportResult.processedInputs).hasSize(7);
assertThat(exportResult.channelCount).isEqualTo(1);
assertThat(exportResult.videoFrameCount).isEqualTo(93);
assertThat(exportResult.durationMs).isEqualTo(3108);
assertThat(exportResult.fileSizeBytes).isEqualTo(337308);
DumpFileAsserts.assertOutput(
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
FILE_VIDEO_ONLY,
/* modifications...= */ "looping",
"mixedWith",
getFileName(FILE_AUDIO_ONLY)));
}
@Test
public void start_loopingRawAudio_producesExpectedResult() throws Exception {
public void start_longVideoCompositionWithLoopingAudio_producesExpectedResult() throws Exception {
Transformer transformer =
createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
EditedMediaItemSequence loopingAudioSequence =
@ -191,7 +193,6 @@ public class CompositionExportTest {
public void start_compositionOfConcurrentAudio_isCorrect() throws Exception {
Transformer transformer =
createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
EditedMediaItem rawAudioEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW)).build();
Composition composition =
@ -208,7 +209,7 @@ public class CompositionExportTest {
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
/* originalFileName= */ FILE_AUDIO_RAW, /* modifications...= */ "concurrent"));
FILE_AUDIO_RAW, /* modifications...= */ "mixed", getFileName(FILE_AUDIO_RAW)));
}
@Test
@ -219,7 +220,8 @@ public class CompositionExportTest {
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO))
.build();
EditedMediaItem audioEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO))
new EditedMediaItem.Builder(
MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_STEREO_48000KHZ))
.setRemoveVideo(true)
.build();
Composition composition =
@ -233,7 +235,48 @@ public class CompositionExportTest {
ExportResult exportResult = TransformerTestRunner.runLooper(transformer);
assertThat(exportResult.processedInputs).hasSize(2);
assertThat(exportResult.durationMs).isEqualTo(1984);
DumpFileAsserts.assertOutput(
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
FILE_AUDIO_RAW_VIDEO,
/* modifications...= */ "mixed",
getFileName(FILE_AUDIO_RAW_STEREO_48000KHZ)));
}
@Test
public void start_audioVideoCompositionWithMutedAudio_matchesSingleSequence() throws Exception {
Transformer transformer =
createTransformerBuilder(muxerFactory, /* enableFallback= */ false).build();
EditedMediaItem audioVideoEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO))
.build();
EditedMediaItem mutedAudioEditedMediaItem =
new EditedMediaItem.Builder(MediaItem.fromUri(ASSET_URI_PREFIX + FILE_AUDIO_RAW_VIDEO))
.setEffects(createAudioEffects(createVolumeScalingAudioProcessor(0f)))
.setRemoveVideo(true)
.build();
EditedMediaItemSequence loopingMutedAudioSequence =
new EditedMediaItemSequence(
ImmutableList.of(mutedAudioEditedMediaItem), /* isLooping= */ true);
transformer.start(
new Composition.Builder(
new EditedMediaItemSequence(
audioVideoEditedMediaItem,
audioVideoEditedMediaItem,
audioVideoEditedMediaItem),
loopingMutedAudioSequence)
.setTransmuxVideo(true)
.build(),
outputDir.newFile().getPath());
TransformerTestRunner.runLooper(transformer);
DumpFileAsserts.assertOutput(
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
FILE_AUDIO_RAW_VIDEO, /* modifications...= */ "sequence", "repeated3Times"));
}
@Test
@ -252,7 +295,6 @@ public class CompositionExportTest {
.build();
EditedMediaItemSequence loopingAudioSequence =
new EditedMediaItemSequence(ImmutableList.of(audioEditedMediaItem), /* isLooping= */ true);
Composition composition =
new Composition.Builder(audioVideoSequence, loopingAudioSequence)
.setTransmuxVideo(true)
@ -262,6 +304,19 @@ public class CompositionExportTest {
ExportResult exportResult = TransformerTestRunner.runLooper(transformer);
assertThat(exportResult.processedInputs).hasSize(7);
assertThat(exportResult.durationMs).isEqualTo(5984);
DumpFileAsserts.assertOutput(
context,
muxerFactory.getCreatedMuxer(),
getDumpFileName(
/* originalFileName= */ FILE_AUDIO_RAW_VIDEO,
/* modifications...= */ "sequence",
"repeated3Times",
"mixed",
"loopingAudio" + getFileName(FILE_AUDIO_RAW_VIDEO)));
}
private static String getFileName(String filePath) {
int lastSeparator = filePath.lastIndexOf("/");
return filePath.substring(lastSeparator + 1);
}
}

13
libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java
View file

@ -19,6 +19,8 @@ import android.content.Context;
import android.media.MediaFormat;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.audio.AudioProcessor;
import androidx.media3.common.audio.ChannelMixingAudioProcessor;
import androidx.media3.common.audio.ChannelMixingMatrix;
import androidx.media3.common.audio.SonicAudioProcessor;
import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util;
@ -78,6 +80,17 @@ public final class TestUtil {
return sonicAudioProcessor;
}
public static ChannelMixingAudioProcessor createVolumeScalingAudioProcessor(float scale) {
ChannelMixingAudioProcessor audioProcessor = new ChannelMixingAudioProcessor();
for (int channel = 1; channel <= 6; channel++) {
audioProcessor.putChannelMixingMatrix(
ChannelMixingMatrix.create(
/* inputChannelCount= */ channel, /* outputChannelCount= */ channel)
.scaleBy(scale));
}
return audioProcessor;
}
public static String getDumpFileName(String originalFileName, String... modifications) {
String fileName = DUMP_FILE_OUTPUT_DIRECTORY + '/' + originalFileName + '/';
if (modifications.length == 0) {