loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conditionally output captured data in CapturingRenderersFactory

Browse Source 
This change makes capturing components in CapturingRenderersFactory
to dump data only they have previously captured any. This is so we can
extend the CapturingRenderersFactory with more renderers that do not
capture data in pre-existing tests and we don't have to change the
golden files.

PiperOrigin-RevId: 561973645
This commit is contained in:
christosts 2023-09-01 09:23:55 -07:00 committed by Copybara-Service
parent 502504fd47
commit 70ad637e52
21 changed files with 248 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump
View File

@ -1,93 +1,94 @@
buffer count = 29 AudioSink:
discontinuity: buffer count = 29
config: discontinuity:
pcmEncoding = 2 config:
channelCount = 2 pcmEncoding = 2
sampleRate = 48000 channelCount = 2
buffer #0: sampleRate = 48000
time = 1000000001000 buffer #0:
data = 1217833679 time = 1000000001000
buffer #1: data = 1217833679
time = 1000000097000 buffer #1:
data = 558614672 time = 1000000097000
buffer #2: data = 558614672
time = 1000000193000 buffer #2:
data = -709714787 time = 1000000193000
buffer #3: data = -709714787
time = 1000000289000 buffer #3:
data = 1367870571 time = 1000000289000
buffer #4: data = 1367870571
time = 1000000385000 buffer #4:
data = -141229457 time = 1000000385000
buffer #5: data = -141229457
time = 1000000481000 buffer #5:
data = 1287758361 time = 1000000481000
buffer #6: data = 1287758361
time = 1000000577000 buffer #6:
data = 1125289147 time = 1000000577000
buffer #7: data = 1125289147
time = 1000000673000 buffer #7:
data = -1677383475 time = 1000000673000
buffer #8: data = -1677383475
time = 1000000769000 buffer #8:
data = 2130742861 time = 1000000769000
buffer #9: data = 2130742861
time = 1000000865000 buffer #9:
data = -1292320253 time = 1000000865000
buffer #10: data = -1292320253
time = 1000000961000 buffer #10:
data = -456587163 time = 1000000961000
buffer #11: data = -456587163
time = 1000001057000 buffer #11:
data = 748981534 time = 1000001057000
buffer #12: data = 748981534
time = 1000001153000 buffer #12:
data = 1550456016 time = 1000001153000
buffer #13: data = 1550456016
time = 1000001249000 buffer #13:
data = 1657906039 time = 1000001249000
buffer #14: data = 1657906039
time = 1000001345000 buffer #14:
data = -762677083 time = 1000001345000
buffer #15: data = -762677083
time = 1000001441000 buffer #15:
data = -1343810763 time = 1000001441000
buffer #16: data = -1343810763
time = 1000001537000 buffer #16:
data = 1137318783 time = 1000001537000
buffer #17: data = 1137318783
time = 1000001633000 buffer #17:
data = -1891318229 time = 1000001633000
buffer #18: data = -1891318229
time = 1000001729000 buffer #18:
data = -472068495 time = 1000001729000
buffer #19: data = -472068495
time = 1000001825000 buffer #19:
data = 832315001 time = 1000001825000
buffer #20: data = 832315001
time = 1000001921000 buffer #20:
data = 2054935175 time = 1000001921000
buffer #21: data = 2054935175
time = 1000002017000 buffer #21:
data = 57921641 time = 1000002017000
buffer #22: data = 57921641
time = 1000002113000 buffer #22:
data = 2132759067 time = 1000002113000
buffer #23: data = 2132759067
time = 1000002209000 buffer #23:
data = -1742540521 time = 1000002209000
buffer #24: data = -1742540521
time = 1000002305000 buffer #24:
data = 1657024301 time = 1000002305000
buffer #25: data = 1657024301
time = 1000002401000 buffer #25:
data = -585080145 time = 1000002401000
buffer #26: data = -585080145
time = 1000002497000 buffer #26:
data = 427271397 time = 1000002497000
buffer #27: data = 427271397
time = 1000002593000 buffer #27:
data = -364201340 time = 1000002593000
buffer #28: data = -364201340
time = 1000002689000 buffer #28:
data = -627965287 time = 1000002689000
data = -627965287

187
libraries/test_data/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump
View File

