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

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

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

37
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
config:
pcmEncoding = 2 pcmEncoding = 2
channelCount = 1 channelCount = 1
sampleRate = 44100 sampleRate = 44100
buffer #0: buffer #0:
time = 1000000000000 time = 1000000000000
data = -85819864 data = -85819864
buffer #1: buffer #1:
time = 1000000100000 time = 1000000100000
data = 566487491 data = 566487491
buffer #2: buffer #2:
time = 1000000200000 time = 1000000200000
data = -1256531710 data = -1256531710
buffer #3: buffer #3:
time = 1000000300000 time = 1000000300000
data = 793455796 data = 793455796
buffer #4: buffer #4:
time = 1000000400000 time = 1000000400000
data = -268235582 data = -268235582
buffer #5: buffer #5:
time = 1000000500000 time = 1000000500000
data = -8136122 data = -8136122
buffer #6: buffer #6:
time = 1000000600000 time = 1000000600000
data = 1750866613 data = 1750866613
buffer #7: buffer #7:
time = 1000000700000 time = 1000000700000
data = -1100753636 data = -1100753636
buffer #8: buffer #8:
time = 1000000800000 time = 1000000800000
data = 507833230 data = 507833230
buffer #9: buffer #9:
time = 1000000900000 time = 1000000900000
data = 1472467506 data = 1472467506
discontinuity: discontinuity:
config: config:
pcmEncoding = 2 pcmEncoding = 2
channelCount = 2 channelCount = 2
sampleRate = 48000 sampleRate = 48000
buffer #10: buffer #10:
time = 1000001000000 time = 1000001000000
data = -278103001 data = -278103001
buffer #11: buffer #11:
time = 1000001100000 time = 1000001100000
data = 1522105084 data = 1522105084
buffer #12: buffer #12:
time = 1000001200000 time = 1000001200000
data = 932319027 data = 932319027
buffer #13: buffer #13:
time = 1000001300000 time = 1000001300000
data = 325000240 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();
} }
} }