@ -1,93 +1,94 @@
buffer count = 29 AudioSink:
discontinuity: buffer count = 29
config: discontinuity:
pcmEncoding = 536870912 config:
channelCount = 2 pcmEncoding = 536870912
sampleRate = 48000 channelCount = 2
buffer #0: sampleRate = 48000
time = 1000000000000 buffer #0:
data = 225023649 time = 1000000000000
buffer #1: data = 225023649
time = 1000000096000 buffer #1:
data = 455106306 time = 1000000096000
buffer #2: data = 455106306
time = 1000000192000 buffer #2:
data = 2025727297 time = 1000000192000
buffer #3: data = 2025727297
time = 1000000288000 buffer #3:
data = 758514657 time = 1000000288000
buffer #4: data = 758514657
time = 1000000384000 buffer #4:
data = 1044986473 time = 1000000384000
buffer #5: data = 1044986473
time = 1000000480000 buffer #5:
data = -2030029695 time = 1000000480000
buffer #6: data = -2030029695
time = 1000000576000 buffer #6:
data = 1907053281 time = 1000000576000
buffer #7: data = 1907053281
time = 1000000672000 buffer #7:
data = -1974954431 time = 1000000672000
buffer #8: data = -1974954431
time = 1000000768000 buffer #8:
data = -206248383 time = 1000000768000
buffer #9: data = -206248383
time = 1000000864000 buffer #9:
data = 1484984417 time = 1000000864000
buffer #10: data = 1484984417
time = 1000000960000 buffer #10:
data = -1306117439 time = 1000000960000
buffer #11: data = -1306117439
time = 1000001056000 buffer #11:
data = 692829792 time = 1000001056000
buffer #12: data = 692829792
time = 1000001152000 buffer #12:
data = 1070563058 time = 1000001152000
buffer #13: data = 1070563058
time = 1000001248000 buffer #13:
data = -1444096479 time = 1000001248000
buffer #14: data = -1444096479
time = 1000001344000 buffer #14:
data = 1753016419 time = 1000001344000
buffer #15: data = 1753016419
time = 1000001440000 buffer #15:
data = 1947797953 time = 1000001440000
buffer #16: data = 1947797953
time = 1000001536000 buffer #16:
data = 266121411 time = 1000001536000
buffer #17: data = 266121411
time = 1000001632000 buffer #17:
data = 1275494369 time = 1000001632000
buffer #18: data = 1275494369
time = 1000001728000 buffer #18:
data = 372077825 time = 1000001728000
buffer #19: data = 372077825
time = 1000001824000 buffer #19:
data = -993079679 time = 1000001824000
buffer #20: data = -993079679
time = 1000001920000 buffer #20:
data = 177307937 time = 1000001920000
buffer #21: data = 177307937
time = 1000002016000 buffer #21:
data = 2037083009 time = 1000002016000
buffer #22: data = 2037083009
time = 1000002112000 buffer #22:
data = -435776287 time = 1000002112000
buffer #23: data = -435776287
time = 1000002208000 buffer #23:
data = 1867447329 time = 1000002208000
buffer #24: data = 1867447329
time = 1000002304000 buffer #24:
data = 1884495937 time = 1000002304000
buffer #25: data = 1884495937
time = 1000002400000 buffer #25:
data = -804673375 time = 1000002400000
buffer #26: data = -804673375
time = 1000002496000 buffer #26:
data = -588531007 time = 1000002496000
buffer #27: data = -588531007
time = 1000002592000 buffer #27:
data = -1064642970 time = 1000002592000
buffer #28: data = -1064642970
time = 1000002688000 buffer #28:
data = -1771406207 time = 1000002688000
data = -1771406207

105
libraries/test_data/src/test/assets/audiosinkdumps/wav/sample.wav_then_sample_rf64.wav.dump
View File

@ -1,52 +1,53 @@
buffer count = 14 AudioSink:
config: buffer count = 14
pcmEncoding = 2 config:
channelCount = 1 pcmEncoding = 2
sampleRate = 44100 channelCount = 1
buffer #0: sampleRate = 44100
time = 1000000000000 buffer #0:
data = -85819864 time = 1000000000000
buffer #1: data = -85819864
time = 1000000100000 buffer #1:
data = 566487491 time = 1000000100000
buffer #2: data = 566487491
time = 1000000200000 buffer #2:
data = -1256531710 time = 1000000200000
buffer #3: data = -1256531710
time = 1000000300000 buffer #3:
data = 793455796 time = 1000000300000
buffer #4: data = 793455796
time = 1000000400000 buffer #4:
data = -268235582 time = 1000000400000
buffer #5: data = -268235582
time = 1000000500000 buffer #5:
data = -8136122 time = 1000000500000
buffer #6: data = -8136122
time = 1000000600000 buffer #6:
data = 1750866613 time = 1000000600000
buffer #7: data = 1750866613
time = 1000000700000 buffer #7:
data = -1100753636 time = 1000000700000
buffer #8: data = -1100753636
time = 1000000800000 buffer #8:
data = 507833230 time = 1000000800000
buffer #9: data = 507833230
time = 1000000900000 buffer #9:
data = 1472467506 time = 1000000900000
discontinuity: data = 1472467506
config: discontinuity:
pcmEncoding = 2 config:
channelCount = 2 pcmEncoding = 2
sampleRate = 48000 channelCount = 2
buffer #10: sampleRate = 48000
time = 1000001000000 buffer #10:
data = -278103001 time = 1000001000000
buffer #11: data = -278103001
time = 1000001100000 buffer #11:
data = 1522105084 time = 1000001100000
buffer #12: data = 1522105084
time = 1000001200000 buffer #12:
data = 932319027 time = 1000001200000
buffer #13: data = 932319027
time = 1000001300000 buffer #13:
data = 325000240 time = 1000001300000
data = 325000240

2
libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_early_output.dump
View File

@ -1,5 +1,3 @@
AudioSink:
buffer count = 0
MetadataOutput: MetadataOutput:
Metadata[0]: Metadata[0]:
presentationTimeUs = 100000 presentationTimeUs = 100000

2
libraries/test_data/src/test/assets/playbackdumps/dash/metadata_from_timely_output.dump
View File

@ -1,5 +1,3 @@
AudioSink:
buffer count = 0
MetadataOutput: MetadataOutput:
Metadata[0]: Metadata[0]:
presentationTimeUs = 100000 presentationTimeUs = 100000

2
libraries/test_data/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump
View File

@ -504,5 +504,3 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000002959000 timeUs = 1000002959000
size = 171 size = 171
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/mp4/sample_android_slow_motion.mp4.dump
View File

@ -56,5 +56,3 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000000492011 timeUs = 1000000492011
size = 2400 size = 2400
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/png/non-motion-photo-shortened.png.dump
View File

@ -1,5 +1,3 @@
AudioSink:
buffer count = 0
ImageOutput: ImageOutput:
rendered image count = 1 rendered image count = 1
image output #1: image output #1:

2
libraries/test_data/src/test/assets/playbackdumps/silence/0ms.dump
View File

@ -1,2 +0,0 @@
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h263.ts.dump
View File

@ -1,2 +0,0 @@
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump
View File

@ -28,5 +28,3 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000000133466 timeUs = 1000000133466
size = 442 size = 442
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump
View File

@ -28,5 +28,3 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000000100100 timeUs = 1000000100100
size = 254 size = 254
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump
View File

@ -1,2 +0,0 @@
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump
View File

@ -1,2 +0,0 @@
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump
View File

@ -217,5 +217,3 @@ MediaCodecAdapter (exotest.video.vp9):
timeUs = 1000000968000 timeUs = 1000000968000
size = 547 size = 547
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump
View File

@ -581,5 +581,3 @@ MediaCodecAdapter (exotest.video.vp9):
timeUs = 1000002703000 timeUs = 1000002703000
size = 1427 size = 1427
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump
View File

@ -364,5 +364,3 @@ MediaCodecAdapter (exotest.video.vp9):
timeUs = 1000002000000 timeUs = 1000002000000
size = 1477 size = 1477
rendered = true rendered = true
AudioSink:
buffer count = 0

2
libraries/test_data/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump
View File

@ -567,5 +567,3 @@ MediaCodecAdapter (exotest.video.vp9):
timeUs = 1000002961000 timeUs = 1000002961000
size = 807 size = 807
rendered = true rendered = true
AudioSink:
buffer count = 0

6
libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java
View File

@ -88,10 +88,14 @@ public final class CapturingAudioSink extends ForwardingAudioSink implements Dum
@Override @Override
public void dump(Dumper dumper) { public void dump(Dumper dumper) {
dumper.add("buffer count", bufferCount); if (interceptedData.isEmpty()) {
return;
}
dumper.startBlock("AudioSink").add("buffer count", bufferCount);
for (int i = 0; i < interceptedData.size(); i++) { for (int i = 0; i < interceptedData.size(); i++) {
interceptedData.get(i).dump(dumper); interceptedData.get(i).dump(dumper);
} }
dumper.endBlock();
} }
private static final class DumpableConfiguration implements Dumper.Dumpable { private static final class DumpableConfiguration implements Dumper.Dumpable {

2
libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java
View File

@ -59,9 +59,11 @@ public final class CapturingImageOutput implements Dumpable, ImageOutput {
@Override @Override
public void dump(Dumper dumper) { public void dump(Dumper dumper) {
dumper.startBlock("ImageOutput");
dumper.add("rendered image count", imageCount); dumper.add("rendered image count", imageCount);
for (Dumpable dumpable : renderedBitmaps) { for (Dumpable dumpable : renderedBitmaps) {
dumpable.dump(dumper); dumpable.dump(dumper);
} }
dumper.endBlock();
} }
} }

4
libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java
View File

@ -157,13 +157,9 @@ public class CapturingRenderersFactory implements RenderersFactory, Dumper.Dumpa
@Override @Override
public void dump(Dumper dumper) { public void dump(Dumper dumper) {
mediaCodecAdapterFactory.dump(dumper); mediaCodecAdapterFactory.dump(dumper);
dumper.startBlock("AudioSink");
audioSink.dump(dumper); audioSink.dump(dumper);
dumper.endBlock();
if (addImageRenderer) { if (addImageRenderer) {
dumper.startBlock("ImageOutput");
imageOutput.dump(dumper); imageOutput.dump(dumper);
dumper.endBlock();
} }
} }