From f0ae8afd806d8e0c7bbd8681d7977aed15345e13 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 17 Aug 2020 11:03:17 +0100 Subject: [PATCH] Separate the dump files from the test assets This allows us to more easily create different dumps derived from the same assets. This moves media/source files from `assets/` to `assets/media/` and dump files from `assets/` to `assets/extractordumps/` and `assets/audiosinkdumps/` as appropriate. I intend to add `assets/playbackdumps/` in a future CL. PiperOrigin-RevId: 326986283 --- .../ext/flac/FlacExtractorSeekTest.java | 7 ++- .../ext/flac/FlacExtractorTest.java | 40 +++++++------ .../exoplayer2/ext/flac/FlacPlaybackTest.java | 6 +- .../exoplayer2/ext/opus/OpusPlaybackTest.java | 4 +- .../exoplayer2/ext/vp9/VpxPlaybackTest.java | 9 +-- .../upstream/ContentDataSourceTest.java | 2 +- .../dvbsi/AppInfoTableDecoderTest.java | 6 +- .../exoplayer2/offline/ActionFileTest.java | 12 ++-- .../offline/ActionFileUpgradeUtilTest.java | 8 +-- .../offline/DefaultDownloadIndexTest.java | 2 +- .../source/ProgressiveMediaPeriodTest.java | 2 +- .../exoplayer2/text/ssa/SsaDecoderTest.java | 20 +++---- .../text/subrip/SubripDecoderTest.java | 23 +++---- .../exoplayer2/text/ttml/TtmlDecoderTest.java | 43 +++++++------- .../exoplayer2/text/tx3g/Tx3gDecoderTest.java | 25 ++++---- .../text/webvtt/WebvttDecoderTest.java | 32 +++++----- .../upstream/AssetDataSourceTest.java | 2 +- .../source/dash/DashMediaPeriodTest.java | 12 ++-- .../dash/manifest/DashManifestParserTest.java | 17 +++--- .../extractor/FlacFrameReaderTest.java | 24 ++++---- .../extractor/FlacMetadataReaderTest.java | 56 +++++++++--------- .../extractor/FlacStreamMetadataTest.java | 2 +- .../exoplayer2/extractor/Id3PeekerTest.java | 7 ++- .../exoplayer2/extractor/VorbisUtilTest.java | 6 +- .../amr/AmrExtractorParameterizedTest.java | 12 ++-- .../extractor/amr/AmrExtractorSeekTest.java | 4 +- .../extractor/flac/FlacExtractorSeekTest.java | 7 ++- .../extractor/flac/FlacExtractorTest.java | 46 +++++++------- .../extractor/flv/FlvExtractorTest.java | 2 +- .../extractor/mkv/MatroskaExtractorTest.java | 15 +++-- .../mp3/ConstantBitrateSeekerTest.java | 4 +- .../extractor/mp3/IndexSeekerTest.java | 2 +- .../extractor/mp3/Mp3ExtractorTest.java | 23 ++++--- .../mp4/FragmentedMp4ExtractorTest.java | 28 +++++---- .../extractor/mp4/Mp4ExtractorTest.java | 21 ++++--- .../extractor/ogg/DefaultOggSeekerTest.java | 5 +- .../ogg/OggExtractorNonParameterizedTest.java | 16 +++-- .../ogg/OggExtractorParameterizedTest.java | 12 ++-- .../extractor/ogg/OggPacketTest.java | 16 ++--- .../extractor/ogg/OggPageHeaderTest.java | 9 ++- .../extractor/ogg/VorbisReaderTest.java | 2 +- .../extractor/rawcc/RawCcExtractorTest.java | 2 +- .../extractor/ts/Ac3ExtractorTest.java | 7 ++- .../extractor/ts/Ac4ExtractorTest.java | 2 +- .../extractor/ts/AdtsExtractorSeekTest.java | 2 +- .../extractor/ts/AdtsExtractorTest.java | 8 +-- .../extractor/ts/PsDurationReaderTest.java | 6 +- .../extractor/ts/PsExtractorSeekTest.java | 2 +- .../extractor/ts/PsExtractorTest.java | 4 +- .../extractor/ts/TsDurationReaderTest.java | 4 +- .../extractor/ts/TsExtractorSeekTest.java | 2 +- .../extractor/ts/TsExtractorTest.java | 35 ++++++----- .../extractor/wav/WavExtractorTest.java | 8 +-- .../hls/DefaultHlsExtractorFactoryTest.java | 9 +-- .../source/hls/WebvttExtractorTest.java | 4 +- .../manifest/SsManifestParserTest.java | 4 +- .../mka/bear-flac-16bit.mka.audiosink.dump | 0 .../mka/bear-flac-24bit.mka.audiosink.dump | 0 .../amr/sample_nb.amr.0.dump | 0 .../amr/sample_nb.amr.unknown_length.dump | 0 .../amr/sample_nb_cbr.amr.0.dump | 0 .../amr/sample_nb_cbr.amr.1.dump | 0 .../amr/sample_nb_cbr.amr.2.dump | 0 .../amr/sample_nb_cbr.amr.3.dump | 0 .../amr/sample_nb_cbr.amr.unknown_length.dump | 0 .../amr/sample_wb.amr.0.dump | 0 .../amr/sample_wb.amr.unknown_length.dump | 0 .../amr/sample_wb_cbr.amr.0.dump | 0 .../amr/sample_wb_cbr.amr.1.dump | 0 .../amr/sample_wb_cbr.amr.2.dump | 0 .../amr/sample_wb_cbr.amr.3.dump | 0 .../amr/sample_wb_cbr.amr.unknown_length.dump | 0 .../flac/bear_flac.0.dump | 0 .../flac/bear_flac.1.dump | 0 .../flac/bear_flac.2.dump | 0 .../flac/bear_flac.3.dump | 0 .../flac/bear_flac.unknown_length.dump | 0 .../bear_no_min_max_frame_size_flac.0.dump | 0 .../bear_no_min_max_frame_size_flac.1.dump | 0 .../bear_no_min_max_frame_size_flac.2.dump | 0 .../bear_no_min_max_frame_size_flac.3.dump | 0 ...in_max_frame_size_flac.unknown_length.dump | 0 .../bear_no_min_max_frame_size_raw.0.dump | 0 .../bear_no_min_max_frame_size_raw.1.dump | 0 .../bear_no_min_max_frame_size_raw.2.dump | 0 .../bear_no_min_max_frame_size_raw.3.dump | 0 ...min_max_frame_size_raw.unknown_length.dump | 0 .../flac/bear_no_num_samples_flac.0.dump | 0 ...ar_no_num_samples_flac.unknown_length.dump | 0 .../flac/bear_no_num_samples_raw.0.dump | 0 ...ear_no_num_samples_raw.unknown_length.dump | 0 ...r_no_seek_table_no_num_samples_flac.0.dump | 0 ...le_no_num_samples_flac.unknown_length.dump | 0 ...ar_no_seek_table_no_num_samples_raw.0.dump | 0 ...ble_no_num_samples_raw.unknown_length.dump | 0 .../flac/bear_one_metadata_block_flac.0.dump | 0 .../flac/bear_one_metadata_block_flac.1.dump | 0 .../flac/bear_one_metadata_block_flac.2.dump | 0 .../flac/bear_one_metadata_block_flac.3.dump | 0 ...ne_metadata_block_flac.unknown_length.dump | 0 .../flac/bear_one_metadata_block_raw.0.dump | 0 .../flac/bear_one_metadata_block_raw.1.dump | 0 .../flac/bear_one_metadata_block_raw.2.dump | 0 .../flac/bear_one_metadata_block_raw.3.dump | 0 ...one_metadata_block_raw.unknown_length.dump | 0 .../{ => extractordumps}/flac/bear_raw.0.dump | 0 .../{ => extractordumps}/flac/bear_raw.1.dump | 0 .../{ => extractordumps}/flac/bear_raw.2.dump | 0 .../{ => extractordumps}/flac/bear_raw.3.dump | 0 .../flac/bear_raw.unknown_length.dump | 0 .../bear_uncommon_sample_rate_flac.0.dump | 0 .../bear_uncommon_sample_rate_flac.1.dump | 0 .../bear_uncommon_sample_rate_flac.2.dump | 0 .../bear_uncommon_sample_rate_flac.3.dump | 0 ...ommon_sample_rate_flac.unknown_length.dump | 0 .../flac/bear_uncommon_sample_rate_raw.0.dump | 0 .../flac/bear_uncommon_sample_rate_raw.1.dump | 0 .../flac/bear_uncommon_sample_rate_raw.2.dump | 0 .../flac/bear_uncommon_sample_rate_raw.3.dump | 0 ...common_sample_rate_raw.unknown_length.dump | 0 .../flac/bear_with_id3_disabled_flac.0.dump | 0 .../flac/bear_with_id3_disabled_flac.1.dump | 0 .../flac/bear_with_id3_disabled_flac.2.dump | 0 .../flac/bear_with_id3_disabled_flac.3.dump | 0 ...with_id3_disabled_flac.unknown_length.dump | 0 .../flac/bear_with_id3_disabled_raw.0.dump | 0 .../flac/bear_with_id3_disabled_raw.1.dump | 0 .../flac/bear_with_id3_disabled_raw.2.dump | 0 .../flac/bear_with_id3_disabled_raw.3.dump | 0 ..._with_id3_disabled_raw.unknown_length.dump | 0 .../flac/bear_with_id3_enabled_flac.0.dump | 0 .../flac/bear_with_id3_enabled_flac.1.dump | 0 .../flac/bear_with_id3_enabled_flac.2.dump | 0 .../flac/bear_with_id3_enabled_flac.3.dump | 0 ..._with_id3_enabled_flac.unknown_length.dump | 0 .../flac/bear_with_id3_enabled_raw.0.dump | 0 .../flac/bear_with_id3_enabled_raw.1.dump | 0 .../flac/bear_with_id3_enabled_raw.2.dump | 0 .../flac/bear_with_id3_enabled_raw.3.dump | 0 ...r_with_id3_enabled_raw.unknown_length.dump | 0 .../flac/bear_with_picture_flac.0.dump | 0 .../flac/bear_with_picture_flac.1.dump | 0 .../flac/bear_with_picture_flac.2.dump | 0 .../flac/bear_with_picture_flac.3.dump | 0 ...bear_with_picture_flac.unknown_length.dump | 0 .../flac/bear_with_picture_raw.0.dump | 0 .../flac/bear_with_picture_raw.1.dump | 0 .../flac/bear_with_picture_raw.2.dump | 0 .../flac/bear_with_picture_raw.3.dump | 0 .../bear_with_picture_raw.unknown_length.dump | 0 .../bear_with_vorbis_comments_flac.0.dump | 0 .../bear_with_vorbis_comments_flac.1.dump | 0 .../bear_with_vorbis_comments_flac.2.dump | 0 .../bear_with_vorbis_comments_flac.3.dump | 0 ...h_vorbis_comments_flac.unknown_length.dump | 0 .../flac/bear_with_vorbis_comments_raw.0.dump | 0 .../flac/bear_with_vorbis_comments_raw.1.dump | 0 .../flac/bear_with_vorbis_comments_raw.2.dump | 0 .../flac/bear_with_vorbis_comments_raw.3.dump | 0 ...th_vorbis_comments_raw.unknown_length.dump | 0 .../flv/sample.flv.0.dump | 0 .../flv/sample.flv.unknown_length.dump | 0 .../mkv/full_blocks.mkv.0.dump | 0 .../mkv/full_blocks.mkv.1.dump | 0 .../mkv/full_blocks.mkv.2.dump | 0 .../mkv/full_blocks.mkv.3.dump | 0 .../mkv/full_blocks.mkv.unknown_length.dump | 0 .../mkv/sample.mkv.0.dump | 0 .../mkv/sample.mkv.1.dump | 0 .../mkv/sample.mkv.2.dump | 0 .../mkv/sample.mkv.3.dump | 0 .../mkv/sample.mkv.unknown_length.dump | 0 ...le_with_htc_rotation_track_name.mkv.0.dump | 0 ...le_with_htc_rotation_track_name.mkv.1.dump | 0 ...le_with_htc_rotation_track_name.mkv.2.dump | 0 ...le_with_htc_rotation_track_name.mkv.3.dump | 0 ...otation_track_name.mkv.unknown_length.dump | 0 .../mkv/sample_with_srt.mkv.0.dump | 0 .../mkv/sample_with_srt.mkv.1.dump | 0 .../mkv/sample_with_srt.mkv.2.dump | 0 .../mkv/sample_with_srt.mkv.3.dump | 0 .../sample_with_srt.mkv.unknown_length.dump | 0 .../subsample_encrypted_altref.webm.0.dump | 0 ..._encrypted_altref.webm.unknown_length.dump | 0 .../subsample_encrypted_noaltref.webm.0.dump | 0 ...ncrypted_noaltref.webm.unknown_length.dump | 0 ...riable-frame-size-no-seek-table.mp3.0.dump | 0 ...riable-frame-size-no-seek-table.mp3.1.dump | 0 ...riable-frame-size-no-seek-table.mp3.2.dump | 0 ...riable-frame-size-no-seek-table.mp3.3.dump | 0 ...size-no-seek-table.mp3.unknown_length.dump | 0 .../mp3/bear-id3-disabled.0.dump | 0 .../mp3/bear-id3-disabled.1.dump | 0 .../mp3/bear-id3-disabled.2.dump | 0 .../mp3/bear-id3-disabled.3.dump | 0 .../mp3/bear-id3-disabled.unknown_length.dump | 0 .../mp3/bear-id3-enabled.0.dump | 0 .../mp3/bear-id3-enabled.1.dump | 0 .../mp3/bear-id3-enabled.2.dump | 0 .../mp3/bear-id3-enabled.3.dump | 0 .../mp3/bear-id3-enabled.unknown_length.dump | 0 .../mp3/bear-vbr-no-seek-table.mp3.0.dump | 0 .../mp3/bear-vbr-no-seek-table.mp3.1.dump | 0 .../mp3/bear-vbr-no-seek-table.mp3.2.dump | 0 .../mp3/bear-vbr-no-seek-table.mp3.3.dump | 0 ...-vbr-no-seek-table.mp3.unknown_length.dump | 0 .../mp3/bear-vbr-xing-header.mp3.0.dump | 0 .../mp3/bear-vbr-xing-header.mp3.1.dump | 0 .../mp3/bear-vbr-xing-header.mp3.2.dump | 0 .../mp3/bear-vbr-xing-header.mp3.3.dump | 0 ...ar-vbr-xing-header.mp3.unknown_length.dump | 0 .../mp3/play-trimmed.mp3.0.dump | 0 .../mp3/play-trimmed.mp3.1.dump | 0 .../mp3/play-trimmed.mp3.2.dump | 0 .../mp3/play-trimmed.mp3.3.dump | 0 .../mp3/play-trimmed.mp3.unknown_length.dump | 0 .../mp4/sample.mp4.0.dump | 0 .../mp4/sample.mp4.1.dump | 0 .../mp4/sample.mp4.2.dump | 0 .../mp4/sample.mp4.3.dump | 0 .../mp4/sample.mp4.unknown_length.dump | 0 .../mp4/sample_ac3.mp4.0.dump | 0 .../mp4/sample_ac3.mp4.1.dump | 0 .../mp4/sample_ac3.mp4.2.dump | 0 .../mp4/sample_ac3.mp4.3.dump | 0 .../mp4/sample_ac3.mp4.unknown_length.dump | 0 .../mp4/sample_ac3_fragmented.mp4.0.dump | 0 .../mp4/sample_ac3_fragmented.mp4.1.dump | 0 .../mp4/sample_ac3_fragmented.mp4.2.dump | 0 .../mp4/sample_ac3_fragmented.mp4.3.dump | 0 ...ple_ac3_fragmented.mp4.unknown_length.dump | 0 .../mp4/sample_ac4.mp4.0.dump | 0 .../mp4/sample_ac4.mp4.1.dump | 0 .../mp4/sample_ac4.mp4.2.dump | 0 .../mp4/sample_ac4.mp4.3.dump | 0 .../mp4/sample_ac4.mp4.unknown_length.dump | 0 .../mp4/sample_ac4_fragmented.mp4.0.dump | 0 .../mp4/sample_ac4_fragmented.mp4.1.dump | 0 .../mp4/sample_ac4_fragmented.mp4.2.dump | 0 .../mp4/sample_ac4_fragmented.mp4.3.dump | 0 ...ple_ac4_fragmented.mp4.unknown_length.dump | 0 .../mp4/sample_ac4_protected.mp4.0.dump | 0 .../mp4/sample_ac4_protected.mp4.1.dump | 0 .../mp4/sample_ac4_protected.mp4.2.dump | 0 .../mp4/sample_ac4_protected.mp4.3.dump | 0 ...mple_ac4_protected.mp4.unknown_length.dump | 0 .../mp4/sample_android_slow_motion.mp4.0.dump | 0 .../mp4/sample_android_slow_motion.mp4.1.dump | 0 .../mp4/sample_android_slow_motion.mp4.2.dump | 0 .../mp4/sample_android_slow_motion.mp4.3.dump | 0 ...ndroid_slow_motion.mp4.unknown_length.dump | 0 .../mp4/sample_eac3.mp4.0.dump | 0 .../mp4/sample_eac3.mp4.1.dump | 0 .../mp4/sample_eac3.mp4.2.dump | 0 .../mp4/sample_eac3.mp4.3.dump | 0 .../mp4/sample_eac3.mp4.unknown_length.dump | 0 .../mp4/sample_eac3_fragmented.mp4.0.dump | 0 .../mp4/sample_eac3_fragmented.mp4.1.dump | 0 .../mp4/sample_eac3_fragmented.mp4.2.dump | 0 .../mp4/sample_eac3_fragmented.mp4.3.dump | 0 ...le_eac3_fragmented.mp4.unknown_length.dump | 0 .../mp4/sample_eac3joc.mp4.0.dump | 0 .../mp4/sample_eac3joc.mp4.1.dump | 0 .../mp4/sample_eac3joc.mp4.2.dump | 0 .../mp4/sample_eac3joc.mp4.3.dump | 0 .../sample_eac3joc.mp4.unknown_length.dump | 0 .../mp4/sample_eac3joc_fragmented.mp4.0.dump | 0 .../mp4/sample_eac3joc_fragmented.mp4.1.dump | 0 .../mp4/sample_eac3joc_fragmented.mp4.2.dump | 0 .../mp4/sample_eac3joc_fragmented.mp4.3.dump | 0 ...eac3joc_fragmented.mp4.unknown_length.dump | 0 .../mp4/sample_fragmented.mp4.0.dump | 0 .../sample_fragmented.mp4.unknown_length.dump | 0 .../mp4/sample_fragmented_seekable.mp4.0.dump | 0 .../mp4/sample_fragmented_seekable.mp4.1.dump | 0 .../mp4/sample_fragmented_seekable.mp4.2.dump | 0 .../mp4/sample_fragmented_seekable.mp4.3.dump | 0 ...ragmented_seekable.mp4.unknown_length.dump | 0 .../mp4/sample_fragmented_sei.mp4.0.dump | 0 ...ple_fragmented_sei.mp4.unknown_length.dump | 0 .../mp4/sample_mdat_too_long.mp4.0.dump | 0 .../mp4/sample_mdat_too_long.mp4.1.dump | 0 .../mp4/sample_mdat_too_long.mp4.2.dump | 0 .../mp4/sample_mdat_too_long.mp4.3.dump | 0 ...mple_mdat_too_long.mp4.unknown_length.dump | 0 .../mp4/sample_opus.mp4.0.dump | 0 .../mp4/sample_opus.mp4.1.dump | 0 .../mp4/sample_opus.mp4.2.dump | 0 .../mp4/sample_opus.mp4.3.dump | 0 .../mp4/sample_opus.mp4.unknown_length.dump | 0 .../mp4/sample_opus_fragmented.mp4.0.dump | 0 ...le_opus_fragmented.mp4.unknown_length.dump | 0 .../sample_partially_fragmented.mp4.0.dump | 0 ...rtially_fragmented.mp4.unknown_length.dump | 0 .../{ => extractordumps}/ogg/bear.opus.0.dump | 0 .../{ => extractordumps}/ogg/bear.opus.1.dump | 0 .../{ => extractordumps}/ogg/bear.opus.2.dump | 0 .../{ => extractordumps}/ogg/bear.opus.3.dump | 0 .../ogg/bear.opus.unknown_length.dump | 0 .../ogg/bear_flac.ogg.0.dump | 0 .../ogg/bear_flac.ogg.1.dump | 0 .../ogg/bear_flac.ogg.2.dump | 0 .../ogg/bear_flac.ogg.3.dump | 0 .../ogg/bear_flac.ogg.unknown_length.dump | 0 .../ogg/bear_flac_noseektable.ogg.0.dump | 0 .../ogg/bear_flac_noseektable.ogg.1.dump | 0 .../ogg/bear_flac_noseektable.ogg.2.dump | 0 .../ogg/bear_flac_noseektable.ogg.3.dump | 0 ...r_flac_noseektable.ogg.unknown_length.dump | 0 .../ogg/bear_vorbis.ogg.0.dump | 0 .../ogg/bear_vorbis.ogg.1.dump | 0 .../ogg/bear_vorbis.ogg.2.dump | 0 .../ogg/bear_vorbis.ogg.3.dump | 0 .../ogg/bear_vorbis.ogg.unknown_length.dump | 0 .../ogg/bear_vorbis_gap.ogg.0.dump | 0 .../ogg/bear_vorbis_gap.ogg.1.dump | 0 .../ogg/bear_vorbis_gap.ogg.2.dump | 0 .../ogg/bear_vorbis_gap.ogg.3.dump | 0 .../bear_vorbis_gap.ogg.unknown_length.dump | 0 .../rawcc/sample.rawcc.0.dump | 0 .../rawcc/sample.rawcc.unknown_length.dump | 0 .../{ => extractordumps}/ts/sample.ac3.0.dump | 0 .../ts/sample.ac3.unknown_length.dump | 0 .../{ => extractordumps}/ts/sample.ac4.0.dump | 0 .../ts/sample.ac4.unknown_length.dump | 0 .../ts/sample.adts.0.dump | 0 .../ts/sample.adts.unknown_length.dump | 0 .../ts/sample.eac3.0.dump | 0 .../ts/sample.eac3.unknown_length.dump | 0 .../ts/sample_ac3.ps.0.dump | 0 .../ts/sample_ac3.ps.1.dump | 0 .../ts/sample_ac3.ps.2.dump | 0 .../ts/sample_ac3.ps.3.dump | 0 .../ts/sample_ac3.ps.unknown_length.dump | 0 .../ts/sample_ac3.ts.0.dump | 0 .../ts/sample_ac3.ts.1.dump | 0 .../ts/sample_ac3.ts.2.dump | 0 .../ts/sample_ac3.ts.3.dump | 0 .../ts/sample_ac3.ts.unknown_length.dump | 0 .../ts/sample_ac4.ts.0.dump | 0 .../ts/sample_ac4.ts.1.dump | 0 .../ts/sample_ac4.ts.2.dump | 0 .../ts/sample_ac4.ts.3.dump | 0 .../ts/sample_ac4.ts.unknown_length.dump | 0 .../ts/sample_ait.ts.0.dump | 0 .../ts/sample_ait.ts.unknown_length.dump | 0 .../ts/sample_cbs.adts.0.dump | 0 .../ts/sample_cbs.adts.1.dump | 0 .../ts/sample_cbs.adts.2.dump | 0 .../ts/sample_cbs.adts.3.dump | 0 .../ts/sample_cbs.adts.unknown_length.dump | 0 .../ts/sample_cbs_truncated.adts.0.dump | 0 .../ts/sample_cbs_truncated.adts.1.dump | 0 .../ts/sample_cbs_truncated.adts.2.dump | 0 .../ts/sample_cbs_truncated.adts.3.dump | 0 ...ple_cbs_truncated.adts.unknown_length.dump | 0 .../ts/sample_eac3.ts.0.dump | 0 .../ts/sample_eac3.ts.1.dump | 0 .../ts/sample_eac3.ts.2.dump | 0 .../ts/sample_eac3.ts.3.dump | 0 .../ts/sample_eac3.ts.unknown_length.dump | 0 .../ts/sample_eac3joc.ec3.0.dump | 0 .../ts/sample_eac3joc.ec3.unknown_length.dump | 0 .../ts/sample_eac3joc.ts.0.dump | 0 .../ts/sample_eac3joc.ts.1.dump | 0 .../ts/sample_eac3joc.ts.2.dump | 0 .../ts/sample_eac3joc.ts.3.dump | 0 .../ts/sample_eac3joc.ts.unknown_length.dump | 0 .../ts/sample_h262_mpeg_audio.ps.0.dump | 0 .../ts/sample_h262_mpeg_audio.ps.1.dump | 0 .../ts/sample_h262_mpeg_audio.ps.2.dump | 0 .../ts/sample_h262_mpeg_audio.ps.3.dump | 0 ...ple_h262_mpeg_audio.ps.unknown_length.dump | 0 .../ts/sample_h262_mpeg_audio.ts.0.dump | 0 .../ts/sample_h262_mpeg_audio.ts.1.dump | 0 .../ts/sample_h262_mpeg_audio.ts.2.dump | 0 .../ts/sample_h262_mpeg_audio.ts.3.dump | 0 ...ple_h262_mpeg_audio.ts.unknown_length.dump | 0 .../ts/sample_h263.ts.0.dump | 0 .../ts/sample_h263.ts.1.dump | 0 .../ts/sample_h263.ts.2.dump | 0 .../ts/sample_h263.ts.3.dump | 0 .../ts/sample_h263.ts.unknown_length.dump | 0 .../ts/sample_h264_dts_audio.ts.0.dump | 0 .../ts/sample_h264_dts_audio.ts.1.dump | 0 .../ts/sample_h264_dts_audio.ts.2.dump | 0 .../ts/sample_h264_dts_audio.ts.3.dump | 0 ...mple_h264_dts_audio.ts.unknown_length.dump | 0 .../ts/sample_h264_mpeg_audio.ts.0.dump | 0 .../ts/sample_h264_mpeg_audio.ts.1.dump | 0 .../ts/sample_h264_mpeg_audio.ts.2.dump | 0 .../ts/sample_h264_mpeg_audio.ts.3.dump | 0 ...ple_h264_mpeg_audio.ts.unknown_length.dump | 0 ...e_h264_no_access_unit_delimiters.ts.0.dump | 0 ...e_h264_no_access_unit_delimiters.ts.1.dump | 0 ...e_h264_no_access_unit_delimiters.ts.2.dump | 0 ...e_h264_no_access_unit_delimiters.ts.3.dump | 0 ...ess_unit_delimiters.ts.unknown_length.dump | 0 .../ts/sample_h265.ts.0.dump | 0 .../ts/sample_h265.ts.1.dump | 0 .../ts/sample_h265.ts.2.dump | 0 .../ts/sample_h265.ts.3.dump | 0 .../ts/sample_h265.ts.unknown_length.dump | 0 .../ts/sample_latm.ts.0.dump | 0 .../ts/sample_latm.ts.1.dump | 0 .../ts/sample_latm.ts.2.dump | 0 .../ts/sample_latm.ts.3.dump | 0 .../ts/sample_latm.ts.unknown_length.dump | 0 .../ts/sample_scte35.ts.0.dump | 0 .../ts/sample_scte35.ts.1.dump | 0 .../ts/sample_scte35.ts.2.dump | 0 .../ts/sample_scte35.ts.3.dump | 0 .../ts/sample_scte35.ts.unknown_length.dump | 0 .../ts/sample_with_id3.adts.0.dump | 0 .../sample_with_id3.adts.unknown_length.dump | 0 .../ts/sample_with_junk.0.dump | 0 .../ts/sample_with_junk.1.dump | 0 .../ts/sample_with_junk.2.dump | 0 .../ts/sample_with_junk.3.dump | 0 .../ts/sample_with_junk.unknown_length.dump | 0 .../wav/sample.wav.0.dump | 0 .../wav/sample.wav.1.dump | 0 .../wav/sample.wav.2.dump | 0 .../wav/sample.wav.3.dump | 0 .../wav/sample.wav.unknown_length.dump | 0 .../wav/sample_ima_adpcm.wav.0.dump | 0 .../wav/sample_ima_adpcm.wav.1.dump | 0 .../wav/sample_ima_adpcm.wav.2.dump | 0 .../wav/sample_ima_adpcm.wav.3.dump | 0 .../sample_ima_adpcm.wav.unknown_length.dump | 0 .../webvtt/with_x-timestamp-map_header.dump | 0 .../ad-responses/midroll10s_midroll20s.xml | 0 .../ad-responses/midroll1s_midroll7s.xml | 0 .../{ => media}/ad-responses/preroll.xml | 0 .../preroll_midroll6s_postroll.xml | 0 .../test/assets/{ => media}/amr/sample_nb.amr | Bin .../assets/{ => media}/amr/sample_nb_cbr.amr | Bin .../test/assets/{ => media}/amr/sample_wb.amr | Bin .../assets/{ => media}/amr/sample_wb_cbr.amr | Bin .../binary/ogg/vorbis_header_pages | Bin .../{ => media}/binary/vorbis/comment_header | Bin .../{ => media}/binary/vorbis/id_header | Bin .../{ => media}/binary/vorbis/setup_header | Bin .../{ => media}/bitmap/image_256_256.png | Bin .../assets/{ => media}/bitmap/image_80_60.bmp | Bin .../download-actions/dash-download-v0 | Bin .../download-actions/dash-remove-v0 | Bin .../download-actions/hls-download-v0 | Bin .../download-actions/hls-download-v1 | Bin .../download-actions/hls-remove-v0 | Bin .../download-actions/hls-remove-v1 | Bin .../download-actions/progressive-download-v0 | Bin .../download-actions/progressive-remove-v0 | Bin .../download-actions/ss-download-v0 | Bin .../download-actions/ss-download-v1 | Bin .../{ => media}/download-actions/ss-remove-v0 | Bin .../{ => media}/download-actions/ss-remove-v1 | Bin .../test/assets/{ => media}/dvbsi/README.md | 0 .../{ => media}/dvbsi/ait_no_url_base.bin | Bin .../{ => media}/dvbsi/ait_no_url_base.xml | 0 .../{ => media}/dvbsi/ait_no_url_path.bin | Bin .../{ => media}/dvbsi/ait_no_url_path.xml | 0 .../assets/{ => media}/dvbsi/ait_typical.bin | Bin .../assets/{ => media}/dvbsi/ait_typical.xml | 0 .../test/assets/{ => media}/flac/bear.flac | Bin .../flac/bear_no_min_max_frame_size.flac | Bin .../{ => media}/flac/bear_no_num_samples.flac | Bin .../bear_no_seek_table_no_num_samples.flac | Bin .../flac/bear_one_metadata_block.flac | Bin .../flac/bear_uncommon_sample_rate.flac | Bin .../{ => media}/flac/bear_with_id3.flac | Bin .../{ => media}/flac/bear_with_picture.flac | Bin .../flac/bear_with_vorbis_comments.flac | Bin .../test/assets/{ => media}/flv/sample.flv | Bin .../src/test/assets/{ => media}/id3/apic.id3 | Bin .../test/assets/{ => media}/id3/comm_apic.id3 | Bin .../{ => media}/mka/bear-flac-16bit.mka | Bin .../{ => media}/mka/bear-flac-24bit.mka | Bin .../mka/bear-opus-negative-gain.mka | Bin .../test/assets/{ => media}/mka/bear-opus.mka | Bin .../assets/{ => media}/mkv/full_blocks.mkv | Bin .../test/assets/{ => media}/mkv/sample.mkv | Bin .../sample_with_htc_rotation_track_name.mkv | Bin .../{ => media}/mkv/sample_with_srt.mkv | Bin .../mkv/subsample_encrypted_altref.webm | Bin .../mkv/subsample_encrypted_noaltref.webm | Bin .../mp3/1024_incrementing_bytes.mp3 | Bin ...-cbr-constant-frame-size-no-seek-table.mp3 | Bin ...-cbr-variable-frame-size-no-seek-table.mp3 | Bin .../test/assets/{ => media}/mp3/bear-id3.mp3 | Bin .../mp3/bear-vbr-no-seek-table.mp3 | Bin .../{ => media}/mp3/bear-vbr-xing-header.mp3 | Bin .../assets/{ => media}/mp3/play-trimmed.mp3 | Bin .../assets/{ => media}/mp4/midroll-5s.mp4 | Bin .../assets/{ => media}/mp4/postroll-5s.mp4 | Bin .../assets/{ => media}/mp4/preroll-5s.mp4 | Bin .../test/assets/{ => media}/mp4/sample.mp4 | Bin .../assets/{ => media}/mp4/sample_ac3.mp4 | Bin .../{ => media}/mp4/sample_ac3_fragmented.mp4 | Bin .../assets/{ => media}/mp4/sample_ac4.mp4 | Bin .../{ => media}/mp4/sample_ac4_fragmented.mp4 | Bin .../{ => media}/mp4/sample_ac4_protected.mp4 | Bin .../mp4/sample_android_slow_motion.mp4 | Bin .../assets/{ => media}/mp4/sample_eac3.mp4 | Bin .../mp4/sample_eac3_fragmented.mp4 | Bin .../assets/{ => media}/mp4/sample_eac3joc.mp4 | Bin .../mp4/sample_eac3joc_fragmented.mp4 | Bin .../{ => media}/mp4/sample_fragmented.mp4 | Bin .../mp4/sample_fragmented_seekable.mp4 | Bin .../{ => media}/mp4/sample_fragmented_sei.mp4 | Bin .../{ => media}/mp4/sample_mdat_too_long.mp4 | Bin .../assets/{ => media}/mp4/sample_opus.mp4 | Bin .../mp4/sample_opus_fragmented.mp4 | Bin .../mp4/sample_partially_fragmented.mp4 | Bin .../assets/{ => media}/mp4/testvid_1022ms.mp4 | Bin .../{ => media}/mp4/testvid_1022ms_000.png | Bin .../{ => media}/mp4/testvid_1022ms_014.png | Bin .../{ => media}/mp4/testvid_1022ms_015.png | Bin .../{ => media}/mp4/testvid_1022ms_016.png | Bin .../{ => media}/mp4/testvid_1022ms_029.png | Bin .../test/assets/{ => media}/mpd/sample_mpd | 0 .../mpd/sample_mpd_asset_identifier | 0 .../mpd/sample_mpd_cea_608_accessibility | 0 .../mpd/sample_mpd_cea_708_accessibility | 0 .../{ => media}/mpd/sample_mpd_event_stream | 0 .../assets/{ => media}/mpd/sample_mpd_labels | 0 .../mpd/sample_mpd_segment_template | 0 .../{ => media}/mpd/sample_mpd_stream_keys | 0 ...mple_mpd_switching_and_trick_play_property | 0 .../mpd/sample_mpd_switching_property | 0 .../assets/{ => media}/mpd/sample_mpd_text | 0 .../{ => media}/mpd/sample_mpd_trick_play | 0 .../mpd/sample_mpd_trick_play_property | 0 .../mpd/sample_mpd_unknown_mime_type | 0 ...n_file_for_download_index_upgrade_dash.exi | Bin ...on_file_for_download_index_upgrade_hls.exi | Bin ...for_download_index_upgrade_progressive.exi | Bin ...ion_file_for_download_index_upgrade_ss.exi | Bin .../offline/action_file_incomplete_header.exi | Bin .../offline/action_file_no_data.exi | 0 .../offline/action_file_one_action.exi | Bin .../offline/action_file_two_actions.exi | Bin .../action_file_unsupported_version.exi | Bin .../offline/action_file_zero_actions.exi | Bin .../offline/exoplayer_internal_v2.db | Bin .../src/test/assets/{ => media}/ogg/bear.opus | Bin .../test/assets/{ => media}/ogg/bear_flac.ogg | Bin .../{ => media}/ogg/bear_flac_noseektable.ogg | Bin .../assets/{ => media}/ogg/bear_vorbis.ogg | Bin .../{ => media}/ogg/bear_vorbis_gap.ogg | Bin .../{ => media}/ogg/continued_packet_at_start | Bin .../ogg/continued_packet_over_four_pages | Bin .../ogg/continued_packet_over_two_pages | Bin .../test/assets/{ => media}/ogg/eof_header | Bin .../test/assets/{ => media}/ogg/flac_header | Bin .../ogg/four_packets_with_empty_page | Bin .../assets/{ => media}/ogg/invalid_header | Bin .../assets/{ => media}/ogg/invalid_ogg_header | Bin .../test/assets/{ => media}/ogg/opus_header | Bin .../ogg/packet_with_zero_size_terminator | Bin .../test/assets/{ => media}/ogg/page_header | Bin .../assets/{ => media}/ogg/random_1000_pages | Bin .../test/assets/{ => media}/ogg/three_headers | Bin .../test/assets/{ => media}/ogg/vorbis_header | Bin .../ogg/zero_sized_packets_at_end_of_stream | Bin .../assets/{ => media}/rawcc/sample.rawcc | Bin .../smooth-streaming/sample_ismc_1 | 0 .../smooth-streaming/sample_ismc_2 | 0 .../src/test/assets/{ => media}/ssa/empty | 0 .../{ => media}/ssa/invalid_positioning | 0 .../assets/{ => media}/ssa/invalid_timecodes | 0 .../{ => media}/ssa/overlapping_timecodes | 0 .../test/assets/{ => media}/ssa/positioning | 0 .../ssa/positioning_without_playres | 0 .../src/test/assets/{ => media}/ssa/typical | 0 .../assets/{ => media}/ssa/typical_dialogue | 0 .../assets/{ => media}/ssa/typical_format | 0 .../assets/{ => media}/ssa/typical_header | 0 .../src/test/assets/{ => media}/subrip/empty | 0 .../test/assets/{ => media}/subrip/typical | 0 .../subrip/typical_extra_blank_line | 0 .../subrip/typical_missing_sequence | 0 .../subrip/typical_missing_timecode | 0 .../subrip/typical_negative_timestamps | 0 .../subrip/typical_no_hours_and_millis | 0 .../{ => media}/subrip/typical_unexpected_end | 0 .../subrip/typical_with_byte_order_mark | 0 .../{ => media}/subrip/typical_with_tags | 0 .../test/assets/{ => media}/ts/bbb_2500ms.ts | Bin .../assets/{ => media}/ts/elephants_dream.mpg | Bin .../src/test/assets/{ => media}/ts/sample.ac3 | Bin .../src/test/assets/{ => media}/ts/sample.ac4 | Bin .../test/assets/{ => media}/ts/sample.adts | Bin .../test/assets/{ => media}/ts/sample.eac3 | Bin .../test/assets/{ => media}/ts/sample_ac3.ps | Bin .../test/assets/{ => media}/ts/sample_ac3.ts | Bin .../test/assets/{ => media}/ts/sample_ac4.ts | Bin .../test/assets/{ => media}/ts/sample_ait.ts | Bin .../assets/{ => media}/ts/sample_cbs.adts | Bin .../{ => media}/ts/sample_cbs_truncated.adts | Bin .../test/assets/{ => media}/ts/sample_eac3.ts | Bin .../assets/{ => media}/ts/sample_eac3joc.ec3 | Bin .../assets/{ => media}/ts/sample_eac3joc.ts | Bin .../{ => media}/ts/sample_h262_mpeg_audio.ps | Bin .../{ => media}/ts/sample_h262_mpeg_audio.ts | Bin .../test/assets/{ => media}/ts/sample_h263.ts | Bin .../{ => media}/ts/sample_h264_dts_audio.ts | Bin .../{ => media}/ts/sample_h264_mpeg_audio.ts | Bin .../sample_h264_no_access_unit_delimiters.ts | Bin .../test/assets/{ => media}/ts/sample_h265.ts | Bin .../test/assets/{ => media}/ts/sample_latm.ts | Bin .../assets/{ => media}/ts/sample_scte35.ts | Bin .../{ => media}/ts/sample_with_id3.adts | Bin .../assets/{ => media}/ts/sample_with_junk | Bin .../assets/{ => media}/ts/sample_with_sdt.ts | Bin .../ttml/bitmap_percentage_region.xml | 0 .../{ => media}/ttml/bitmap_pixel_region.xml | 0 .../ttml/bitmap_unsupported_region.xml | 0 .../ttml/chain_multiple_styles.xml | 0 .../assets/{ => media}/ttml/font_size.xml | 0 .../{ => media}/ttml/font_size_empty.xml | 0 .../{ => media}/ttml/font_size_invalid.xml | 0 .../{ => media}/ttml/font_size_no_unit.xml | 0 .../assets/{ => media}/ttml/frame_rate.xml | 0 .../ttml/inherit_and_override_style.xml | 0 .../ttml/inherit_global_and_parent.xml | 0 .../ttml/inherit_multiple_styles.xml | 0 .../assets/{ => media}/ttml/inherit_style.xml | 0 .../ttml/inline_style_attributes.xml | 0 .../{ => media}/ttml/multiple_regions.xml | 0 .../ttml/no_underline_linethrough.xml | 0 .../test/assets/{ => media}/ttml/rubies.xml | 0 .../assets/{ => media}/ttml/text_align.xml | 0 .../assets/{ => media}/ttml/text_combine.xml | 0 .../assets/{ => media}/ttml/vertical_text.xml | 0 .../assets/{ => media}/tx3g/initialization | Bin .../tx3g/initialization_all_defaults | Bin .../test/assets/{ => media}/tx3g/no_subtitle | Bin .../assets/{ => media}/tx3g/sample_just_text | Bin .../{ => media}/tx3g/sample_utf16_be_no_styl | Bin .../{ => media}/tx3g/sample_utf16_le_no_styl | Bin .../tx3g/sample_with_multiple_styl | Bin .../tx3g/sample_with_other_extension | Bin .../assets/{ => media}/tx3g/sample_with_styl | Bin .../tx3g/sample_with_styl_all_defaults | Bin .../assets/{ => media}/tx3g/sample_with_tbox | Bin .../vp9/bear-vp9-odd-dimensions.webm | Bin .../test/assets/{ => media}/vp9/bear-vp9.webm | Bin .../{ => media}/vp9/invalid-bitstream.webm | Bin .../{ => media}/vp9/roadtrip-vp92-10bit.webm | Bin .../test/assets/{ => media}/wav/sample.wav | Bin .../{ => media}/wav/sample_ima_adpcm.wav | Bin .../wav/sample_with_trailing_bytes.wav | Bin .../src/test/assets/{ => media}/webvtt/empty | 0 .../test/assets/{ => media}/webvtt/typical | 0 .../webvtt/typical_with_bad_timestamps | 0 .../{ => media}/webvtt/typical_with_comments | 0 .../webvtt/typical_with_identifiers | 0 .../{ => media}/webvtt/with_bad_cue_header | 0 .../test/assets/{ => media}/webvtt/with_bom | 0 .../webvtt/with_css_complex_selectors | 0 .../assets/{ => media}/webvtt/with_css_styles | 0 .../webvtt/with_css_text_combine_upright | 0 .../webvtt/with_overlapping_timestamps | 0 .../{ => media}/webvtt/with_positioning | 0 .../assets/{ => media}/webvtt/with_rubies | 0 .../test/assets/{ => media}/webvtt/with_tags | 0 .../assets/{ => media}/webvtt/with_vertical | 0 .../webvtt/with_x-timestamp-map_header | 0 .../exoplayer2/testutil/ExtractorAsserts.java | 34 +++++++++-- 670 files changed, 411 insertions(+), 313 deletions(-) rename testdata/src/test/assets/{ => audiosinkdumps}/mka/bear-flac-16bit.mka.audiosink.dump (100%) rename testdata/src/test/assets/{ => audiosinkdumps}/mka/bear-flac-24bit.mka.audiosink.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb.amr.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb.amr.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb_cbr.amr.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb_cbr.amr.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb_cbr.amr.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb_cbr.amr.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_nb_cbr.amr.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb.amr.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb.amr.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb_cbr.amr.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb_cbr.amr.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb_cbr.amr.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb_cbr.amr.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/amr/sample_wb_cbr.amr.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_min_max_frame_size_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_num_samples_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_num_samples_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_num_samples_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_num_samples_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_seek_table_no_num_samples_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_seek_table_no_num_samples_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_one_metadata_block_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_uncommon_sample_rate_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_disabled_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_id3_enabled_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_picture_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_flac.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_flac.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_flac.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_flac.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_flac.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_raw.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_raw.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_raw.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_raw.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flac/bear_with_vorbis_comments_raw.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flv/sample.flv.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/flv/sample.flv.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/full_blocks.mkv.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/full_blocks.mkv.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/full_blocks.mkv.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/full_blocks.mkv.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/full_blocks.mkv.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample.mkv.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample.mkv.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample.mkv.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample.mkv.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample.mkv.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_htc_rotation_track_name.mkv.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_htc_rotation_track_name.mkv.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_htc_rotation_track_name.mkv.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_htc_rotation_track_name.mkv.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_srt.mkv.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_srt.mkv.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_srt.mkv.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_srt.mkv.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/sample_with_srt.mkv.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/subsample_encrypted_altref.webm.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/subsample_encrypted_altref.webm.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/subsample_encrypted_noaltref.webm.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-disabled.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-disabled.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-disabled.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-disabled.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-disabled.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-enabled.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-enabled.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-enabled.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-enabled.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-id3-enabled.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-no-seek-table.mp3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-no-seek-table.mp3.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-no-seek-table.mp3.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-no-seek-table.mp3.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-xing-header.mp3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-xing-header.mp3.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-xing-header.mp3.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-xing-header.mp3.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/bear-vbr-xing-header.mp3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/play-trimmed.mp3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/play-trimmed.mp3.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/play-trimmed.mp3.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/play-trimmed.mp3.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp3/play-trimmed.mp3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3_fragmented.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3_fragmented.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3_fragmented.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac3_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_fragmented.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_fragmented.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_fragmented.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_protected.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_protected.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_protected.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_protected.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_ac4_protected.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_android_slow_motion.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_android_slow_motion.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_android_slow_motion.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_android_slow_motion.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_android_slow_motion.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3_fragmented.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3_fragmented.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3_fragmented.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc_fragmented.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc_fragmented.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc_fragmented.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_seekable.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_seekable.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_seekable.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_seekable.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_seekable.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_sei.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_fragmented_sei.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_mdat_too_long.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_mdat_too_long.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_mdat_too_long.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_mdat_too_long.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_mdat_too_long.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus.mp4.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus.mp4.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus.mp4.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_opus_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_partially_fragmented.mp4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/mp4/sample_partially_fragmented.mp4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear.opus.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear.opus.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear.opus.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear.opus.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear.opus.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac.ogg.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac.ogg.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac.ogg.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac.ogg.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac.ogg.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac_noseektable.ogg.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac_noseektable.ogg.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac_noseektable.ogg.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac_noseektable.ogg.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_flac_noseektable.ogg.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis.ogg.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis.ogg.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis.ogg.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis.ogg.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis.ogg.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis_gap.ogg.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis_gap.ogg.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis_gap.ogg.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis_gap.ogg.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ogg/bear_vorbis_gap.ogg.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/rawcc/sample.rawcc.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/rawcc/sample.rawcc.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.ac3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.ac3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.ac4.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.ac4.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.adts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.adts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.eac3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample.eac3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ps.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ps.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ps.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ps.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ps.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac3.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac4.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac4.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac4.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac4.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ac4.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ait.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_ait.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs.adts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs.adts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs.adts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs.adts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs.adts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs_truncated.adts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs_truncated.adts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs_truncated.adts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs_truncated.adts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_cbs_truncated.adts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ec3.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ec3.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_eac3joc.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ps.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ps.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ps.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ps.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ps.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h262_mpeg_audio.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h263.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h263.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h263.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h263.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h263.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_dts_audio.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_dts_audio.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_dts_audio.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_dts_audio.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_dts_audio.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_mpeg_audio.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_mpeg_audio.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_mpeg_audio.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_mpeg_audio.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_mpeg_audio.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_no_access_unit_delimiters.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_no_access_unit_delimiters.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_no_access_unit_delimiters.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_no_access_unit_delimiters.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h265.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h265.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h265.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h265.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_h265.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_latm.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_latm.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_latm.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_latm.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_latm.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_scte35.ts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_scte35.ts.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_scte35.ts.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_scte35.ts.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_scte35.ts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_id3.adts.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_id3.adts.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_junk.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_junk.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_junk.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_junk.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/ts/sample_with_junk.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample.wav.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample.wav.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample.wav.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample.wav.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample.wav.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample_ima_adpcm.wav.0.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample_ima_adpcm.wav.1.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample_ima_adpcm.wav.2.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample_ima_adpcm.wav.3.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/wav/sample_ima_adpcm.wav.unknown_length.dump (100%) rename testdata/src/test/assets/{ => extractordumps}/webvtt/with_x-timestamp-map_header.dump (100%) rename testdata/src/test/assets/{ => media}/ad-responses/midroll10s_midroll20s.xml (100%) rename testdata/src/test/assets/{ => media}/ad-responses/midroll1s_midroll7s.xml (100%) rename testdata/src/test/assets/{ => media}/ad-responses/preroll.xml (100%) rename testdata/src/test/assets/{ => media}/ad-responses/preroll_midroll6s_postroll.xml (100%) rename testdata/src/test/assets/{ => media}/amr/sample_nb.amr (100%) rename testdata/src/test/assets/{ => media}/amr/sample_nb_cbr.amr (100%) rename testdata/src/test/assets/{ => media}/amr/sample_wb.amr (100%) rename testdata/src/test/assets/{ => media}/amr/sample_wb_cbr.amr (100%) rename testdata/src/test/assets/{ => media}/binary/ogg/vorbis_header_pages (100%) rename testdata/src/test/assets/{ => media}/binary/vorbis/comment_header (100%) rename testdata/src/test/assets/{ => media}/binary/vorbis/id_header (100%) rename testdata/src/test/assets/{ => media}/binary/vorbis/setup_header (100%) rename testdata/src/test/assets/{ => media}/bitmap/image_256_256.png (100%) rename testdata/src/test/assets/{ => media}/bitmap/image_80_60.bmp (100%) rename testdata/src/test/assets/{ => media}/download-actions/dash-download-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/dash-remove-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/hls-download-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/hls-download-v1 (100%) rename testdata/src/test/assets/{ => media}/download-actions/hls-remove-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/hls-remove-v1 (100%) rename testdata/src/test/assets/{ => media}/download-actions/progressive-download-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/progressive-remove-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/ss-download-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/ss-download-v1 (100%) rename testdata/src/test/assets/{ => media}/download-actions/ss-remove-v0 (100%) rename testdata/src/test/assets/{ => media}/download-actions/ss-remove-v1 (100%) rename testdata/src/test/assets/{ => media}/dvbsi/README.md (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_no_url_base.bin (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_no_url_base.xml (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_no_url_path.bin (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_no_url_path.xml (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_typical.bin (100%) rename testdata/src/test/assets/{ => media}/dvbsi/ait_typical.xml (100%) rename testdata/src/test/assets/{ => media}/flac/bear.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_no_min_max_frame_size.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_no_num_samples.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_no_seek_table_no_num_samples.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_one_metadata_block.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_uncommon_sample_rate.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_with_id3.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_with_picture.flac (100%) rename testdata/src/test/assets/{ => media}/flac/bear_with_vorbis_comments.flac (100%) rename testdata/src/test/assets/{ => media}/flv/sample.flv (100%) rename testdata/src/test/assets/{ => media}/id3/apic.id3 (100%) rename testdata/src/test/assets/{ => media}/id3/comm_apic.id3 (100%) rename testdata/src/test/assets/{ => media}/mka/bear-flac-16bit.mka (100%) rename testdata/src/test/assets/{ => media}/mka/bear-flac-24bit.mka (100%) rename testdata/src/test/assets/{ => media}/mka/bear-opus-negative-gain.mka (100%) rename testdata/src/test/assets/{ => media}/mka/bear-opus.mka (100%) rename testdata/src/test/assets/{ => media}/mkv/full_blocks.mkv (100%) rename testdata/src/test/assets/{ => media}/mkv/sample.mkv (100%) rename testdata/src/test/assets/{ => media}/mkv/sample_with_htc_rotation_track_name.mkv (100%) rename testdata/src/test/assets/{ => media}/mkv/sample_with_srt.mkv (100%) rename testdata/src/test/assets/{ => media}/mkv/subsample_encrypted_altref.webm (100%) rename testdata/src/test/assets/{ => media}/mkv/subsample_encrypted_noaltref.webm (100%) rename testdata/src/test/assets/{ => media}/mp3/1024_incrementing_bytes.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/bear-id3.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/bear-vbr-no-seek-table.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/bear-vbr-xing-header.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp3/play-trimmed.mp3 (100%) rename testdata/src/test/assets/{ => media}/mp4/midroll-5s.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/postroll-5s.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/preroll-5s.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_ac3.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_ac3_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_ac4.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_ac4_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_ac4_protected.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_android_slow_motion.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_eac3.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_eac3_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_eac3joc.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_eac3joc_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_fragmented_seekable.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_fragmented_sei.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_mdat_too_long.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_opus.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_opus_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/sample_partially_fragmented.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms.mp4 (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms_000.png (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms_014.png (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms_015.png (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms_016.png (100%) rename testdata/src/test/assets/{ => media}/mp4/testvid_1022ms_029.png (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_asset_identifier (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_cea_608_accessibility (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_cea_708_accessibility (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_event_stream (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_labels (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_segment_template (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_stream_keys (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_switching_and_trick_play_property (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_switching_property (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_text (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_trick_play (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_trick_play_property (100%) rename testdata/src/test/assets/{ => media}/mpd/sample_mpd_unknown_mime_type (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_for_download_index_upgrade_dash.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_for_download_index_upgrade_hls.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_for_download_index_upgrade_progressive.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_for_download_index_upgrade_ss.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_incomplete_header.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_no_data.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_one_action.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_two_actions.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_unsupported_version.exi (100%) rename testdata/src/test/assets/{ => media}/offline/action_file_zero_actions.exi (100%) rename testdata/src/test/assets/{ => media}/offline/exoplayer_internal_v2.db (100%) rename testdata/src/test/assets/{ => media}/ogg/bear.opus (100%) rename testdata/src/test/assets/{ => media}/ogg/bear_flac.ogg (100%) rename testdata/src/test/assets/{ => media}/ogg/bear_flac_noseektable.ogg (100%) rename testdata/src/test/assets/{ => media}/ogg/bear_vorbis.ogg (100%) rename testdata/src/test/assets/{ => media}/ogg/bear_vorbis_gap.ogg (100%) rename testdata/src/test/assets/{ => media}/ogg/continued_packet_at_start (100%) rename testdata/src/test/assets/{ => media}/ogg/continued_packet_over_four_pages (100%) rename testdata/src/test/assets/{ => media}/ogg/continued_packet_over_two_pages (100%) rename testdata/src/test/assets/{ => media}/ogg/eof_header (100%) rename testdata/src/test/assets/{ => media}/ogg/flac_header (100%) rename testdata/src/test/assets/{ => media}/ogg/four_packets_with_empty_page (100%) rename testdata/src/test/assets/{ => media}/ogg/invalid_header (100%) rename testdata/src/test/assets/{ => media}/ogg/invalid_ogg_header (100%) rename testdata/src/test/assets/{ => media}/ogg/opus_header (100%) rename testdata/src/test/assets/{ => media}/ogg/packet_with_zero_size_terminator (100%) rename testdata/src/test/assets/{ => media}/ogg/page_header (100%) rename testdata/src/test/assets/{ => media}/ogg/random_1000_pages (100%) rename testdata/src/test/assets/{ => media}/ogg/three_headers (100%) rename testdata/src/test/assets/{ => media}/ogg/vorbis_header (100%) rename testdata/src/test/assets/{ => media}/ogg/zero_sized_packets_at_end_of_stream (100%) rename testdata/src/test/assets/{ => media}/rawcc/sample.rawcc (100%) rename testdata/src/test/assets/{ => media}/smooth-streaming/sample_ismc_1 (100%) rename testdata/src/test/assets/{ => media}/smooth-streaming/sample_ismc_2 (100%) rename testdata/src/test/assets/{ => media}/ssa/empty (100%) rename testdata/src/test/assets/{ => media}/ssa/invalid_positioning (100%) rename testdata/src/test/assets/{ => media}/ssa/invalid_timecodes (100%) rename testdata/src/test/assets/{ => media}/ssa/overlapping_timecodes (100%) rename testdata/src/test/assets/{ => media}/ssa/positioning (100%) rename testdata/src/test/assets/{ => media}/ssa/positioning_without_playres (100%) rename testdata/src/test/assets/{ => media}/ssa/typical (100%) rename testdata/src/test/assets/{ => media}/ssa/typical_dialogue (100%) rename testdata/src/test/assets/{ => media}/ssa/typical_format (100%) rename testdata/src/test/assets/{ => media}/ssa/typical_header (100%) rename testdata/src/test/assets/{ => media}/subrip/empty (100%) rename testdata/src/test/assets/{ => media}/subrip/typical (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_extra_blank_line (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_missing_sequence (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_missing_timecode (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_negative_timestamps (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_no_hours_and_millis (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_unexpected_end (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_with_byte_order_mark (100%) rename testdata/src/test/assets/{ => media}/subrip/typical_with_tags (100%) rename testdata/src/test/assets/{ => media}/ts/bbb_2500ms.ts (100%) rename testdata/src/test/assets/{ => media}/ts/elephants_dream.mpg (100%) rename testdata/src/test/assets/{ => media}/ts/sample.ac3 (100%) rename testdata/src/test/assets/{ => media}/ts/sample.ac4 (100%) rename testdata/src/test/assets/{ => media}/ts/sample.adts (100%) rename testdata/src/test/assets/{ => media}/ts/sample.eac3 (100%) rename testdata/src/test/assets/{ => media}/ts/sample_ac3.ps (100%) rename testdata/src/test/assets/{ => media}/ts/sample_ac3.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_ac4.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_ait.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_cbs.adts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_cbs_truncated.adts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_eac3.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_eac3joc.ec3 (100%) rename testdata/src/test/assets/{ => media}/ts/sample_eac3joc.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h262_mpeg_audio.ps (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h262_mpeg_audio.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h263.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h264_dts_audio.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h264_mpeg_audio.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h264_no_access_unit_delimiters.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_h265.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_latm.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_scte35.ts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_with_id3.adts (100%) rename testdata/src/test/assets/{ => media}/ts/sample_with_junk (100%) rename testdata/src/test/assets/{ => media}/ts/sample_with_sdt.ts (100%) rename testdata/src/test/assets/{ => media}/ttml/bitmap_percentage_region.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/bitmap_pixel_region.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/bitmap_unsupported_region.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/chain_multiple_styles.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/font_size.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/font_size_empty.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/font_size_invalid.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/font_size_no_unit.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/frame_rate.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/inherit_and_override_style.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/inherit_global_and_parent.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/inherit_multiple_styles.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/inherit_style.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/inline_style_attributes.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/multiple_regions.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/no_underline_linethrough.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/rubies.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/text_align.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/text_combine.xml (100%) rename testdata/src/test/assets/{ => media}/ttml/vertical_text.xml (100%) rename testdata/src/test/assets/{ => media}/tx3g/initialization (100%) rename testdata/src/test/assets/{ => media}/tx3g/initialization_all_defaults (100%) rename testdata/src/test/assets/{ => media}/tx3g/no_subtitle (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_just_text (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_utf16_be_no_styl (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_utf16_le_no_styl (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_with_multiple_styl (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_with_other_extension (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_with_styl (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_with_styl_all_defaults (100%) rename testdata/src/test/assets/{ => media}/tx3g/sample_with_tbox (100%) rename testdata/src/test/assets/{ => media}/vp9/bear-vp9-odd-dimensions.webm (100%) rename testdata/src/test/assets/{ => media}/vp9/bear-vp9.webm (100%) rename testdata/src/test/assets/{ => media}/vp9/invalid-bitstream.webm (100%) rename testdata/src/test/assets/{ => media}/vp9/roadtrip-vp92-10bit.webm (100%) rename testdata/src/test/assets/{ => media}/wav/sample.wav (100%) rename testdata/src/test/assets/{ => media}/wav/sample_ima_adpcm.wav (100%) rename testdata/src/test/assets/{ => media}/wav/sample_with_trailing_bytes.wav (100%) rename testdata/src/test/assets/{ => media}/webvtt/empty (100%) rename testdata/src/test/assets/{ => media}/webvtt/typical (100%) rename testdata/src/test/assets/{ => media}/webvtt/typical_with_bad_timestamps (100%) rename testdata/src/test/assets/{ => media}/webvtt/typical_with_comments (100%) rename testdata/src/test/assets/{ => media}/webvtt/typical_with_identifiers (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_bad_cue_header (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_bom (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_css_complex_selectors (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_css_styles (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_css_text_combine_upright (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_overlapping_timestamps (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_positioning (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_rubies (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_tags (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_vertical (100%) rename testdata/src/test/assets/{ => media}/webvtt/with_x-timestamp-map_header (100%) diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java index 1c0c450a30..ba9e69410d 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java @@ -37,9 +37,10 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class FlacExtractorSeekTest { - private static final String TEST_FILE_SEEK_TABLE = "flac/bear.flac"; - private static final String TEST_FILE_BINARY_SEARCH = "flac/bear_one_metadata_block.flac"; - private static final String TEST_FILE_UNSEEKABLE = "flac/bear_no_seek_table_no_num_samples.flac"; + private static final String TEST_FILE_SEEK_TABLE = "media/flac/bear.flac"; + private static final String TEST_FILE_BINARY_SEARCH = "media/flac/bear_one_metadata_block.flac"; + private static final String TEST_FILE_UNSEEKABLE = + "media/flac/bear_no_seek_table_no_num_samples.flac"; private static final int DURATION_US = 2_741_000; private FlacExtractor extractor = new FlacExtractor(); diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java index ed28a2286a..d260a58e5d 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java @@ -39,78 +39,80 @@ public class FlacExtractorTest { @Test public void sample() throws Exception { ExtractorAsserts.assertAllBehaviors( - FlacExtractor::new, /* file= */ "flac/bear.flac", /* dumpFilesPrefix= */ "flac/bear_raw"); + FlacExtractor::new, + /* file= */ "media/flac/bear.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_raw"); } @Test public void sampleWithId3HeaderAndId3Enabled() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_with_id3.flac", - /* dumpFilesPrefix= */ "flac/bear_with_id3_enabled_raw"); + /* file= */ "media/flac/bear_with_id3.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_with_id3_enabled_raw"); } @Test public void sampleWithId3HeaderAndId3Disabled() throws Exception { ExtractorAsserts.assertAllBehaviors( () -> new FlacExtractor(FlacExtractor.FLAG_DISABLE_ID3_METADATA), - /* file= */ "flac/bear_with_id3.flac", - /* dumpFilesPrefix= */ "flac/bear_with_id3_disabled_raw"); + /* file= */ "media/flac/bear_with_id3.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_with_id3_disabled_raw"); } @Test public void sampleUnseekable() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_no_seek_table_no_num_samples.flac", - /* dumpFilesPrefix= */ "flac/bear_no_seek_table_no_num_samples_raw"); + /* file= */ "media/flac/bear_no_seek_table_no_num_samples.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_no_seek_table_no_num_samples_raw"); } @Test public void sampleWithVorbisComments() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_with_vorbis_comments.flac", - /* dumpFilesPrefix= */ "flac/bear_with_vorbis_comments_raw"); + /* file= */ "media/flac/bear_with_vorbis_comments.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_with_vorbis_comments_raw"); } @Test public void sampleWithPicture() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_with_picture.flac", - /* dumpFilesPrefix= */ "flac/bear_with_picture_raw"); + /* file= */ "media/flac/bear_with_picture.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_with_picture_raw"); } @Test public void oneMetadataBlock() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_one_metadata_block.flac", - /* dumpFilesPrefix= */ "flac/bear_one_metadata_block_raw"); + /* file= */ "media/flac/bear_one_metadata_block.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_one_metadata_block_raw"); } @Test public void noMinMaxFrameSize() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_no_min_max_frame_size.flac", - /* dumpFilesPrefix= */ "flac/bear_no_min_max_frame_size_raw"); + /* file= */ "media/flac/bear_no_min_max_frame_size.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_no_min_max_frame_size_raw"); } @Test public void noNumSamples() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_no_num_samples.flac", - /* dumpFilesPrefix= */ "flac/bear_no_num_samples_raw"); + /* file= */ "media/flac/bear_no_num_samples.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_no_num_samples_raw"); } @Test public void uncommonSampleRate() throws Exception { ExtractorAsserts.assertAllBehaviors( FlacExtractor::new, - /* file= */ "flac/bear_uncommon_sample_rate.flac", - /* dumpFilesPrefix= */ "flac/bear_uncommon_sample_rate_raw"); + /* file= */ "media/flac/bear_uncommon_sample_rate.flac", + /* dumpFilesPrefix= */ "extractordumps/flac/bear_uncommon_sample_rate_raw"); } } diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index c3c7b00149..90ec83630b 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java @@ -71,7 +71,7 @@ public class FlacPlaybackTest { TestPlaybackRunnable testPlaybackRunnable = new TestPlaybackRunnable( - Uri.parse("asset:///" + fileName), + Uri.parse("asset:///media/" + fileName), ApplicationProvider.getApplicationContext(), audioSink); Thread thread = new Thread(testPlaybackRunnable); @@ -82,7 +82,9 @@ public class FlacPlaybackTest { } DumpFileAsserts.assertOutput( - ApplicationProvider.getApplicationContext(), audioSink, fileName + ".audiosink.dump"); + ApplicationProvider.getApplicationContext(), + audioSink, + "audiosinkdumps/" + fileName + ".audiosink.dump"); } private static class TestPlaybackRunnable implements Player.EventListener, Runnable { diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java index 26f013d572..2d0b632c2e 100644 --- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java +++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java @@ -39,9 +39,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class OpusPlaybackTest { - private static final String BEAR_OPUS_URI = "asset:///mka/bear-opus.mka"; + private static final String BEAR_OPUS_URI = "asset:///media/mka/bear-opus.mka"; private static final String BEAR_OPUS_NEGATIVE_GAIN_URI = - "asset:///mka/bear-opus-negative-gain.mka"; + "asset:///media/mka/bear-opus-negative-gain.mka"; @Before public void setUp() { diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java index 1786b6838e..aec52755ea 100644 --- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java +++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java @@ -43,10 +43,11 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class VpxPlaybackTest { - private static final String BEAR_URI = "asset:///vp9/bear-vp9.webm"; - private static final String BEAR_ODD_DIMENSIONS_URI = "asset:///vp9/bear-vp9-odd-dimensions.webm"; - private static final String ROADTRIP_10BIT_URI = "asset:///vp9/roadtrip-vp92-10bit.webm"; - private static final String INVALID_BITSTREAM_URI = "asset:///vp9/invalid-bitstream.webm"; + private static final String BEAR_URI = "asset:///media/vp9/bear-vp9.webm"; + private static final String BEAR_ODD_DIMENSIONS_URI = + "asset:///media/vp9/bear-vp9-odd-dimensions.webm"; + private static final String ROADTRIP_10BIT_URI = "asset:///media/vp9/roadtrip-vp92-10bit.webm"; + private static final String INVALID_BITSTREAM_URI = "asset:///media/vp9/invalid-bitstream.webm"; private static final String TAG = "VpxPlaybackTest"; diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java index 76af346649..22442ca85f 100644 --- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java +++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java @@ -46,7 +46,7 @@ import org.junit.runner.RunWith; public final class ContentDataSourceTest { private static final String AUTHORITY = "com.google.android.exoplayer2.core.test"; - private static final String DATA_PATH = "mp3/1024_incrementing_bytes.mp3"; + private static final String DATA_PATH = "media/mp3/1024_incrementing_bytes.mp3"; @Test public void read() throws Exception { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java index 39de14b893..f6256ef6ab 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java @@ -33,9 +33,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class AppInfoTableDecoderTest { - private static final String TYPICAL_FILE = "dvbsi/ait_typical.bin"; - private static final String NO_URL_BASE_FILE = "dvbsi/ait_no_url_base.bin"; - private static final String NO_URL_PATH_FILE = "dvbsi/ait_no_url_path.bin"; + private static final String TYPICAL_FILE = "media/dvbsi/ait_typical.bin"; + private static final String NO_URL_BASE_FILE = "media/dvbsi/ait_no_url_base.bin"; + private static final String NO_URL_PATH_FILE = "media/dvbsi/ait_no_url_path.bin"; @Test public void decode_typical() throws Exception { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java index ad2685bad0..02ff4bba5e 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java @@ -57,7 +57,7 @@ public class ActionFileTest { @Test public void loadNoDataThrowsIOException() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_no_data.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_no_data.exi"); try { actionFile.load(); Assert.fail(); @@ -68,7 +68,7 @@ public class ActionFileTest { @Test public void loadIncompleteHeaderThrowsIOException() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_incomplete_header.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_incomplete_header.exi"); try { actionFile.load(); Assert.fail(); @@ -79,7 +79,7 @@ public class ActionFileTest { @Test public void loadZeroActions() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_zero_actions.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_zero_actions.exi"); DownloadRequest[] actions = actionFile.load(); assertThat(actions).isNotNull(); assertThat(actions).hasLength(0); @@ -87,7 +87,7 @@ public class ActionFileTest { @Test public void loadOneAction() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_one_action.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_one_action.exi"); DownloadRequest[] actions = actionFile.load(); assertThat(actions).hasLength(1); assertThat(actions[0]).isEqualTo(expectedAction1); @@ -95,7 +95,7 @@ public class ActionFileTest { @Test public void loadTwoActions() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_two_actions.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_two_actions.exi"); DownloadRequest[] actions = actionFile.load(); assertThat(actions).hasLength(2); assertThat(actions[0]).isEqualTo(expectedAction1); @@ -104,7 +104,7 @@ public class ActionFileTest { @Test public void loadUnsupportedVersion() throws Exception { - ActionFile actionFile = getActionFile("offline/action_file_unsupported_version.exi"); + ActionFile actionFile = getActionFile("media/offline/action_file_unsupported_version.exi"); try { actionFile.load(); Assert.fail(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java index 1eea7c0d80..05c0bcc780 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java @@ -61,7 +61,7 @@ public class ActionFileUpgradeUtilTest { byte[] actionFileBytes = TestUtil.getByteArray( ApplicationProvider.getApplicationContext(), - "offline/action_file_for_download_index_upgrade_progressive.exi"); + "media/offline/action_file_for_download_index_upgrade_progressive.exi"); try (FileOutputStream output = new FileOutputStream(tempFile)) { output.write(actionFileBytes); } @@ -96,7 +96,7 @@ public class ActionFileUpgradeUtilTest { byte[] actionFileBytes = TestUtil.getByteArray( ApplicationProvider.getApplicationContext(), - "offline/action_file_for_download_index_upgrade_dash.exi"); + "media/offline/action_file_for_download_index_upgrade_dash.exi"); try (FileOutputStream output = new FileOutputStream(tempFile)) { output.write(actionFileBytes); } @@ -135,7 +135,7 @@ public class ActionFileUpgradeUtilTest { byte[] actionFileBytes = TestUtil.getByteArray( ApplicationProvider.getApplicationContext(), - "offline/action_file_for_download_index_upgrade_hls.exi"); + "media/offline/action_file_for_download_index_upgrade_hls.exi"); try (FileOutputStream output = new FileOutputStream(tempFile)) { output.write(actionFileBytes); } @@ -174,7 +174,7 @@ public class ActionFileUpgradeUtilTest { byte[] actionFileBytes = TestUtil.getByteArray( ApplicationProvider.getApplicationContext(), - "offline/action_file_for_download_index_upgrade_ss.exi"); + "media/offline/action_file_for_download_index_upgrade_ss.exi"); try (FileOutputStream output = new FileOutputStream(tempFile)) { output.write(actionFileBytes); } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java index c8b2f24056..988b5127ec 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java @@ -224,7 +224,7 @@ public class DefaultDownloadIndexTest { Context context = ApplicationProvider.getApplicationContext(); File databaseFile = context.getDatabasePath(ExoDatabaseProvider.DATABASE_NAME); try (FileOutputStream output = new FileOutputStream(databaseFile)) { - output.write(TestUtil.getByteArray(context, "offline/exoplayer_internal_v2.db")); + output.write(TestUtil.getByteArray(context, "media/offline/exoplayer_internal_v2.db")); } Download dashDownload = createDownload( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java index 8947c97955..ecdb43f150 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java @@ -46,7 +46,7 @@ public final class ProgressiveMediaPeriodTest { MediaPeriodId mediaPeriodId = new MediaPeriodId(/* periodUid= */ new Object()); ProgressiveMediaPeriod mediaPeriod = new ProgressiveMediaPeriod( - Uri.parse("asset://android_asset/mp4/sample.mp4"), + Uri.parse("asset://android_asset/media/mp4/sample.mp4"), new AssetDataSource(ApplicationProvider.getApplicationContext()), () -> new Extractor[] {new Mp4Extractor()}, DrmSessionManager.DUMMY, diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java index 379e189db9..c7833fab04 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java @@ -34,16 +34,16 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class SsaDecoderTest { - private static final String EMPTY = "ssa/empty"; - private static final String TYPICAL = "ssa/typical"; - private static final String TYPICAL_HEADER_ONLY = "ssa/typical_header"; - private static final String TYPICAL_DIALOGUE_ONLY = "ssa/typical_dialogue"; - private static final String TYPICAL_FORMAT_ONLY = "ssa/typical_format"; - private static final String OVERLAPPING_TIMECODES = "ssa/overlapping_timecodes"; - private static final String POSITIONS = "ssa/positioning"; - private static final String INVALID_TIMECODES = "ssa/invalid_timecodes"; - private static final String INVALID_POSITIONS = "ssa/invalid_positioning"; - private static final String POSITIONS_WITHOUT_PLAYRES = "ssa/positioning_without_playres"; + private static final String EMPTY = "media/ssa/empty"; + private static final String TYPICAL = "media/ssa/typical"; + private static final String TYPICAL_HEADER_ONLY = "media/ssa/typical_header"; + private static final String TYPICAL_DIALOGUE_ONLY = "media/ssa/typical_dialogue"; + private static final String TYPICAL_FORMAT_ONLY = "media/ssa/typical_format"; + private static final String OVERLAPPING_TIMECODES = "media/ssa/overlapping_timecodes"; + private static final String POSITIONS = "media/ssa/positioning"; + private static final String INVALID_TIMECODES = "media/ssa/invalid_timecodes"; + private static final String INVALID_POSITIONS = "media/ssa/invalid_positioning"; + private static final String POSITIONS_WITHOUT_PLAYRES = "media/ssa/positioning_without_playres"; @Test public void decodeEmpty() throws IOException { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java index e233d8d1b5..c868cc9a70 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java @@ -30,16 +30,19 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class SubripDecoderTest { - private static final String EMPTY_FILE = "subrip/empty"; - private static final String TYPICAL_FILE = "subrip/typical"; - private static final String TYPICAL_WITH_BYTE_ORDER_MARK = "subrip/typical_with_byte_order_mark"; - private static final String TYPICAL_EXTRA_BLANK_LINE = "subrip/typical_extra_blank_line"; - private static final String TYPICAL_MISSING_TIMECODE = "subrip/typical_missing_timecode"; - private static final String TYPICAL_MISSING_SEQUENCE = "subrip/typical_missing_sequence"; - private static final String TYPICAL_NEGATIVE_TIMESTAMPS = "subrip/typical_negative_timestamps"; - private static final String TYPICAL_UNEXPECTED_END = "subrip/typical_unexpected_end"; - private static final String TYPICAL_WITH_TAGS = "subrip/typical_with_tags"; - private static final String TYPICAL_NO_HOURS_AND_MILLIS = "subrip/typical_no_hours_and_millis"; + private static final String EMPTY_FILE = "media/subrip/empty"; + private static final String TYPICAL_FILE = "media/subrip/typical"; + private static final String TYPICAL_WITH_BYTE_ORDER_MARK = + "media/subrip/typical_with_byte_order_mark"; + private static final String TYPICAL_EXTRA_BLANK_LINE = "media/subrip/typical_extra_blank_line"; + private static final String TYPICAL_MISSING_TIMECODE = "media/subrip/typical_missing_timecode"; + private static final String TYPICAL_MISSING_SEQUENCE = "media/subrip/typical_missing_sequence"; + private static final String TYPICAL_NEGATIVE_TIMESTAMPS = + "media/subrip/typical_negative_timestamps"; + private static final String TYPICAL_UNEXPECTED_END = "media/subrip/typical_unexpected_end"; + private static final String TYPICAL_WITH_TAGS = "media/subrip/typical_with_tags"; + private static final String TYPICAL_NO_HOURS_AND_MILLIS = + "media/subrip/typical_no_hours_and_millis"; @Test public void decodeEmpty() throws IOException { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java index 831ee6def2..dac21f3628 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java @@ -40,30 +40,33 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class TtmlDecoderTest { - private static final String INLINE_ATTRIBUTES_TTML_FILE = "ttml/inline_style_attributes.xml"; - private static final String INHERIT_STYLE_TTML_FILE = "ttml/inherit_style.xml"; + private static final String INLINE_ATTRIBUTES_TTML_FILE = + "media/ttml/inline_style_attributes.xml"; + private static final String INHERIT_STYLE_TTML_FILE = "media/ttml/inherit_style.xml"; private static final String INHERIT_STYLE_OVERRIDE_TTML_FILE = - "ttml/inherit_and_override_style.xml"; + "media/ttml/inherit_and_override_style.xml"; private static final String INHERIT_GLOBAL_AND_PARENT_TTML_FILE = - "ttml/inherit_global_and_parent.xml"; + "media/ttml/inherit_global_and_parent.xml"; private static final String INHERIT_MULTIPLE_STYLES_TTML_FILE = - "ttml/inherit_multiple_styles.xml"; - private static final String CHAIN_MULTIPLE_STYLES_TTML_FILE = "ttml/chain_multiple_styles.xml"; - private static final String MULTIPLE_REGIONS_TTML_FILE = "ttml/multiple_regions.xml"; + "media/ttml/inherit_multiple_styles.xml"; + private static final String CHAIN_MULTIPLE_STYLES_TTML_FILE = + "media/ttml/chain_multiple_styles.xml"; + private static final String MULTIPLE_REGIONS_TTML_FILE = "media/ttml/multiple_regions.xml"; private static final String NO_UNDERLINE_LINETHROUGH_TTML_FILE = - "ttml/no_underline_linethrough.xml"; - private static final String FONT_SIZE_TTML_FILE = "ttml/font_size.xml"; - private static final String FONT_SIZE_MISSING_UNIT_TTML_FILE = "ttml/font_size_no_unit.xml"; - private static final String FONT_SIZE_INVALID_TTML_FILE = "ttml/font_size_invalid.xml"; - private static final String FONT_SIZE_EMPTY_TTML_FILE = "ttml/font_size_empty.xml"; - private static final String FRAME_RATE_TTML_FILE = "ttml/frame_rate.xml"; - private static final String BITMAP_REGION_FILE = "ttml/bitmap_percentage_region.xml"; - private static final String BITMAP_PIXEL_REGION_FILE = "ttml/bitmap_pixel_region.xml"; - private static final String BITMAP_UNSUPPORTED_REGION_FILE = "ttml/bitmap_unsupported_region.xml"; - private static final String TEXT_ALIGN_FILE = "ttml/text_align.xml"; - private static final String VERTICAL_TEXT_FILE = "ttml/vertical_text.xml"; - private static final String TEXT_COMBINE_FILE = "ttml/text_combine.xml"; - private static final String RUBIES_FILE = "ttml/rubies.xml"; + "media/ttml/no_underline_linethrough.xml"; + private static final String FONT_SIZE_TTML_FILE = "media/ttml/font_size.xml"; + private static final String FONT_SIZE_MISSING_UNIT_TTML_FILE = "media/ttml/font_size_no_unit.xml"; + private static final String FONT_SIZE_INVALID_TTML_FILE = "media/ttml/font_size_invalid.xml"; + private static final String FONT_SIZE_EMPTY_TTML_FILE = "media/ttml/font_size_empty.xml"; + private static final String FRAME_RATE_TTML_FILE = "media/ttml/frame_rate.xml"; + private static final String BITMAP_REGION_FILE = "media/ttml/bitmap_percentage_region.xml"; + private static final String BITMAP_PIXEL_REGION_FILE = "media/ttml/bitmap_pixel_region.xml"; + private static final String BITMAP_UNSUPPORTED_REGION_FILE = + "media/ttml/bitmap_unsupported_region.xml"; + private static final String TEXT_ALIGN_FILE = "media/ttml/text_align.xml"; + private static final String VERTICAL_TEXT_FILE = "media/ttml/vertical_text.xml"; + private static final String TEXT_COMBINE_FILE = "media/ttml/text_combine.xml"; + private static final String RUBIES_FILE = "media/ttml/rubies.xml"; @Test public void inlineAttributes() throws IOException, SubtitleDecoderException { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java index 143326583c..58b9a853e7 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java @@ -41,17 +41,20 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class Tx3gDecoderTest { - private static final String NO_SUBTITLE = "tx3g/no_subtitle"; - private static final String SAMPLE_JUST_TEXT = "tx3g/sample_just_text"; - private static final String SAMPLE_WITH_STYL = "tx3g/sample_with_styl"; - private static final String SAMPLE_WITH_STYL_ALL_DEFAULTS = "tx3g/sample_with_styl_all_defaults"; - private static final String SAMPLE_UTF16_BE_NO_STYL = "tx3g/sample_utf16_be_no_styl"; - private static final String SAMPLE_UTF16_LE_NO_STYL = "tx3g/sample_utf16_le_no_styl"; - private static final String SAMPLE_WITH_MULTIPLE_STYL = "tx3g/sample_with_multiple_styl"; - private static final String SAMPLE_WITH_OTHER_EXTENSION = "tx3g/sample_with_other_extension"; - private static final String SAMPLE_WITH_TBOX = "tx3g/sample_with_tbox"; - private static final String INITIALIZATION = "tx3g/initialization"; - private static final String INITIALIZATION_ALL_DEFAULTS = "tx3g/initialization_all_defaults"; + private static final String NO_SUBTITLE = "media/tx3g/no_subtitle"; + private static final String SAMPLE_JUST_TEXT = "media/tx3g/sample_just_text"; + private static final String SAMPLE_WITH_STYL = "media/tx3g/sample_with_styl"; + private static final String SAMPLE_WITH_STYL_ALL_DEFAULTS = + "media/tx3g/sample_with_styl_all_defaults"; + private static final String SAMPLE_UTF16_BE_NO_STYL = "media/tx3g/sample_utf16_be_no_styl"; + private static final String SAMPLE_UTF16_LE_NO_STYL = "media/tx3g/sample_utf16_le_no_styl"; + private static final String SAMPLE_WITH_MULTIPLE_STYL = "media/tx3g/sample_with_multiple_styl"; + private static final String SAMPLE_WITH_OTHER_EXTENSION = + "media/tx3g/sample_with_other_extension"; + private static final String SAMPLE_WITH_TBOX = "media/tx3g/sample_with_tbox"; + private static final String INITIALIZATION = "media/tx3g/initialization"; + private static final String INITIALIZATION_ALL_DEFAULTS = + "media/tx3g/initialization_all_defaults"; @Test public void decodeNoSubtitle() throws IOException, SubtitleDecoderException { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java index 4229f7fb68..9b7db097a7 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java @@ -41,23 +41,25 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class WebvttDecoderTest { - private static final String TYPICAL_FILE = "webvtt/typical"; - private static final String TYPICAL_WITH_BAD_TIMESTAMPS = "webvtt/typical_with_bad_timestamps"; - private static final String TYPICAL_WITH_IDS_FILE = "webvtt/typical_with_identifiers"; - private static final String TYPICAL_WITH_COMMENTS_FILE = "webvtt/typical_with_comments"; - private static final String WITH_POSITIONING_FILE = "webvtt/with_positioning"; + private static final String TYPICAL_FILE = "media/webvtt/typical"; + private static final String TYPICAL_WITH_BAD_TIMESTAMPS = + "media/webvtt/typical_with_bad_timestamps"; + private static final String TYPICAL_WITH_IDS_FILE = "media/webvtt/typical_with_identifiers"; + private static final String TYPICAL_WITH_COMMENTS_FILE = "media/webvtt/typical_with_comments"; + private static final String WITH_POSITIONING_FILE = "media/webvtt/with_positioning"; private static final String WITH_OVERLAPPING_TIMESTAMPS_FILE = - "webvtt/with_overlapping_timestamps"; - private static final String WITH_VERTICAL_FILE = "webvtt/with_vertical"; - private static final String WITH_RUBIES_FILE = "webvtt/with_rubies"; - private static final String WITH_BAD_CUE_HEADER_FILE = "webvtt/with_bad_cue_header"; - private static final String WITH_TAGS_FILE = "webvtt/with_tags"; - private static final String WITH_CSS_STYLES = "webvtt/with_css_styles"; - private static final String WITH_CSS_COMPLEX_SELECTORS = "webvtt/with_css_complex_selectors"; + "media/webvtt/with_overlapping_timestamps"; + private static final String WITH_VERTICAL_FILE = "media/webvtt/with_vertical"; + private static final String WITH_RUBIES_FILE = "media/webvtt/with_rubies"; + private static final String WITH_BAD_CUE_HEADER_FILE = "media/webvtt/with_bad_cue_header"; + private static final String WITH_TAGS_FILE = "media/webvtt/with_tags"; + private static final String WITH_CSS_STYLES = "media/webvtt/with_css_styles"; + private static final String WITH_CSS_COMPLEX_SELECTORS = + "media/webvtt/with_css_complex_selectors"; private static final String WITH_CSS_TEXT_COMBINE_UPRIGHT = - "webvtt/with_css_text_combine_upright"; - private static final String WITH_BOM = "webvtt/with_bom"; - private static final String EMPTY_FILE = "webvtt/empty"; + "media/webvtt/with_css_text_combine_upright"; + private static final String WITH_BOM = "media/webvtt/with_bom"; + private static final String EMPTY_FILE = "media/webvtt/empty"; @Rule public final Expect expect = Expect.create(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java index 1f4790b8c5..67ca415a53 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class AssetDataSourceTest { - private static final String DATA_PATH = "mp3/1024_incrementing_bytes.mp3"; + private static final String DATA_PATH = "media/mp3/1024_incrementing_bytes.mp3"; @Test public void readFileUri() throws Exception { diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java index 199bd049d5..a21e73b0ab 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java @@ -58,7 +58,7 @@ public final class DashMediaPeriodTest { // - Embedded track groups. // All cases are deliberately combined in one test to catch potential indexing problems which // only occur in combination. - DashManifest manifest = parseManifest("mpd/sample_mpd_stream_keys"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_stream_keys"); // Ignore embedded metadata as we don't want to select primary group just to get embedded track. MediaPeriodAsserts.assertGetStreamKeysAndManifestFilterIntegration( @@ -70,7 +70,7 @@ public final class DashMediaPeriodTest { @Test public void adaptationSetSwitchingProperty_mergesTrackGroups() throws IOException { - DashManifest manifest = parseManifest("mpd/sample_mpd_switching_property"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_switching_property"); DashMediaPeriod dashMediaPeriod = createDashMediaPeriod(manifest, 0); List adaptationSets = manifest.getPeriod(0).adaptationSets; @@ -91,7 +91,7 @@ public final class DashMediaPeriodTest { @Test public void trickPlayProperty_mergesTrackGroups() throws IOException { - DashManifest manifest = parseManifest("mpd/sample_mpd_trick_play_property"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_trick_play_property"); DashMediaPeriod dashMediaPeriod = createDashMediaPeriod(manifest, 0); List adaptationSets = manifest.getPeriod(0).adaptationSets; @@ -114,7 +114,7 @@ public final class DashMediaPeriodTest { @Test public void adaptationSetSwitchingProperty_andTrickPlayProperty_mergesTrackGroups() throws IOException { - DashManifest manifest = parseManifest("mpd/sample_mpd_switching_and_trick_play_property"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_switching_and_trick_play_property"); DashMediaPeriod dashMediaPeriod = createDashMediaPeriod(manifest, 0); List adaptationSets = manifest.getPeriod(0).adaptationSets; @@ -135,7 +135,7 @@ public final class DashMediaPeriodTest { @Test public void cea608AccessibilityDescriptor_createsCea608TrackGroup() throws IOException { - DashManifest manifest = parseManifest("mpd/sample_mpd_cea_608_accessibility"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_cea_608_accessibility"); DashMediaPeriod dashMediaPeriod = createDashMediaPeriod(manifest, 0); List adaptationSets = manifest.getPeriod(0).adaptationSets; @@ -165,7 +165,7 @@ public final class DashMediaPeriodTest { @Test public void cea708AccessibilityDescriptor_createsCea708TrackGroup() throws IOException { - DashManifest manifest = parseManifest("mpd/sample_mpd_cea_708_accessibility"); + DashManifest manifest = parseManifest("media/mpd/sample_mpd_cea_708_accessibility"); DashMediaPeriod dashMediaPeriod = createDashMediaPeriod(manifest, 0); List adaptationSets = manifest.getPeriod(0).adaptationSets; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java index 19ad13ffde..c2ea12bcd7 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java @@ -42,14 +42,15 @@ import org.xmlpull.v1.XmlPullParserFactory; @RunWith(AndroidJUnit4.class) public class DashManifestParserTest { - private static final String SAMPLE_MPD = "mpd/sample_mpd"; - private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "mpd/sample_mpd_unknown_mime_type"; - private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "mpd/sample_mpd_segment_template"; - private static final String SAMPLE_MPD_EVENT_STREAM = "mpd/sample_mpd_event_stream"; - private static final String SAMPLE_MPD_LABELS = "mpd/sample_mpd_labels"; - private static final String SAMPLE_MPD_ASSET_IDENTIFIER = "mpd/sample_mpd_asset_identifier"; - private static final String SAMPLE_MPD_TEXT = "mpd/sample_mpd_text"; - private static final String SAMPLE_MPD_TRICK_PLAY = "mpd/sample_mpd_trick_play"; + private static final String SAMPLE_MPD = "media/mpd/sample_mpd"; + private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = + "media/mpd/sample_mpd_unknown_mime_type"; + private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "media/mpd/sample_mpd_segment_template"; + private static final String SAMPLE_MPD_EVENT_STREAM = "media/mpd/sample_mpd_event_stream"; + private static final String SAMPLE_MPD_LABELS = "media/mpd/sample_mpd_labels"; + private static final String SAMPLE_MPD_ASSET_IDENTIFIER = "media/mpd/sample_mpd_asset_identifier"; + private static final String SAMPLE_MPD_TEXT = "media/mpd/sample_mpd_text"; + private static final String SAMPLE_MPD_TRICK_PLAY = "media/mpd/sample_mpd_trick_play"; private static final String NEXT_TAG_NAME = "Next"; private static final String NEXT_TAG = "<" + NEXT_TAG_NAME + "/>"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java index c06bde39ad..75ef1a201e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java @@ -44,7 +44,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); int frameStartMarker = FlacMetadataReader.getFrameStartMarker(input); ParsableByteArray scratch = new ParsableByteArray(FlacConstants.MAX_FRAME_HEADER_SIZE); input.read(scratch.getData(), 0, FlacConstants.MAX_FRAME_HEADER_SIZE); @@ -64,7 +64,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); int frameStartMarker = FlacMetadataReader.getFrameStartMarker(input); ParsableByteArray scratch = new ParsableByteArray(FlacConstants.MAX_FRAME_HEADER_SIZE); input.read(scratch.getData(), 0, FlacConstants.MAX_FRAME_HEADER_SIZE); @@ -85,7 +85,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); int frameStartMarker = FlacMetadataReader.getFrameStartMarker(input); // Skip first frame. input.skip(5030); @@ -105,7 +105,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); ParsableByteArray scratch = new ParsableByteArray(FlacConstants.MAX_FRAME_HEADER_SIZE); input.read(scratch.getData(), 0, FlacConstants.MAX_FRAME_HEADER_SIZE); @@ -122,7 +122,7 @@ public class FlacFrameReaderTest { @Test public void checkFrameHeaderFromPeek_validData_doesNotUpdatePositions() throws Exception { - String file = "flac/bear_one_metadata_block.flac"; + String file = "media/flac/bear_one_metadata_block.flac"; FlacStreamMetadataHolder streamMetadataHolder = new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame(file, streamMetadataHolder); @@ -145,7 +145,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); int frameStartMarker = FlacMetadataReader.getFrameStartMarker(input); boolean result = @@ -164,7 +164,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); int frameStartMarker = FlacMetadataReader.getFrameStartMarker(input); // Skip first frame. input.skip(5030); @@ -182,7 +182,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); // The first bytes of the frame are not equal to the frame start marker. boolean result = @@ -197,7 +197,7 @@ public class FlacFrameReaderTest { @Test public void checkFrameHeaderFromPeek_invalidData_doesNotUpdatePositions() throws Exception { - String file = "flac/bear_one_metadata_block.flac"; + String file = "media/flac/bear_one_metadata_block.flac"; FlacStreamMetadataHolder streamMetadataHolder = new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame(file, streamMetadataHolder); @@ -224,7 +224,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); long initialReadPosition = input.getPosition(); // Advance peek position after block size bits. input.advancePeekPosition(FlacConstants.MAX_FRAME_HEADER_SIZE); @@ -241,7 +241,7 @@ public class FlacFrameReaderTest { new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); ExtractorInput input = buildExtractorInputReadingFromFirstFrame( - "flac/bear_one_metadata_block.flac", streamMetadataHolder); + "media/flac/bear_one_metadata_block.flac", streamMetadataHolder); // Skip first frame. input.skip(5030); @@ -272,7 +272,7 @@ public class FlacFrameReaderTest { @Test public void readFrameBlockSizeSamplesFromKey_keyBetween6And7_returnsCorrectBlockSize() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_one_metadata_block.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_one_metadata_block.flac"); // Skip to block size bits of last frame. input.skipFully(164033); ParsableByteArray scratch = new ParsableByteArray(2); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java index 9686d3bc3a..1648d548d2 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java @@ -45,7 +45,7 @@ public class FlacMetadataReaderTest { @Test public void peekId3Metadata_updatesPeekPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); FlacMetadataReader.peekId3Metadata(input, /* parseData= */ false); @@ -55,7 +55,7 @@ public class FlacMetadataReaderTest { @Test public void peekId3Metadata_parseData_returnsNonEmptyMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); Metadata metadata = FlacMetadataReader.peekId3Metadata(input, /* parseData= */ true); @@ -65,7 +65,7 @@ public class FlacMetadataReaderTest { @Test public void peekId3Metadata_doNotParseData_returnsNull() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); Metadata metadata = FlacMetadataReader.peekId3Metadata(input, /* parseData= */ false); @@ -74,7 +74,7 @@ public class FlacMetadataReaderTest { @Test public void peekId3Metadata_noId3Metadata_returnsNull() throws Exception { - String fileWithoutId3Metadata = "flac/bear.flac"; + String fileWithoutId3Metadata = "media/flac/bear.flac"; ExtractorInput input = buildExtractorInput(fileWithoutId3Metadata); Metadata metadata = FlacMetadataReader.peekId3Metadata(input, /* parseData= */ true); @@ -84,7 +84,7 @@ public class FlacMetadataReaderTest { @Test public void checkAndPeekStreamMarker_updatesPeekPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); FlacMetadataReader.checkAndPeekStreamMarker(input); @@ -94,7 +94,7 @@ public class FlacMetadataReaderTest { @Test public void checkAndPeekStreamMarker_validData_isTrue() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); boolean result = FlacMetadataReader.checkAndPeekStreamMarker(input); @@ -103,7 +103,7 @@ public class FlacMetadataReaderTest { @Test public void checkAndPeekStreamMarker_invalidData_isFalse() throws Exception { - ExtractorInput input = buildExtractorInput("mp3/bear-vbr-xing-header.mp3"); + ExtractorInput input = buildExtractorInput("media/mp3/bear-vbr-xing-header.mp3"); boolean result = FlacMetadataReader.checkAndPeekStreamMarker(input); @@ -112,7 +112,7 @@ public class FlacMetadataReaderTest { @Test public void readId3Metadata_updatesReadPositionAndAlignsPeekPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); // Advance peek position after ID3 metadata. FlacMetadataReader.peekId3Metadata(input, /* parseData= */ false); input.advancePeekPosition(1); @@ -125,7 +125,7 @@ public class FlacMetadataReaderTest { @Test public void readId3Metadata_parseData_returnsNonEmptyMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); Metadata metadata = FlacMetadataReader.readId3Metadata(input, /* parseData= */ true); @@ -135,7 +135,7 @@ public class FlacMetadataReaderTest { @Test public void readId3Metadata_doNotParseData_returnsNull() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_id3.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_id3.flac"); Metadata metadata = FlacMetadataReader.readId3Metadata(input, /* parseData= */ false); @@ -144,7 +144,7 @@ public class FlacMetadataReaderTest { @Test public void readId3Metadata_noId3Metadata_returnsNull() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); Metadata metadata = FlacMetadataReader.readId3Metadata(input, /* parseData= */ true); @@ -153,7 +153,7 @@ public class FlacMetadataReaderTest { @Test public void readStreamMarker_updatesReadPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); FlacMetadataReader.readStreamMarker(input); @@ -163,14 +163,14 @@ public class FlacMetadataReaderTest { @Test public void readStreamMarker_invalidData_throwsException() throws Exception { - ExtractorInput input = buildExtractorInput("mp3/bear-vbr-xing-header.mp3"); + ExtractorInput input = buildExtractorInput("media/mp3/bear-vbr-xing-header.mp3"); assertThrows(ParserException.class, () -> FlacMetadataReader.readStreamMarker(input)); } @Test public void readMetadataBlock_updatesReadPositionAndAlignsPeekPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); input.skipFully(FlacConstants.STREAM_MARKER_SIZE); // Advance peek position after metadata block. input.advancePeekPosition(FlacConstants.STREAM_INFO_BLOCK_SIZE + 1); @@ -184,7 +184,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_lastMetadataBlock_isTrue() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_one_metadata_block.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_one_metadata_block.flac"); input.skipFully(FlacConstants.STREAM_MARKER_SIZE); boolean result = @@ -196,7 +196,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_notLastMetadataBlock_isFalse() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); input.skipFully(FlacConstants.STREAM_MARKER_SIZE); boolean result = @@ -208,7 +208,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_streamInfoBlock_setsStreamMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); input.skipFully(FlacConstants.STREAM_MARKER_SIZE); FlacStreamMetadataHolder metadataHolder = new FlacStreamMetadataHolder(/* flacStreamMetadata= */ null); @@ -221,7 +221,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_seekTableBlock_updatesStreamMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to seek table block. input.skipFully(FlacConstants.STREAM_MARKER_SIZE + FlacConstants.STREAM_INFO_BLOCK_SIZE); FlacStreamMetadataHolder metadataHolder = new FlacStreamMetadataHolder(buildStreamMetadata()); @@ -238,7 +238,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_vorbisCommentBlock_updatesStreamMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_vorbis_comments.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_vorbis_comments.flac"); // Skip to Vorbis comment block. input.skipFully(640); FlacStreamMetadataHolder metadataHolder = new FlacStreamMetadataHolder(buildStreamMetadata()); @@ -259,7 +259,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_pictureBlock_updatesStreamMetadata() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear_with_picture.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear_with_picture.flac"); // Skip to picture block. input.skipFully(640); FlacStreamMetadataHolder metadataHolder = new FlacStreamMetadataHolder(buildStreamMetadata()); @@ -286,7 +286,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_blockToSkip_updatesReadPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to padding block. input.skipFully(640); FlacStreamMetadataHolder metadataHolder = new FlacStreamMetadataHolder(buildStreamMetadata()); @@ -300,7 +300,7 @@ public class FlacMetadataReaderTest { @Test public void readMetadataBlock_nonStreamInfoBlockWithNullStreamMetadata_throwsException() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to seek table block. input.skipFully(FlacConstants.STREAM_MARKER_SIZE + FlacConstants.STREAM_INFO_BLOCK_SIZE); @@ -313,7 +313,7 @@ public class FlacMetadataReaderTest { @Test public void readSeekTableMetadataBlock_updatesPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to seek table block. input.skipFully(FlacConstants.STREAM_MARKER_SIZE + FlacConstants.STREAM_INFO_BLOCK_SIZE); int seekTableBlockSize = 598; @@ -327,7 +327,7 @@ public class FlacMetadataReaderTest { @Test public void readSeekTableMetadataBlock_returnsCorrectSeekPoints() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to seek table block. input.skipFully(FlacConstants.STREAM_MARKER_SIZE + FlacConstants.STREAM_INFO_BLOCK_SIZE); int seekTableBlockSize = 598; @@ -345,7 +345,7 @@ public class FlacMetadataReaderTest { @Test public void readSeekTableMetadataBlock_ignoresPlaceholders() throws IOException { byte[] fileData = - TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "flac/bear.flac"); + TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "media/flac/bear.flac"); ParsableByteArray scratch = new ParsableByteArray(fileData); // Skip to seek table block. scratch.skipBytes(FlacConstants.STREAM_MARKER_SIZE + FlacConstants.STREAM_INFO_BLOCK_SIZE); @@ -359,7 +359,7 @@ public class FlacMetadataReaderTest { @Test public void getFrameStartMarker_doesNotUpdateReadPositionAndAlignsPeekPosition() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); int firstFramePosition = 8880; input.skipFully(firstFramePosition); // Advance the peek position after the frame start marker. @@ -373,7 +373,7 @@ public class FlacMetadataReaderTest { @Test public void getFrameStartMarker_returnsCorrectFrameStartMarker() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Skip to first frame. input.skipFully(8880); @@ -384,7 +384,7 @@ public class FlacMetadataReaderTest { @Test public void getFrameStartMarker_invalidData_throwsException() throws Exception { - ExtractorInput input = buildExtractorInput("flac/bear.flac"); + ExtractorInput input = buildExtractorInput("media/flac/bear.flac"); // Input position is incorrect. assertThrows(ParserException.class, () -> FlacMetadataReader.getFrameStartMarker(input)); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java index 482781e615..9c6b63ee0a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java @@ -35,7 +35,7 @@ public final class FlacStreamMetadataTest { @Test public void constructFromByteArray_setsFieldsCorrectly() throws IOException { byte[] fileData = - TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "flac/bear.flac"); + TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "media/flac/bear.flac"); FlacStreamMetadata streamMetadata = new FlacStreamMetadata( diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java index 2c7d7ad722..e0cf957a38 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java @@ -51,7 +51,8 @@ public final class Id3PeekerTest { Id3Peeker id3Peeker = new Id3Peeker(); FakeExtractorInput input = new FakeExtractorInput.Builder() - .setData(getByteArray(ApplicationProvider.getApplicationContext(), "id3/apic.id3")) + .setData( + getByteArray(ApplicationProvider.getApplicationContext(), "media/id3/apic.id3")) .build(); @Nullable Metadata metadata = id3Peeker.peekId3Data(input, /* id3FramePredicate= */ null); @@ -72,7 +73,9 @@ public final class Id3PeekerTest { Id3Peeker id3Peeker = new Id3Peeker(); FakeExtractorInput input = new FakeExtractorInput.Builder() - .setData(getByteArray(ApplicationProvider.getApplicationContext(), "id3/comm_apic.id3")) + .setData( + getByteArray( + ApplicationProvider.getApplicationContext(), "media/id3/comm_apic.id3")) .build(); @Nullable diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java index 67ac6bd1cc..9f0d6e0ff2 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java @@ -50,7 +50,7 @@ public final class VorbisUtilTest { public void readIdHeader() throws Exception { byte[] data = TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "binary/vorbis/id_header"); + ApplicationProvider.getApplicationContext(), "media/binary/vorbis/id_header"); ParsableByteArray headerData = new ParsableByteArray(data, data.length); VorbisUtil.VorbisIdHeader vorbisIdHeader = VorbisUtil.readVorbisIdentificationHeader(headerData); @@ -70,7 +70,7 @@ public final class VorbisUtilTest { public void readCommentHeader() throws IOException { byte[] data = TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "binary/vorbis/comment_header"); + ApplicationProvider.getApplicationContext(), "media/binary/vorbis/comment_header"); ParsableByteArray headerData = new ParsableByteArray(data, data.length); VorbisUtil.CommentHeader commentHeader = VorbisUtil.readVorbisCommentHeader(headerData); @@ -85,7 +85,7 @@ public final class VorbisUtilTest { public void readVorbisModes() throws IOException { byte[] data = TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "binary/vorbis/setup_header"); + ApplicationProvider.getApplicationContext(), "media/binary/vorbis/setup_header"); ParsableByteArray headerData = new ParsableByteArray(data, data.length); VorbisUtil.Mode[] modes = VorbisUtil.readVorbisModes(headerData, 2); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java index ccd96b3752..53913e07cc 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java @@ -42,20 +42,24 @@ public final class AmrExtractorParameterizedTest { @Test public void extractingNarrowBandSamples() throws Exception { ExtractorAsserts.assertBehavior( - createAmrExtractorFactory(/* withSeeking= */ false), "amr/sample_nb.amr", simulationConfig); + createAmrExtractorFactory(/* withSeeking= */ false), + "media/amr/sample_nb.amr", + simulationConfig); } @Test public void extractingWideBandSamples() throws Exception { ExtractorAsserts.assertBehavior( - createAmrExtractorFactory(/* withSeeking= */ false), "amr/sample_wb.amr", simulationConfig); + createAmrExtractorFactory(/* withSeeking= */ false), + "media/amr/sample_wb.amr", + simulationConfig); } @Test public void extractingNarrowBandSamples_withSeeking() throws Exception { ExtractorAsserts.assertBehavior( createAmrExtractorFactory(/* withSeeking= */ true), - "amr/sample_nb_cbr.amr", + "media/amr/sample_nb_cbr.amr", simulationConfig); } @@ -63,7 +67,7 @@ public final class AmrExtractorParameterizedTest { public void extractingWideBandSamples_withSeeking() throws Exception { ExtractorAsserts.assertBehavior( createAmrExtractorFactory(/* withSeeking= */ true), - "amr/sample_wb_cbr.amr", + "media/amr/sample_wb_cbr.amr", simulationConfig); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java index 42e9f93c00..3d884e02dc 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java @@ -39,10 +39,10 @@ public final class AmrExtractorSeekTest { private static final Random random = new Random(1234L); - private static final String NARROW_BAND_AMR_FILE = "amr/sample_nb.amr"; + private static final String NARROW_BAND_AMR_FILE = "media/amr/sample_nb.amr"; private static final int NARROW_BAND_FILE_DURATION_US = 4_360_000; - private static final String WIDE_BAND_AMR_FILE = "amr/sample_wb.amr"; + private static final String WIDE_BAND_AMR_FILE = "media/amr/sample_wb.amr"; private static final int WIDE_BAND_FILE_DURATION_US = 3_380_000; private FakeTrackOutput expectedTrackOutput; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java index 99cf464f68..e95c8cd7e8 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java @@ -37,9 +37,10 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class FlacExtractorSeekTest { - private static final String TEST_FILE_SEEK_TABLE = "flac/bear.flac"; - private static final String TEST_FILE_BINARY_SEARCH = "flac/bear_one_metadata_block.flac"; - private static final String TEST_FILE_UNSEEKABLE = "flac/bear_no_seek_table_no_num_samples.flac"; + private static final String TEST_FILE_SEEK_TABLE = "media/flac/bear.flac"; + private static final String TEST_FILE_BINARY_SEARCH = "media/flac/bear_one_metadata_block.flac"; + private static final String TEST_FILE_UNSEEKABLE = + "media/flac/bear_no_seek_table_no_num_samples.flac"; private static final int DURATION_US = 2_741_000; private FlacExtractor extractor = new FlacExtractor(); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java index c3e17693c3..500cdd4e86 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java @@ -39,8 +39,8 @@ public class FlacExtractorTest { public void sample() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear.flac", - new AssertionConfig.Builder().setDumpFilesPrefix("flac/bear_flac").build(), + "media/flac/bear.flac", + new AssertionConfig.Builder().setDumpFilesPrefix("extractordumps/flac/bear_flac").build(), simulationConfig); } @@ -48,8 +48,10 @@ public class FlacExtractorTest { public void sampleWithId3HeaderAndId3Enabled() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_with_id3.flac", - new AssertionConfig.Builder().setDumpFilesPrefix("flac/bear_with_id3_enabled_flac").build(), + "media/flac/bear_with_id3.flac", + new AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/flac/bear_with_id3_enabled_flac") + .build(), simulationConfig); } @@ -57,9 +59,9 @@ public class FlacExtractorTest { public void sampleWithId3HeaderAndId3Disabled() throws Exception { ExtractorAsserts.assertBehavior( () -> new FlacExtractor(FlacExtractor.FLAG_DISABLE_ID3_METADATA), - "flac/bear_with_id3.flac", + "media/flac/bear_with_id3.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_with_id3_disabled_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_with_id3_disabled_flac") .build(), simulationConfig); } @@ -68,9 +70,9 @@ public class FlacExtractorTest { public void sampleUnseekable() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_no_seek_table_no_num_samples.flac", + "media/flac/bear_no_seek_table_no_num_samples.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_no_seek_table_no_num_samples_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_no_seek_table_no_num_samples_flac") .build(), simulationConfig); } @@ -79,9 +81,9 @@ public class FlacExtractorTest { public void sampleWithVorbisComments() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_with_vorbis_comments.flac", + "media/flac/bear_with_vorbis_comments.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_with_vorbis_comments_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_with_vorbis_comments_flac") .build(), simulationConfig); } @@ -90,8 +92,10 @@ public class FlacExtractorTest { public void sampleWithPicture() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_with_picture.flac", - new AssertionConfig.Builder().setDumpFilesPrefix("flac/bear_with_picture_flac").build(), + "media/flac/bear_with_picture.flac", + new AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/flac/bear_with_picture_flac") + .build(), simulationConfig); } @@ -99,9 +103,9 @@ public class FlacExtractorTest { public void oneMetadataBlock() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_one_metadata_block.flac", + "media/flac/bear_one_metadata_block.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_one_metadata_block_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_one_metadata_block_flac") .build(), simulationConfig); } @@ -110,9 +114,9 @@ public class FlacExtractorTest { public void noMinMaxFrameSize() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_no_min_max_frame_size.flac", + "media/flac/bear_no_min_max_frame_size.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_no_min_max_frame_size_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_no_min_max_frame_size_flac") .build(), simulationConfig); } @@ -121,8 +125,10 @@ public class FlacExtractorTest { public void noNumSamples() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_no_num_samples.flac", - new AssertionConfig.Builder().setDumpFilesPrefix("flac/bear_no_num_samples_flac").build(), + "media/flac/bear_no_num_samples.flac", + new AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/flac/bear_no_num_samples_flac") + .build(), simulationConfig); } @@ -130,9 +136,9 @@ public class FlacExtractorTest { public void uncommonSampleRate() throws Exception { ExtractorAsserts.assertBehavior( FlacExtractor::new, - "flac/bear_uncommon_sample_rate.flac", + "media/flac/bear_uncommon_sample_rate.flac", new AssertionConfig.Builder() - .setDumpFilesPrefix("flac/bear_uncommon_sample_rate_flac") + .setDumpFilesPrefix("extractordumps/flac/bear_uncommon_sample_rate_flac") .build(), simulationConfig); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java index 8460a2b52a..06678ae912 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java @@ -36,6 +36,6 @@ public final class FlvExtractorTest { @Test public void sample() throws Exception { - ExtractorAsserts.assertBehavior(FlvExtractor::new, "flv/sample.flv", simulationConfig); + ExtractorAsserts.assertBehavior(FlvExtractor::new, "media/flv/sample.flv", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java index 592ecedf5a..8e22aace8a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java @@ -36,36 +36,39 @@ public final class MatroskaExtractorTest { @Test public void mkvSample() throws Exception { - ExtractorAsserts.assertBehavior(MatroskaExtractor::new, "mkv/sample.mkv", simulationConfig); + ExtractorAsserts.assertBehavior( + MatroskaExtractor::new, "media/mkv/sample.mkv", simulationConfig); } @Test public void mkvSample_withSubripSubtitles() throws Exception { ExtractorAsserts.assertBehavior( - MatroskaExtractor::new, "mkv/sample_with_srt.mkv", simulationConfig); + MatroskaExtractor::new, "media/mkv/sample_with_srt.mkv", simulationConfig); } @Test public void mkvSample_withHtcRotationInfoInTrackName() throws Exception { ExtractorAsserts.assertBehavior( - MatroskaExtractor::new, "mkv/sample_with_htc_rotation_track_name.mkv", simulationConfig); + MatroskaExtractor::new, + "media/mkv/sample_with_htc_rotation_track_name.mkv", + simulationConfig); } @Test public void mkvFullBlocksSample() throws Exception { ExtractorAsserts.assertBehavior( - MatroskaExtractor::new, "mkv/full_blocks.mkv", simulationConfig); + MatroskaExtractor::new, "media/mkv/full_blocks.mkv", simulationConfig); } @Test public void webmSubsampleEncryption() throws Exception { ExtractorAsserts.assertBehavior( - MatroskaExtractor::new, "mkv/subsample_encrypted_noaltref.webm", simulationConfig); + MatroskaExtractor::new, "media/mkv/subsample_encrypted_noaltref.webm", simulationConfig); } @Test public void webmSubsampleEncryptionWithAltrefFrames() throws Exception { ExtractorAsserts.assertBehavior( - MatroskaExtractor::new, "mkv/subsample_encrypted_altref.webm", simulationConfig); + MatroskaExtractor::new, "media/mkv/subsample_encrypted_altref.webm", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java index 8ff5e84d69..b0250803f0 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java @@ -39,9 +39,9 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class ConstantBitrateSeekerTest { private static final String CONSTANT_FRAME_SIZE_TEST_FILE = - "mp3/bear-cbr-constant-frame-size-no-seek-table.mp3"; + "media/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3"; private static final String VARIABLE_FRAME_SIZE_TEST_FILE = - "mp3/bear-cbr-variable-frame-size-no-seek-table.mp3"; + "media/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3"; private Mp3Extractor extractor; private FakeExtractorOutput extractorOutput; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java index 0e5c263644..72f42fb601 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java @@ -40,7 +40,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class IndexSeekerTest { - private static final String TEST_FILE_NO_SEEK_TABLE = "mp3/bear-vbr-no-seek-table.mp3"; + private static final String TEST_FILE_NO_SEEK_TABLE = "media/mp3/bear-vbr-no-seek-table.mp3"; private static final int TEST_FILE_NO_SEEK_TABLE_DURATION = 2_808_000; private Mp3Extractor extractor; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java index e3c9b55ddf..f59e3e77a8 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java @@ -38,34 +38,39 @@ public final class Mp3ExtractorTest { @Test public void mp3SampleWithXingHeader() throws Exception { ExtractorAsserts.assertBehavior( - Mp3Extractor::new, "mp3/bear-vbr-xing-header.mp3", simulationConfig); + Mp3Extractor::new, "media/mp3/bear-vbr-xing-header.mp3", simulationConfig); } @Test public void mp3SampleWithCbrSeeker() throws Exception { ExtractorAsserts.assertBehavior( - Mp3Extractor::new, "mp3/bear-cbr-variable-frame-size-no-seek-table.mp3", simulationConfig); + Mp3Extractor::new, + "media/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3", + simulationConfig); } @Test public void mp3SampleWithIndexSeeker() throws Exception { ExtractorAsserts.assertBehavior( () -> new Mp3Extractor(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING), - "mp3/bear-vbr-no-seek-table.mp3", + "media/mp3/bear-vbr-no-seek-table.mp3", simulationConfig); } @Test public void trimmedMp3Sample() throws Exception { - ExtractorAsserts.assertBehavior(Mp3Extractor::new, "mp3/play-trimmed.mp3", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp3Extractor::new, "media/mp3/play-trimmed.mp3", simulationConfig); } @Test public void mp3SampleWithId3Enabled() throws Exception { ExtractorAsserts.assertBehavior( Mp3Extractor::new, - "mp3/bear-id3.mp3", - new AssertionConfig.Builder().setDumpFilesPrefix("mp3/bear-id3-enabled").build(), + "media/mp3/bear-id3.mp3", + new AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/mp3/bear-id3-enabled") + .build(), simulationConfig); } @@ -73,8 +78,10 @@ public final class Mp3ExtractorTest { public void mp3SampleWithId3Disabled() throws Exception { ExtractorAsserts.assertBehavior( () -> new Mp3Extractor(Mp3Extractor.FLAG_DISABLE_ID3_METADATA), - "mp3/bear-id3.mp3", - new AssertionConfig.Builder().setDumpFilesPrefix("mp3/bear-id3-disabled").build(), + "media/mp3/bear-id3.mp3", + new AssertionConfig.Builder() + .setDumpFilesPrefix("extractordumps/mp3/bear-id3-disabled") + .build(), simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java index decd55f985..e8ab027e9b 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java @@ -42,14 +42,16 @@ public final class FragmentedMp4ExtractorTest { @Test public void sample() throws Exception { ExtractorAsserts.assertBehavior( - getExtractorFactory(ImmutableList.of()), "mp4/sample_fragmented.mp4", simulationConfig); + getExtractorFactory(ImmutableList.of()), + "media/mp4/sample_fragmented.mp4", + simulationConfig); } @Test public void sampleSeekable() throws Exception { ExtractorAsserts.assertBehavior( getExtractorFactory(ImmutableList.of()), - "mp4/sample_fragmented_seekable.mp4", + "media/mp4/sample_fragmented_seekable.mp4", simulationConfig); } @@ -61,32 +63,38 @@ public final class FragmentedMp4ExtractorTest { Collections.singletonList( new Format.Builder().setSampleMimeType(MimeTypes.APPLICATION_CEA608).build())); ExtractorAsserts.assertBehavior( - extractorFactory, "mp4/sample_fragmented_sei.mp4", simulationConfig); + extractorFactory, "media/mp4/sample_fragmented_sei.mp4", simulationConfig); } @Test public void sampleWithAc3Track() throws Exception { ExtractorAsserts.assertBehavior( - getExtractorFactory(ImmutableList.of()), "mp4/sample_ac3_fragmented.mp4", simulationConfig); + getExtractorFactory(ImmutableList.of()), + "media/mp4/sample_ac3_fragmented.mp4", + simulationConfig); } @Test public void sampleWithAc4Track() throws Exception { ExtractorAsserts.assertBehavior( - getExtractorFactory(ImmutableList.of()), "mp4/sample_ac4_fragmented.mp4", simulationConfig); + getExtractorFactory(ImmutableList.of()), + "media/mp4/sample_ac4_fragmented.mp4", + simulationConfig); } @Test public void sampleWithProtectedAc4Track() throws Exception { ExtractorAsserts.assertBehavior( - getExtractorFactory(ImmutableList.of()), "mp4/sample_ac4_protected.mp4", simulationConfig); + getExtractorFactory(ImmutableList.of()), + "media/mp4/sample_ac4_protected.mp4", + simulationConfig); } @Test public void sampleWithEac3Track() throws Exception { ExtractorAsserts.assertBehavior( getExtractorFactory(ImmutableList.of()), - "mp4/sample_eac3_fragmented.mp4", + "media/mp4/sample_eac3_fragmented.mp4", simulationConfig); } @@ -94,7 +102,7 @@ public final class FragmentedMp4ExtractorTest { public void sampleWithEac3jocTrack() throws Exception { ExtractorAsserts.assertBehavior( getExtractorFactory(ImmutableList.of()), - "mp4/sample_eac3joc_fragmented.mp4", + "media/mp4/sample_eac3joc_fragmented.mp4", simulationConfig); } @@ -102,7 +110,7 @@ public final class FragmentedMp4ExtractorTest { public void sampleWithOpusTrack() throws Exception { ExtractorAsserts.assertBehavior( getExtractorFactory(ImmutableList.of()), - "mp4/sample_opus_fragmented.mp4", + "media/mp4/sample_opus_fragmented.mp4", simulationConfig); } @@ -110,7 +118,7 @@ public final class FragmentedMp4ExtractorTest { public void samplePartiallyFragmented() throws Exception { ExtractorAsserts.assertBehavior( getExtractorFactory(ImmutableList.of()), - "mp4/sample_partially_fragmented.mp4", + "media/mp4/sample_partially_fragmented.mp4", simulationConfig); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java index bceb813ff9..c2e2367307 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java @@ -36,13 +36,13 @@ public final class Mp4ExtractorTest { @Test public void mp4Sample() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample.mp4", simulationConfig); + ExtractorAsserts.assertBehavior(Mp4Extractor::new, "media/mp4/sample.mp4", simulationConfig); } @Test public void mp4SampleWithSlowMotionMetadata() throws Exception { ExtractorAsserts.assertBehavior( - Mp4Extractor::new, "mp4/sample_android_slow_motion.mp4", simulationConfig); + Mp4Extractor::new, "media/mp4/sample_android_slow_motion.mp4", simulationConfig); } /** @@ -52,31 +52,36 @@ public final class Mp4ExtractorTest { @Test public void mp4SampleWithMdatTooLong() throws Exception { ExtractorAsserts.assertBehavior( - Mp4Extractor::new, "mp4/sample_mdat_too_long.mp4", simulationConfig); + Mp4Extractor::new, "media/mp4/sample_mdat_too_long.mp4", simulationConfig); } @Test public void mp4SampleWithAc3Track() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_ac3.mp4", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp4Extractor::new, "media/mp4/sample_ac3.mp4", simulationConfig); } @Test public void mp4SampleWithAc4Track() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_ac4.mp4", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp4Extractor::new, "media/mp4/sample_ac4.mp4", simulationConfig); } @Test public void mp4SampleWithEac3Track() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_eac3.mp4", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp4Extractor::new, "media/mp4/sample_eac3.mp4", simulationConfig); } @Test public void mp4SampleWithEac3jocTrack() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_eac3joc.mp4", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp4Extractor::new, "media/mp4/sample_eac3joc.mp4", simulationConfig); } @Test public void mp4SampleWithOpusTrack() throws Exception { - ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_opus.mp4", simulationConfig); + ExtractorAsserts.assertBehavior( + Mp4Extractor::new, "media/mp4/sample_opus.mp4", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java index 57b9525d10..e30f27713e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java @@ -56,7 +56,7 @@ public final class DefaultOggSeekerTest { @Test public void seeking() throws Exception { byte[] data = - getByteArray(ApplicationProvider.getApplicationContext(), "ogg/random_1000_pages"); + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/random_1000_pages"); int granuleCount = 49269395; int firstPayloadPageSize = 2023; int firstPayloadPageGranuleCount = 57058; @@ -123,7 +123,8 @@ public final class DefaultOggSeekerTest { @Test public void readGranuleOfLastPage() throws IOException { // This test stream has three headers with granule numbers 20000, 40000 and 60000. - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/three_headers"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/three_headers"); FakeExtractorInput input = createInput(data, /* simulateUnknownLength= */ false); assertReadGranuleOfLastPage(input, 60000); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java index bf2a350aae..f25f97eaa2 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java @@ -36,38 +36,42 @@ public final class OggExtractorNonParameterizedTest { @Test public void sniffVorbis() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/vorbis_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/vorbis_header"); assertSniff(data, /* expectedResult= */ true); } @Test public void sniffFlac() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/flac_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/flac_header"); assertSniff(data, /* expectedResult= */ true); } @Test public void sniffFailsOpusFile() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/opus_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/opus_header"); assertSniff(data, /* expectedResult= */ false); } @Test public void sniffFailsInvalidOggHeader() throws Exception { byte[] data = - getByteArray(ApplicationProvider.getApplicationContext(), "ogg/invalid_ogg_header"); + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/invalid_ogg_header"); assertSniff(data, /* expectedResult= */ false); } @Test public void sniffInvalidHeader() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/invalid_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/invalid_header"); assertSniff(data, /* expectedResult= */ false); } @Test public void sniffFailsEOF() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/eof_header"); + byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/eof_header"); assertSniff(data, /* expectedResult= */ false); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java index 8c5a0def07..cc78d59bf4 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java @@ -40,29 +40,31 @@ public final class OggExtractorParameterizedTest { @Test public void opus() throws Exception { - ExtractorAsserts.assertBehavior(OggExtractor::new, "ogg/bear.opus", simulationConfig); + ExtractorAsserts.assertBehavior(OggExtractor::new, "media/ogg/bear.opus", simulationConfig); } @Test public void flac() throws Exception { - ExtractorAsserts.assertBehavior(OggExtractor::new, "ogg/bear_flac.ogg", simulationConfig); + ExtractorAsserts.assertBehavior(OggExtractor::new, "media/ogg/bear_flac.ogg", simulationConfig); } @Test public void flacNoSeektable() throws Exception { ExtractorAsserts.assertBehavior( - OggExtractor::new, "ogg/bear_flac_noseektable.ogg", simulationConfig); + OggExtractor::new, "media/ogg/bear_flac_noseektable.ogg", simulationConfig); } @Test public void vorbis() throws Exception { - ExtractorAsserts.assertBehavior(OggExtractor::new, "ogg/bear_vorbis.ogg", simulationConfig); + ExtractorAsserts.assertBehavior( + OggExtractor::new, "media/ogg/bear_vorbis.ogg", simulationConfig); } // Ensure the extractor can handle non-contiguous pages by using a file with 10 bytes of garbage // data before the start of the second page. @Test public void vorbisWithGapBeforeSecondPage() throws Exception { - ExtractorAsserts.assertBehavior(OggExtractor::new, "ogg/bear_vorbis_gap.ogg", simulationConfig); + ExtractorAsserts.assertBehavior( + OggExtractor::new, "media/ogg/bear_vorbis_gap.ogg", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java index b534ce696a..e74ecf7be0 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class OggPacketTest { - private static final String TEST_FILE = "ogg/bear.opus"; + private static final String TEST_FILE = "media/ogg/bear.opus"; private final Random random = new Random(/* seed= */ 0); private final OggPacket oggPacket = new OggPacket(); @@ -47,7 +47,8 @@ public final class OggPacketTest { FakeExtractorInput input = createInput( getByteArray( - ApplicationProvider.getApplicationContext(), "ogg/four_packets_with_empty_page")); + ApplicationProvider.getApplicationContext(), + "media/ogg/four_packets_with_empty_page")); assertReadPacket(input, firstPacket); assertThat((oggPacket.getPageHeader().type & 0x02) == 0x02).isTrue(); @@ -95,7 +96,7 @@ public final class OggPacketTest { createInput( getByteArray( ApplicationProvider.getApplicationContext(), - "ogg/packet_with_zero_size_terminator")); + "media/ogg/packet_with_zero_size_terminator")); assertReadPacket(input, firstPacket); assertReadPacket(input, secondPacket); @@ -109,7 +110,7 @@ public final class OggPacketTest { createInput( getByteArray( ApplicationProvider.getApplicationContext(), - "ogg/continued_packet_over_two_pages")); + "media/ogg/continued_packet_over_two_pages")); assertReadPacket(input, firstPacket); assertThat((oggPacket.getPageHeader().type & 0x04) == 0x04).isTrue(); @@ -126,7 +127,7 @@ public final class OggPacketTest { createInput( getByteArray( ApplicationProvider.getApplicationContext(), - "ogg/continued_packet_over_four_pages")); + "media/ogg/continued_packet_over_four_pages")); assertReadPacket(input, firstPacket); assertThat((oggPacket.getPageHeader().type & 0x04) == 0x04).isTrue(); @@ -142,7 +143,8 @@ public final class OggPacketTest { FakeExtractorInput input = createInput( getByteArray( - ApplicationProvider.getApplicationContext(), "ogg/continued_packet_at_start")); + ApplicationProvider.getApplicationContext(), + "media/ogg/continued_packet_at_start")); // Expect the first partial packet to be discarded. assertReadPacket(input, Arrays.copyOfRange(pageBody, 256, 256 + 8)); @@ -158,7 +160,7 @@ public final class OggPacketTest { createInput( getByteArray( ApplicationProvider.getApplicationContext(), - "ogg/zero_sized_packets_at_end_of_stream")); + "media/ogg/zero_sized_packets_at_end_of_stream")); assertReadPacket(input, firstPacket); assertReadPacket(input, secondPacket); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java index 6dde47bed3..c952c0b220 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java @@ -88,7 +88,8 @@ public final class OggPageHeaderTest { @Test public void populatePageHeader_success() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/page_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/page_header"); FakeExtractorInput input = createInput(data, /* simulateUnknownLength= */ true); OggPageHeader header = new OggPageHeader(); @@ -121,7 +122,8 @@ public final class OggPageHeaderTest { @Test public void populatePageHeader_withNotOgg_returnFalseWithoutException() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/page_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/page_header"); // change from 'O' to 'o' data[0] = 'o'; FakeExtractorInput input = createInput(data, /* simulateUnknownLength= */ false); @@ -134,7 +136,8 @@ public final class OggPageHeaderTest { @Test public void populatePageHeader_withWrongRevision_returnFalseWithoutException() throws Exception { - byte[] data = getByteArray(ApplicationProvider.getApplicationContext(), "ogg/page_header"); + byte[] data = + getByteArray(ApplicationProvider.getApplicationContext(), "media/ogg/page_header"); // change revision from 0 to 1 data[4] = 0x01; FakeExtractorInput input = createInput(data, /* simulateUnknownLength= */ false); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java index 03f2334e87..7db02d4789 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java @@ -61,7 +61,7 @@ public final class VorbisReaderTest { // identification, comment and setup header. byte[] data = TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "binary/ogg/vorbis_header_pages"); + ApplicationProvider.getApplicationContext(), "media/binary/ogg/vorbis_header_pages"); ExtractorInput input = new FakeExtractorInput.Builder().setData(data).setSimulateIOErrors(true) .setSimulateUnknownLength(true).setSimulatePartialReads(true).build(); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java index 92e0f21451..173a404961 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java @@ -44,6 +44,6 @@ public final class RawCcExtractorTest { .setAccessibilityChannel(1) .build(); ExtractorAsserts.assertBehavior( - () -> new RawCcExtractor(format), "rawcc/sample.rawcc", simulationConfig); + () -> new RawCcExtractor(format), "media/rawcc/sample.rawcc", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java index 59ca03e300..4c8ddfb153 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java @@ -36,16 +36,17 @@ public final class Ac3ExtractorTest { @Test public void ac3Sample() throws Exception { - ExtractorAsserts.assertBehavior(Ac3Extractor::new, "ts/sample.ac3", simulationConfig); + ExtractorAsserts.assertBehavior(Ac3Extractor::new, "media/ts/sample.ac3", simulationConfig); } @Test public void eAc3Sample() throws Exception { - ExtractorAsserts.assertBehavior(Ac3Extractor::new, "ts/sample.eac3", simulationConfig); + ExtractorAsserts.assertBehavior(Ac3Extractor::new, "media/ts/sample.eac3", simulationConfig); } @Test public void eAc3jocSample() throws Exception { - ExtractorAsserts.assertBehavior(Ac3Extractor::new, "ts/sample_eac3joc.ec3", simulationConfig); + ExtractorAsserts.assertBehavior( + Ac3Extractor::new, "media/ts/sample_eac3joc.ec3", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java index 974f20b8f4..23b066088a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java @@ -36,6 +36,6 @@ public final class Ac4ExtractorTest { @Test public void ac4Sample() throws Exception { - ExtractorAsserts.assertBehavior(Ac4Extractor::new, "ts/sample.ac4", simulationConfig); + ExtractorAsserts.assertBehavior(Ac4Extractor::new, "media/ts/sample.ac4", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java index 5226aa71e9..07bf5dea1f 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java @@ -39,7 +39,7 @@ public final class AdtsExtractorSeekTest { private static final Random random = new Random(1234L); - private static final String TEST_FILE = "ts/sample.adts"; + private static final String TEST_FILE = "media/ts/sample.adts"; private static final int FILE_DURATION_US = 3_356_772; private static final long DELTA_TIMESTAMP_THRESHOLD_US = 200_000; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java index 6b0663f3b5..e8bc727222 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java @@ -36,20 +36,20 @@ public final class AdtsExtractorTest { @Test public void sample() throws Exception { - ExtractorAsserts.assertBehavior(AdtsExtractor::new, "ts/sample.adts", simulationConfig); + ExtractorAsserts.assertBehavior(AdtsExtractor::new, "media/ts/sample.adts", simulationConfig); } @Test public void sample_with_id3() throws Exception { ExtractorAsserts.assertBehavior( - AdtsExtractor::new, "ts/sample_with_id3.adts", simulationConfig); + AdtsExtractor::new, "media/ts/sample_with_id3.adts", simulationConfig); } @Test public void sample_withSeeking() throws Exception { ExtractorAsserts.assertBehavior( () -> new AdtsExtractor(/* flags= */ AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING), - "ts/sample_cbs.adts", + "media/ts/sample_cbs.adts", simulationConfig); } @@ -58,7 +58,7 @@ public final class AdtsExtractorTest { public void sample_withSeekingAndTruncatedFile() throws Exception { ExtractorAsserts.assertBehavior( () -> new AdtsExtractor(/* flags= */ AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING), - "ts/sample_cbs_truncated.adts", + "media/ts/sample_cbs_truncated.adts", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java index 728a164b11..8c1805c568 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java @@ -52,7 +52,8 @@ public final class PsDurationReaderTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/sample_h262_mpeg_audio.ps")) + ApplicationProvider.getApplicationContext(), + "media/ts/sample_h262_mpeg_audio.ps")) .build(); int result = Extractor.RESULT_CONTINUE; @@ -72,7 +73,8 @@ public final class PsDurationReaderTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/sample_h262_mpeg_audio.ps")) + ApplicationProvider.getApplicationContext(), + "media/ts/sample_h262_mpeg_audio.ps")) .build(); input.setPosition(1234); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java index b5eb3a5e88..7dc787f842 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java @@ -46,7 +46,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class PsExtractorSeekTest { - private static final String PS_FILE_PATH = "ts/elephants_dream.mpg"; + private static final String PS_FILE_PATH = "media/ts/elephants_dream.mpg"; private static final int DURATION_US = 30436333; private static final int VIDEO_TRACK_ID = 224; private static final long DELTA_TIMESTAMP_THRESHOLD_US = 500_000L; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java index e5c81549c9..a7bd75a56c 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java @@ -37,11 +37,11 @@ public final class PsExtractorTest { @Test public void sampleWithH262AndMpegAudio() throws Exception { ExtractorAsserts.assertBehavior( - PsExtractor::new, "ts/sample_h262_mpeg_audio.ps", simulationConfig); + PsExtractor::new, "media/ts/sample_h262_mpeg_audio.ps", simulationConfig); } @Test public void sampleWithAc3() throws Exception { - ExtractorAsserts.assertBehavior(PsExtractor::new, "ts/sample_ac3.ps", simulationConfig); + ExtractorAsserts.assertBehavior(PsExtractor::new, "media/ts/sample_ac3.ps", simulationConfig); } } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java index 7a1a49d712..8f744e855d 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java @@ -52,7 +52,7 @@ public final class TsDurationReaderTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts")) + ApplicationProvider.getApplicationContext(), "media/ts/bbb_2500ms.ts")) .setSimulateIOErrors(false) .setSimulateUnknownLength(false) .setSimulatePartialReads(false) @@ -76,7 +76,7 @@ public final class TsDurationReaderTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts")) + ApplicationProvider.getApplicationContext(), "media/ts/bbb_2500ms.ts")) .setSimulateIOErrors(false) .setSimulateUnknownLength(false) .setSimulatePartialReads(false) diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java index 42e0acecd4..4e710ec632 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java @@ -41,7 +41,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class TsExtractorSeekTest { - private static final String TEST_FILE = "ts/bbb_2500ms.ts"; + private static final String TEST_FILE = "media/ts/bbb_2500ms.ts"; private static final int DURATION_US = 2_500_000; private static final int AUDIO_TRACK_ID = 257; private static final long MAXIMUM_TIMESTAMP_DELTA_US = 500_000L; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java index 4b198f23ed..c2fe39285f 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java @@ -57,25 +57,25 @@ public final class TsExtractorTest { @Test public void sampleWithH262AndMpegAudio() throws Exception { ExtractorAsserts.assertBehavior( - TsExtractor::new, "ts/sample_h262_mpeg_audio.ts", simulationConfig); + TsExtractor::new, "media/ts/sample_h262_mpeg_audio.ts", simulationConfig); } @Test public void sampleWithH263() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_h263.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_h263.ts", simulationConfig); } @Test public void sampleWithH264AndMpegAudio() throws Exception { ExtractorAsserts.assertBehavior( - TsExtractor::new, "ts/sample_h264_mpeg_audio.ts", simulationConfig); + TsExtractor::new, "media/ts/sample_h264_mpeg_audio.ts", simulationConfig); } @Test public void sampleWithH264NoAccessUnitDelimiters() throws Exception { ExtractorAsserts.assertBehavior( () -> new TsExtractor(FLAG_DETECT_ACCESS_UNITS), - "ts/sample_h264_no_access_unit_delimiters.ts", + "media/ts/sample_h264_no_access_unit_delimiters.ts", simulationConfig); } @@ -83,20 +83,20 @@ public final class TsExtractorTest { public void sampleWithH264AndDtsAudio() throws Exception { ExtractorAsserts.assertBehavior( () -> new TsExtractor(DefaultTsPayloadReaderFactory.FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS), - "ts/sample_h264_dts_audio.ts", + "media/ts/sample_h264_dts_audio.ts", simulationConfig); } @Test public void sampleWithH265() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_h265.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_h265.ts", simulationConfig); } @Test public void sampleWithScte35() throws Exception { ExtractorAsserts.assertBehavior( TsExtractor::new, - "ts/sample_scte35.ts", + "media/ts/sample_scte35.ts", new ExtractorAsserts.AssertionConfig.Builder() .setDeduplicateConsecutiveFormats(true) .build(), @@ -107,7 +107,7 @@ public final class TsExtractorTest { public void sampleWithAit() throws Exception { ExtractorAsserts.assertBehavior( TsExtractor::new, - "ts/sample_ait.ts", + "media/ts/sample_ait.ts", new ExtractorAsserts.AssertionConfig.Builder() .setDeduplicateConsecutiveFormats(true) .build(), @@ -116,32 +116,34 @@ public final class TsExtractorTest { @Test public void sampleWithAc3() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_ac3.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_ac3.ts", simulationConfig); } @Test public void sampleWithAc4() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_ac4.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_ac4.ts", simulationConfig); } @Test public void sampleWithEac3() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_eac3.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_eac3.ts", simulationConfig); } @Test public void sampleWithEac3joc() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_eac3joc.ts", simulationConfig); + ExtractorAsserts.assertBehavior( + TsExtractor::new, "media/ts/sample_eac3joc.ts", simulationConfig); } @Test public void sampleWithLatm() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_latm.ts", simulationConfig); + ExtractorAsserts.assertBehavior(TsExtractor::new, "media/ts/sample_latm.ts", simulationConfig); } @Test public void streamWithJunkData() throws Exception { - ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample_with_junk", simulationConfig); + ExtractorAsserts.assertBehavior( + TsExtractor::new, "media/ts/sample_with_junk", simulationConfig); } @Test @@ -153,7 +155,8 @@ public final class TsExtractorTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/sample_h262_mpeg_audio.ts")) + ApplicationProvider.getApplicationContext(), + "media/ts/sample_h262_mpeg_audio.ts")) .setSimulateIOErrors(false) .setSimulateUnknownLength(false) .setSimulatePartialReads(false) @@ -190,7 +193,7 @@ public final class TsExtractorTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/sample_with_sdt.ts")) + ApplicationProvider.getApplicationContext(), "media/ts/sample_with_sdt.ts")) .setSimulateIOErrors(false) .setSimulateUnknownLength(false) .setSimulatePartialReads(false) diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java index 07586e3af8..b411e7517a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java @@ -36,21 +36,21 @@ public final class WavExtractorTest { @Test public void sample() throws Exception { - ExtractorAsserts.assertBehavior(WavExtractor::new, "wav/sample.wav", simulationConfig); + ExtractorAsserts.assertBehavior(WavExtractor::new, "media/wav/sample.wav", simulationConfig); } @Test public void sample_withTrailingBytes_extractsSameData() throws Exception { ExtractorAsserts.assertBehavior( WavExtractor::new, - "wav/sample_with_trailing_bytes.wav", - new AssertionConfig.Builder().setDumpFilesPrefix("wav/sample.wav").build(), + "media/wav/sample_with_trailing_bytes.wav", + new AssertionConfig.Builder().setDumpFilesPrefix("extractordumps/wav/sample.wav").build(), simulationConfig); } @Test public void sample_imaAdpcm() throws Exception { ExtractorAsserts.assertBehavior( - WavExtractor::new, "wav/sample_ima_adpcm.wav", simulationConfig); + WavExtractor::new, "media/wav/sample_ima_adpcm.wav", simulationConfig); } } diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java index b4b2e9edce..d51a800b88 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java @@ -63,7 +63,7 @@ public class DefaultHlsExtractorFactoryTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "webvtt/typical")) + ApplicationProvider.getApplicationContext(), "media/webvtt/typical")) .build(); BundledHlsMediaChunkExtractor result = @@ -86,7 +86,8 @@ public class DefaultHlsExtractorFactoryTest { ExtractorInput ac3ExtractorInput = new FakeExtractorInput.Builder() .setData( - TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ac3")) + TestUtil.getByteArray( + ApplicationProvider.getApplicationContext(), "media/ts/sample.ac3")) .build(); BundledHlsMediaChunkExtractor result = @@ -108,7 +109,7 @@ public class DefaultHlsExtractorFactoryTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "ts/sample_ac3.ts")) + ApplicationProvider.getApplicationContext(), "media/ts/sample_ac3.ts")) .build(); BundledHlsMediaChunkExtractor result = @@ -131,7 +132,7 @@ public class DefaultHlsExtractorFactoryTest { new FakeExtractorInput.Builder() .setData( TestUtil.getByteArray( - ApplicationProvider.getApplicationContext(), "mp3/bear-id3.mp3")) + ApplicationProvider.getApplicationContext(), "media/mp3/bear-id3.mp3")) .build(); BundledHlsMediaChunkExtractor result = diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java index 5da804a996..b9c3477456 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java @@ -79,7 +79,7 @@ public class WebvttExtractorTest { TestUtil.extractAllSamplesFromFile( extractor, ApplicationProvider.getApplicationContext(), - "webvtt/with_x-timestamp-map_header"); + "media/webvtt/with_x-timestamp-map_header"); // The output has a ~5s sampleTime and a large, negative subsampleOffset because the cue // timestamps are ~10 days ahead of the PTS (due to wrapping) so the offset is used to ensure @@ -87,7 +87,7 @@ public class WebvttExtractorTest { DumpFileAsserts.assertOutput( ApplicationProvider.getApplicationContext(), output, - "webvtt/with_x-timestamp-map_header.dump"); + "extractordumps/webvtt/with_x-timestamp-map_header.dump"); } private static boolean sniffData(byte[] data) throws IOException { diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java index 60d9c40dc3..e5a7ee5add 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class SsManifestParserTest { - private static final String SAMPLE_ISMC_1 = "smooth-streaming/sample_ismc_1"; - private static final String SAMPLE_ISMC_2 = "smooth-streaming/sample_ismc_2"; + private static final String SAMPLE_ISMC_1 = "media/smooth-streaming/sample_ismc_1"; + private static final String SAMPLE_ISMC_2 = "media/smooth-streaming/sample_ismc_2"; /** Simple test to ensure the sample manifests parse without any exceptions being thrown. */ @Test diff --git a/testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump b/testdata/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump similarity index 100% rename from testdata/src/test/assets/mka/bear-flac-16bit.mka.audiosink.dump rename to testdata/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump diff --git a/testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump b/testdata/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump similarity index 100% rename from testdata/src/test/assets/mka/bear-flac-24bit.mka.audiosink.dump rename to testdata/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump diff --git a/testdata/src/test/assets/amr/sample_nb.amr.0.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb.amr.0.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb.amr.0.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb.amr.0.dump diff --git a/testdata/src/test/assets/amr/sample_nb.amr.unknown_length.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb.amr.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb.amr.unknown_length.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb.amr.unknown_length.dump diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.0.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr.0.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.0.dump diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.1.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr.1.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.1.dump diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.2.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr.2.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.2.dump diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.3.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr.3.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.3.dump diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr.unknown_length.dump b/testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr.unknown_length.dump rename to testdata/src/test/assets/extractordumps/amr/sample_nb_cbr.amr.unknown_length.dump diff --git a/testdata/src/test/assets/amr/sample_wb.amr.0.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb.amr.0.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb.amr.0.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb.amr.0.dump diff --git a/testdata/src/test/assets/amr/sample_wb.amr.unknown_length.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb.amr.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb.amr.unknown_length.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb.amr.unknown_length.dump diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.0.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr.0.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.0.dump diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.1.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr.1.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.1.dump diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.2.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr.2.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.2.dump diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.3.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr.3.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.3.dump diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr.unknown_length.dump b/testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr.unknown_length.dump rename to testdata/src/test/assets/extractordumps/amr/sample_wb_cbr.amr.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_num_samples_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_num_samples_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_num_samples_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_num_samples_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_disabled_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3_enabled_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_id3_enabled_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_picture_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_flac.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.0.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.0.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.0.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.1.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.1.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.1.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.2.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.2.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.2.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.3.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.3.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.3.dump diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump b/testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments_raw.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_raw.unknown_length.dump diff --git a/testdata/src/test/assets/flv/sample.flv.0.dump b/testdata/src/test/assets/extractordumps/flv/sample.flv.0.dump similarity index 100% rename from testdata/src/test/assets/flv/sample.flv.0.dump rename to testdata/src/test/assets/extractordumps/flv/sample.flv.0.dump diff --git a/testdata/src/test/assets/flv/sample.flv.unknown_length.dump b/testdata/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/flv/sample.flv.unknown_length.dump rename to testdata/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv.0.dump b/testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv.0.dump rename to testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv.1.dump b/testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv.1.dump rename to testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv.2.dump b/testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv.2.dump rename to testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv.3.dump b/testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv.3.dump rename to testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/sample.mkv.0.dump b/testdata/src/test/assets/extractordumps/mkv/sample.mkv.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv.0.dump rename to testdata/src/test/assets/extractordumps/mkv/sample.mkv.0.dump diff --git a/testdata/src/test/assets/mkv/sample.mkv.1.dump b/testdata/src/test/assets/extractordumps/mkv/sample.mkv.1.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv.1.dump rename to testdata/src/test/assets/extractordumps/mkv/sample.mkv.1.dump diff --git a/testdata/src/test/assets/mkv/sample.mkv.2.dump b/testdata/src/test/assets/extractordumps/mkv/sample.mkv.2.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv.2.dump rename to testdata/src/test/assets/extractordumps/mkv/sample.mkv.2.dump diff --git a/testdata/src/test/assets/mkv/sample.mkv.3.dump b/testdata/src/test/assets/extractordumps/mkv/sample.mkv.3.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv.3.dump rename to testdata/src/test/assets/extractordumps/mkv/sample.mkv.3.dump diff --git a/testdata/src/test/assets/mkv/sample.mkv.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.0.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.0.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.1.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.1.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.2.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.2.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.3.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.3.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv.0.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv.0.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv.1.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv.1.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv.2.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv.2.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv.3.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv.3.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump b/testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump rename to testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_altref.webm.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump b/testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump rename to testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump b/testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump b/testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump b/testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump b/testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump b/testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-disabled.0.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-disabled.0.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.0.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-disabled.1.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-disabled.1.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.1.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-disabled.2.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-disabled.2.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.2.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-disabled.3.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-disabled.3.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.3.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-disabled.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-disabled.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-disabled.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-enabled.0.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-enabled.0.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.0.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-enabled.1.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-enabled.1.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.1.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-enabled.2.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-enabled.2.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.2.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-enabled.3.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-enabled.3.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.3.dump diff --git a/testdata/src/test/assets/mp3/bear-id3-enabled.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3-enabled.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-id3-enabled.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.0.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.1.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.2.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.3.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.0.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.1.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.2.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.3.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3.0.dump b/testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3.0.dump rename to testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3.1.dump b/testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3.1.dump rename to testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump b/testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3.2.dump rename to testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3.3.dump b/testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3.3.dump rename to testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp3/play-trimmed.mp3.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_ac4_protected.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_eac3joc_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4.1.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.1.dump diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4.2.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.2.dump diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4.3.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.3.dump diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_opus_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_opus_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_opus_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/mp4/sample_partially_fragmented.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_partially_fragmented.mp4.0.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump diff --git a/testdata/src/test/assets/mp4/sample_partially_fragmented.mp4.unknown_length.dump b/testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/mp4/sample_partially_fragmented.mp4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump diff --git a/testdata/src/test/assets/ogg/bear.opus.0.dump b/testdata/src/test/assets/extractordumps/ogg/bear.opus.0.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus.0.dump rename to testdata/src/test/assets/extractordumps/ogg/bear.opus.0.dump diff --git a/testdata/src/test/assets/ogg/bear.opus.1.dump b/testdata/src/test/assets/extractordumps/ogg/bear.opus.1.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus.1.dump rename to testdata/src/test/assets/extractordumps/ogg/bear.opus.1.dump diff --git a/testdata/src/test/assets/ogg/bear.opus.2.dump b/testdata/src/test/assets/extractordumps/ogg/bear.opus.2.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus.2.dump rename to testdata/src/test/assets/extractordumps/ogg/bear.opus.2.dump diff --git a/testdata/src/test/assets/ogg/bear.opus.3.dump b/testdata/src/test/assets/extractordumps/ogg/bear.opus.3.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus.3.dump rename to testdata/src/test/assets/extractordumps/ogg/bear.opus.3.dump diff --git a/testdata/src/test/assets/ogg/bear.opus.unknown_length.dump b/testdata/src/test/assets/extractordumps/ogg/bear.opus.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ogg/bear.opus.unknown_length.dump diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg.0.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg.0.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg.1.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg.1.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg.2.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg.2.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg.3.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg.3.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg.unknown_length.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unknown_length.dump b/testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg.0.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg.1.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg.2.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg.3.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg.unknown_length.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.unknown_length.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.0.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.0.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.1.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.1.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.2.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.2.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.3.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.3.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.unknown_length.dump b/testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.unknown_length.dump diff --git a/testdata/src/test/assets/rawcc/sample.rawcc.0.dump b/testdata/src/test/assets/extractordumps/rawcc/sample.rawcc.0.dump similarity index 100% rename from testdata/src/test/assets/rawcc/sample.rawcc.0.dump rename to testdata/src/test/assets/extractordumps/rawcc/sample.rawcc.0.dump diff --git a/testdata/src/test/assets/rawcc/sample.rawcc.unknown_length.dump b/testdata/src/test/assets/extractordumps/rawcc/sample.rawcc.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/rawcc/sample.rawcc.unknown_length.dump rename to testdata/src/test/assets/extractordumps/rawcc/sample.rawcc.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample.ac3.0.dump b/testdata/src/test/assets/extractordumps/ts/sample.ac3.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ac3.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample.ac3.0.dump diff --git a/testdata/src/test/assets/ts/sample.ac3.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ac3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample.ac4.0.dump b/testdata/src/test/assets/extractordumps/ts/sample.ac4.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ac4.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample.ac4.0.dump diff --git a/testdata/src/test/assets/ts/sample.ac4.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ac4.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample.adts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample.adts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.adts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample.adts.0.dump diff --git a/testdata/src/test/assets/ts/sample.adts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.adts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample.eac3.0.dump b/testdata/src/test/assets/extractordumps/ts/sample.eac3.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.eac3.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample.eac3.0.dump diff --git a/testdata/src/test/assets/ts/sample.eac3.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.eac3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.1.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.2.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.3.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_ac3.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_ac4.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_ac4.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_ac4.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_ac4.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_ac4.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_ait.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ait.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_ait.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_ait.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_eac3.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_eac3.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_eac3.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_eac3.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_eac3.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ec3.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ec3.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ec3.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ec3.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h263.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h263.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h263.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h263.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h263.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_h265.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_h265.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_h265.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_h265.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_h265.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_latm.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_latm.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_latm.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_latm.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_latm.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_latm.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_latm.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_latm.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_latm.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_latm.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_latm.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_scte35.ts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump diff --git a/testdata/src/test/assets/ts/sample_scte35.ts.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump diff --git a/testdata/src/test/assets/ts/sample_scte35.ts.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump diff --git a/testdata/src/test/assets/ts/sample_scte35.ts.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump diff --git a/testdata/src/test/assets/ts/sample_scte35.ts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_with_id3.adts.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_id3.adts.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump diff --git a/testdata/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump diff --git a/testdata/src/test/assets/ts/sample_with_junk.0.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_junk.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk.0.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_junk.0.dump diff --git a/testdata/src/test/assets/ts/sample_with_junk.1.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_junk.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk.1.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_junk.1.dump diff --git a/testdata/src/test/assets/ts/sample_with_junk.2.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_junk.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk.2.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_junk.2.dump diff --git a/testdata/src/test/assets/ts/sample_with_junk.3.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_junk.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk.3.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_junk.3.dump diff --git a/testdata/src/test/assets/ts/sample_with_junk.unknown_length.dump b/testdata/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk.unknown_length.dump rename to testdata/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump diff --git a/testdata/src/test/assets/wav/sample.wav.0.dump b/testdata/src/test/assets/extractordumps/wav/sample.wav.0.dump similarity index 100% rename from testdata/src/test/assets/wav/sample.wav.0.dump rename to testdata/src/test/assets/extractordumps/wav/sample.wav.0.dump diff --git a/testdata/src/test/assets/wav/sample.wav.1.dump b/testdata/src/test/assets/extractordumps/wav/sample.wav.1.dump similarity index 100% rename from testdata/src/test/assets/wav/sample.wav.1.dump rename to testdata/src/test/assets/extractordumps/wav/sample.wav.1.dump diff --git a/testdata/src/test/assets/wav/sample.wav.2.dump b/testdata/src/test/assets/extractordumps/wav/sample.wav.2.dump similarity index 100% rename from testdata/src/test/assets/wav/sample.wav.2.dump rename to testdata/src/test/assets/extractordumps/wav/sample.wav.2.dump diff --git a/testdata/src/test/assets/wav/sample.wav.3.dump b/testdata/src/test/assets/extractordumps/wav/sample.wav.3.dump similarity index 100% rename from testdata/src/test/assets/wav/sample.wav.3.dump rename to testdata/src/test/assets/extractordumps/wav/sample.wav.3.dump diff --git a/testdata/src/test/assets/wav/sample.wav.unknown_length.dump b/testdata/src/test/assets/extractordumps/wav/sample.wav.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/wav/sample.wav.unknown_length.dump rename to testdata/src/test/assets/extractordumps/wav/sample.wav.unknown_length.dump diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump b/testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.0.dump similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav.0.dump rename to testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.0.dump diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump b/testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.1.dump similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav.1.dump rename to testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.1.dump diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump b/testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.2.dump similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav.2.dump rename to testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.2.dump diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump b/testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.3.dump similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav.3.dump rename to testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.3.dump diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump b/testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav.unknown_length.dump rename to testdata/src/test/assets/extractordumps/wav/sample_ima_adpcm.wav.unknown_length.dump diff --git a/testdata/src/test/assets/webvtt/with_x-timestamp-map_header.dump b/testdata/src/test/assets/extractordumps/webvtt/with_x-timestamp-map_header.dump similarity index 100% rename from testdata/src/test/assets/webvtt/with_x-timestamp-map_header.dump rename to testdata/src/test/assets/extractordumps/webvtt/with_x-timestamp-map_header.dump diff --git a/testdata/src/test/assets/ad-responses/midroll10s_midroll20s.xml b/testdata/src/test/assets/media/ad-responses/midroll10s_midroll20s.xml similarity index 100% rename from testdata/src/test/assets/ad-responses/midroll10s_midroll20s.xml rename to testdata/src/test/assets/media/ad-responses/midroll10s_midroll20s.xml diff --git a/testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml b/testdata/src/test/assets/media/ad-responses/midroll1s_midroll7s.xml similarity index 100% rename from testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml rename to testdata/src/test/assets/media/ad-responses/midroll1s_midroll7s.xml diff --git a/testdata/src/test/assets/ad-responses/preroll.xml b/testdata/src/test/assets/media/ad-responses/preroll.xml similarity index 100% rename from testdata/src/test/assets/ad-responses/preroll.xml rename to testdata/src/test/assets/media/ad-responses/preroll.xml diff --git a/testdata/src/test/assets/ad-responses/preroll_midroll6s_postroll.xml b/testdata/src/test/assets/media/ad-responses/preroll_midroll6s_postroll.xml similarity index 100% rename from testdata/src/test/assets/ad-responses/preroll_midroll6s_postroll.xml rename to testdata/src/test/assets/media/ad-responses/preroll_midroll6s_postroll.xml diff --git a/testdata/src/test/assets/amr/sample_nb.amr b/testdata/src/test/assets/media/amr/sample_nb.amr similarity index 100% rename from testdata/src/test/assets/amr/sample_nb.amr rename to testdata/src/test/assets/media/amr/sample_nb.amr diff --git a/testdata/src/test/assets/amr/sample_nb_cbr.amr b/testdata/src/test/assets/media/amr/sample_nb_cbr.amr similarity index 100% rename from testdata/src/test/assets/amr/sample_nb_cbr.amr rename to testdata/src/test/assets/media/amr/sample_nb_cbr.amr diff --git a/testdata/src/test/assets/amr/sample_wb.amr b/testdata/src/test/assets/media/amr/sample_wb.amr similarity index 100% rename from testdata/src/test/assets/amr/sample_wb.amr rename to testdata/src/test/assets/media/amr/sample_wb.amr diff --git a/testdata/src/test/assets/amr/sample_wb_cbr.amr b/testdata/src/test/assets/media/amr/sample_wb_cbr.amr similarity index 100% rename from testdata/src/test/assets/amr/sample_wb_cbr.amr rename to testdata/src/test/assets/media/amr/sample_wb_cbr.amr diff --git a/testdata/src/test/assets/binary/ogg/vorbis_header_pages b/testdata/src/test/assets/media/binary/ogg/vorbis_header_pages similarity index 100% rename from testdata/src/test/assets/binary/ogg/vorbis_header_pages rename to testdata/src/test/assets/media/binary/ogg/vorbis_header_pages diff --git a/testdata/src/test/assets/binary/vorbis/comment_header b/testdata/src/test/assets/media/binary/vorbis/comment_header similarity index 100% rename from testdata/src/test/assets/binary/vorbis/comment_header rename to testdata/src/test/assets/media/binary/vorbis/comment_header diff --git a/testdata/src/test/assets/binary/vorbis/id_header b/testdata/src/test/assets/media/binary/vorbis/id_header similarity index 100% rename from testdata/src/test/assets/binary/vorbis/id_header rename to testdata/src/test/assets/media/binary/vorbis/id_header diff --git a/testdata/src/test/assets/binary/vorbis/setup_header b/testdata/src/test/assets/media/binary/vorbis/setup_header similarity index 100% rename from testdata/src/test/assets/binary/vorbis/setup_header rename to testdata/src/test/assets/media/binary/vorbis/setup_header diff --git a/testdata/src/test/assets/bitmap/image_256_256.png b/testdata/src/test/assets/media/bitmap/image_256_256.png similarity index 100% rename from testdata/src/test/assets/bitmap/image_256_256.png rename to testdata/src/test/assets/media/bitmap/image_256_256.png diff --git a/testdata/src/test/assets/bitmap/image_80_60.bmp b/testdata/src/test/assets/media/bitmap/image_80_60.bmp similarity index 100% rename from testdata/src/test/assets/bitmap/image_80_60.bmp rename to testdata/src/test/assets/media/bitmap/image_80_60.bmp diff --git a/testdata/src/test/assets/download-actions/dash-download-v0 b/testdata/src/test/assets/media/download-actions/dash-download-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/dash-download-v0 rename to testdata/src/test/assets/media/download-actions/dash-download-v0 diff --git a/testdata/src/test/assets/download-actions/dash-remove-v0 b/testdata/src/test/assets/media/download-actions/dash-remove-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/dash-remove-v0 rename to testdata/src/test/assets/media/download-actions/dash-remove-v0 diff --git a/testdata/src/test/assets/download-actions/hls-download-v0 b/testdata/src/test/assets/media/download-actions/hls-download-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/hls-download-v0 rename to testdata/src/test/assets/media/download-actions/hls-download-v0 diff --git a/testdata/src/test/assets/download-actions/hls-download-v1 b/testdata/src/test/assets/media/download-actions/hls-download-v1 similarity index 100% rename from testdata/src/test/assets/download-actions/hls-download-v1 rename to testdata/src/test/assets/media/download-actions/hls-download-v1 diff --git a/testdata/src/test/assets/download-actions/hls-remove-v0 b/testdata/src/test/assets/media/download-actions/hls-remove-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/hls-remove-v0 rename to testdata/src/test/assets/media/download-actions/hls-remove-v0 diff --git a/testdata/src/test/assets/download-actions/hls-remove-v1 b/testdata/src/test/assets/media/download-actions/hls-remove-v1 similarity index 100% rename from testdata/src/test/assets/download-actions/hls-remove-v1 rename to testdata/src/test/assets/media/download-actions/hls-remove-v1 diff --git a/testdata/src/test/assets/download-actions/progressive-download-v0 b/testdata/src/test/assets/media/download-actions/progressive-download-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/progressive-download-v0 rename to testdata/src/test/assets/media/download-actions/progressive-download-v0 diff --git a/testdata/src/test/assets/download-actions/progressive-remove-v0 b/testdata/src/test/assets/media/download-actions/progressive-remove-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/progressive-remove-v0 rename to testdata/src/test/assets/media/download-actions/progressive-remove-v0 diff --git a/testdata/src/test/assets/download-actions/ss-download-v0 b/testdata/src/test/assets/media/download-actions/ss-download-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/ss-download-v0 rename to testdata/src/test/assets/media/download-actions/ss-download-v0 diff --git a/testdata/src/test/assets/download-actions/ss-download-v1 b/testdata/src/test/assets/media/download-actions/ss-download-v1 similarity index 100% rename from testdata/src/test/assets/download-actions/ss-download-v1 rename to testdata/src/test/assets/media/download-actions/ss-download-v1 diff --git a/testdata/src/test/assets/download-actions/ss-remove-v0 b/testdata/src/test/assets/media/download-actions/ss-remove-v0 similarity index 100% rename from testdata/src/test/assets/download-actions/ss-remove-v0 rename to testdata/src/test/assets/media/download-actions/ss-remove-v0 diff --git a/testdata/src/test/assets/download-actions/ss-remove-v1 b/testdata/src/test/assets/media/download-actions/ss-remove-v1 similarity index 100% rename from testdata/src/test/assets/download-actions/ss-remove-v1 rename to testdata/src/test/assets/media/download-actions/ss-remove-v1 diff --git a/testdata/src/test/assets/dvbsi/README.md b/testdata/src/test/assets/media/dvbsi/README.md similarity index 100% rename from testdata/src/test/assets/dvbsi/README.md rename to testdata/src/test/assets/media/dvbsi/README.md diff --git a/testdata/src/test/assets/dvbsi/ait_no_url_base.bin b/testdata/src/test/assets/media/dvbsi/ait_no_url_base.bin similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_no_url_base.bin rename to testdata/src/test/assets/media/dvbsi/ait_no_url_base.bin diff --git a/testdata/src/test/assets/dvbsi/ait_no_url_base.xml b/testdata/src/test/assets/media/dvbsi/ait_no_url_base.xml similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_no_url_base.xml rename to testdata/src/test/assets/media/dvbsi/ait_no_url_base.xml diff --git a/testdata/src/test/assets/dvbsi/ait_no_url_path.bin b/testdata/src/test/assets/media/dvbsi/ait_no_url_path.bin similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_no_url_path.bin rename to testdata/src/test/assets/media/dvbsi/ait_no_url_path.bin diff --git a/testdata/src/test/assets/dvbsi/ait_no_url_path.xml b/testdata/src/test/assets/media/dvbsi/ait_no_url_path.xml similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_no_url_path.xml rename to testdata/src/test/assets/media/dvbsi/ait_no_url_path.xml diff --git a/testdata/src/test/assets/dvbsi/ait_typical.bin b/testdata/src/test/assets/media/dvbsi/ait_typical.bin similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_typical.bin rename to testdata/src/test/assets/media/dvbsi/ait_typical.bin diff --git a/testdata/src/test/assets/dvbsi/ait_typical.xml b/testdata/src/test/assets/media/dvbsi/ait_typical.xml similarity index 100% rename from testdata/src/test/assets/dvbsi/ait_typical.xml rename to testdata/src/test/assets/media/dvbsi/ait_typical.xml diff --git a/testdata/src/test/assets/flac/bear.flac b/testdata/src/test/assets/media/flac/bear.flac similarity index 100% rename from testdata/src/test/assets/flac/bear.flac rename to testdata/src/test/assets/media/flac/bear.flac diff --git a/testdata/src/test/assets/flac/bear_no_min_max_frame_size.flac b/testdata/src/test/assets/media/flac/bear_no_min_max_frame_size.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_no_min_max_frame_size.flac rename to testdata/src/test/assets/media/flac/bear_no_min_max_frame_size.flac diff --git a/testdata/src/test/assets/flac/bear_no_num_samples.flac b/testdata/src/test/assets/media/flac/bear_no_num_samples.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_no_num_samples.flac rename to testdata/src/test/assets/media/flac/bear_no_num_samples.flac diff --git a/testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac b/testdata/src/test/assets/media/flac/bear_no_seek_table_no_num_samples.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac rename to testdata/src/test/assets/media/flac/bear_no_seek_table_no_num_samples.flac diff --git a/testdata/src/test/assets/flac/bear_one_metadata_block.flac b/testdata/src/test/assets/media/flac/bear_one_metadata_block.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_one_metadata_block.flac rename to testdata/src/test/assets/media/flac/bear_one_metadata_block.flac diff --git a/testdata/src/test/assets/flac/bear_uncommon_sample_rate.flac b/testdata/src/test/assets/media/flac/bear_uncommon_sample_rate.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_uncommon_sample_rate.flac rename to testdata/src/test/assets/media/flac/bear_uncommon_sample_rate.flac diff --git a/testdata/src/test/assets/flac/bear_with_id3.flac b/testdata/src/test/assets/media/flac/bear_with_id3.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_with_id3.flac rename to testdata/src/test/assets/media/flac/bear_with_id3.flac diff --git a/testdata/src/test/assets/flac/bear_with_picture.flac b/testdata/src/test/assets/media/flac/bear_with_picture.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_with_picture.flac rename to testdata/src/test/assets/media/flac/bear_with_picture.flac diff --git a/testdata/src/test/assets/flac/bear_with_vorbis_comments.flac b/testdata/src/test/assets/media/flac/bear_with_vorbis_comments.flac similarity index 100% rename from testdata/src/test/assets/flac/bear_with_vorbis_comments.flac rename to testdata/src/test/assets/media/flac/bear_with_vorbis_comments.flac diff --git a/testdata/src/test/assets/flv/sample.flv b/testdata/src/test/assets/media/flv/sample.flv similarity index 100% rename from testdata/src/test/assets/flv/sample.flv rename to testdata/src/test/assets/media/flv/sample.flv diff --git a/testdata/src/test/assets/id3/apic.id3 b/testdata/src/test/assets/media/id3/apic.id3 similarity index 100% rename from testdata/src/test/assets/id3/apic.id3 rename to testdata/src/test/assets/media/id3/apic.id3 diff --git a/testdata/src/test/assets/id3/comm_apic.id3 b/testdata/src/test/assets/media/id3/comm_apic.id3 similarity index 100% rename from testdata/src/test/assets/id3/comm_apic.id3 rename to testdata/src/test/assets/media/id3/comm_apic.id3 diff --git a/testdata/src/test/assets/mka/bear-flac-16bit.mka b/testdata/src/test/assets/media/mka/bear-flac-16bit.mka similarity index 100% rename from testdata/src/test/assets/mka/bear-flac-16bit.mka rename to testdata/src/test/assets/media/mka/bear-flac-16bit.mka diff --git a/testdata/src/test/assets/mka/bear-flac-24bit.mka b/testdata/src/test/assets/media/mka/bear-flac-24bit.mka similarity index 100% rename from testdata/src/test/assets/mka/bear-flac-24bit.mka rename to testdata/src/test/assets/media/mka/bear-flac-24bit.mka diff --git a/testdata/src/test/assets/mka/bear-opus-negative-gain.mka b/testdata/src/test/assets/media/mka/bear-opus-negative-gain.mka similarity index 100% rename from testdata/src/test/assets/mka/bear-opus-negative-gain.mka rename to testdata/src/test/assets/media/mka/bear-opus-negative-gain.mka diff --git a/testdata/src/test/assets/mka/bear-opus.mka b/testdata/src/test/assets/media/mka/bear-opus.mka similarity index 100% rename from testdata/src/test/assets/mka/bear-opus.mka rename to testdata/src/test/assets/media/mka/bear-opus.mka diff --git a/testdata/src/test/assets/mkv/full_blocks.mkv b/testdata/src/test/assets/media/mkv/full_blocks.mkv similarity index 100% rename from testdata/src/test/assets/mkv/full_blocks.mkv rename to testdata/src/test/assets/media/mkv/full_blocks.mkv diff --git a/testdata/src/test/assets/mkv/sample.mkv b/testdata/src/test/assets/media/mkv/sample.mkv similarity index 100% rename from testdata/src/test/assets/mkv/sample.mkv rename to testdata/src/test/assets/media/mkv/sample.mkv diff --git a/testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv b/testdata/src/test/assets/media/mkv/sample_with_htc_rotation_track_name.mkv similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_htc_rotation_track_name.mkv rename to testdata/src/test/assets/media/mkv/sample_with_htc_rotation_track_name.mkv diff --git a/testdata/src/test/assets/mkv/sample_with_srt.mkv b/testdata/src/test/assets/media/mkv/sample_with_srt.mkv similarity index 100% rename from testdata/src/test/assets/mkv/sample_with_srt.mkv rename to testdata/src/test/assets/media/mkv/sample_with_srt.mkv diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_altref.webm b/testdata/src/test/assets/media/mkv/subsample_encrypted_altref.webm similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_altref.webm rename to testdata/src/test/assets/media/mkv/subsample_encrypted_altref.webm diff --git a/testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm b/testdata/src/test/assets/media/mkv/subsample_encrypted_noaltref.webm similarity index 100% rename from testdata/src/test/assets/mkv/subsample_encrypted_noaltref.webm rename to testdata/src/test/assets/media/mkv/subsample_encrypted_noaltref.webm diff --git a/testdata/src/test/assets/mp3/1024_incrementing_bytes.mp3 b/testdata/src/test/assets/media/mp3/1024_incrementing_bytes.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/1024_incrementing_bytes.mp3 rename to testdata/src/test/assets/media/mp3/1024_incrementing_bytes.mp3 diff --git a/testdata/src/test/assets/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3 b/testdata/src/test/assets/media/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3 rename to testdata/src/test/assets/media/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3 diff --git a/testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3 b/testdata/src/test/assets/media/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3 rename to testdata/src/test/assets/media/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3 diff --git a/testdata/src/test/assets/mp3/bear-id3.mp3 b/testdata/src/test/assets/media/mp3/bear-id3.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/bear-id3.mp3 rename to testdata/src/test/assets/media/mp3/bear-id3.mp3 diff --git a/testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3 b/testdata/src/test/assets/media/mp3/bear-vbr-no-seek-table.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-no-seek-table.mp3 rename to testdata/src/test/assets/media/mp3/bear-vbr-no-seek-table.mp3 diff --git a/testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3 b/testdata/src/test/assets/media/mp3/bear-vbr-xing-header.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/bear-vbr-xing-header.mp3 rename to testdata/src/test/assets/media/mp3/bear-vbr-xing-header.mp3 diff --git a/testdata/src/test/assets/mp3/play-trimmed.mp3 b/testdata/src/test/assets/media/mp3/play-trimmed.mp3 similarity index 100% rename from testdata/src/test/assets/mp3/play-trimmed.mp3 rename to testdata/src/test/assets/media/mp3/play-trimmed.mp3 diff --git a/testdata/src/test/assets/mp4/midroll-5s.mp4 b/testdata/src/test/assets/media/mp4/midroll-5s.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/midroll-5s.mp4 rename to testdata/src/test/assets/media/mp4/midroll-5s.mp4 diff --git a/testdata/src/test/assets/mp4/postroll-5s.mp4 b/testdata/src/test/assets/media/mp4/postroll-5s.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/postroll-5s.mp4 rename to testdata/src/test/assets/media/mp4/postroll-5s.mp4 diff --git a/testdata/src/test/assets/mp4/preroll-5s.mp4 b/testdata/src/test/assets/media/mp4/preroll-5s.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/preroll-5s.mp4 rename to testdata/src/test/assets/media/mp4/preroll-5s.mp4 diff --git a/testdata/src/test/assets/mp4/sample.mp4 b/testdata/src/test/assets/media/mp4/sample.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample.mp4 rename to testdata/src/test/assets/media/mp4/sample.mp4 diff --git a/testdata/src/test/assets/mp4/sample_ac3.mp4 b/testdata/src/test/assets/media/mp4/sample_ac3.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3.mp4 rename to testdata/src/test/assets/media/mp4/sample_ac3.mp4 diff --git a/testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_ac3_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac3_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_ac3_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_ac4.mp4 b/testdata/src/test/assets/media/mp4/sample_ac4.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4.mp4 rename to testdata/src/test/assets/media/mp4/sample_ac4.mp4 diff --git a/testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_ac4_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_ac4_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_ac4_protected.mp4 b/testdata/src/test/assets/media/mp4/sample_ac4_protected.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_ac4_protected.mp4 rename to testdata/src/test/assets/media/mp4/sample_ac4_protected.mp4 diff --git a/testdata/src/test/assets/mp4/sample_android_slow_motion.mp4 b/testdata/src/test/assets/media/mp4/sample_android_slow_motion.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_android_slow_motion.mp4 rename to testdata/src/test/assets/media/mp4/sample_android_slow_motion.mp4 diff --git a/testdata/src/test/assets/mp4/sample_eac3.mp4 b/testdata/src/test/assets/media/mp4/sample_eac3.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3.mp4 rename to testdata/src/test/assets/media/mp4/sample_eac3.mp4 diff --git a/testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_eac3_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_eac3_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_eac3joc.mp4 b/testdata/src/test/assets/media/mp4/sample_eac3joc.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc.mp4 rename to testdata/src/test/assets/media/mp4/sample_eac3joc.mp4 diff --git a/testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_eac3joc_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_eac3joc_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_eac3joc_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4 b/testdata/src/test/assets/media/mp4/sample_fragmented_seekable.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4 rename to testdata/src/test/assets/media/mp4/sample_fragmented_seekable.mp4 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4 b/testdata/src/test/assets/media/mp4/sample_fragmented_sei.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_fragmented_sei.mp4 rename to testdata/src/test/assets/media/mp4/sample_fragmented_sei.mp4 diff --git a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4 b/testdata/src/test/assets/media/mp4/sample_mdat_too_long.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_mdat_too_long.mp4 rename to testdata/src/test/assets/media/mp4/sample_mdat_too_long.mp4 diff --git a/testdata/src/test/assets/mp4/sample_opus.mp4 b/testdata/src/test/assets/media/mp4/sample_opus.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus.mp4 rename to testdata/src/test/assets/media/mp4/sample_opus.mp4 diff --git a/testdata/src/test/assets/mp4/sample_opus_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_opus_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_opus_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_opus_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/sample_partially_fragmented.mp4 b/testdata/src/test/assets/media/mp4/sample_partially_fragmented.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/sample_partially_fragmented.mp4 rename to testdata/src/test/assets/media/mp4/sample_partially_fragmented.mp4 diff --git a/testdata/src/test/assets/mp4/testvid_1022ms.mp4 b/testdata/src/test/assets/media/mp4/testvid_1022ms.mp4 similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms.mp4 rename to testdata/src/test/assets/media/mp4/testvid_1022ms.mp4 diff --git a/testdata/src/test/assets/mp4/testvid_1022ms_000.png b/testdata/src/test/assets/media/mp4/testvid_1022ms_000.png similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms_000.png rename to testdata/src/test/assets/media/mp4/testvid_1022ms_000.png diff --git a/testdata/src/test/assets/mp4/testvid_1022ms_014.png b/testdata/src/test/assets/media/mp4/testvid_1022ms_014.png similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms_014.png rename to testdata/src/test/assets/media/mp4/testvid_1022ms_014.png diff --git a/testdata/src/test/assets/mp4/testvid_1022ms_015.png b/testdata/src/test/assets/media/mp4/testvid_1022ms_015.png similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms_015.png rename to testdata/src/test/assets/media/mp4/testvid_1022ms_015.png diff --git a/testdata/src/test/assets/mp4/testvid_1022ms_016.png b/testdata/src/test/assets/media/mp4/testvid_1022ms_016.png similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms_016.png rename to testdata/src/test/assets/media/mp4/testvid_1022ms_016.png diff --git a/testdata/src/test/assets/mp4/testvid_1022ms_029.png b/testdata/src/test/assets/media/mp4/testvid_1022ms_029.png similarity index 100% rename from testdata/src/test/assets/mp4/testvid_1022ms_029.png rename to testdata/src/test/assets/media/mp4/testvid_1022ms_029.png diff --git a/testdata/src/test/assets/mpd/sample_mpd b/testdata/src/test/assets/media/mpd/sample_mpd similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd rename to testdata/src/test/assets/media/mpd/sample_mpd diff --git a/testdata/src/test/assets/mpd/sample_mpd_asset_identifier b/testdata/src/test/assets/media/mpd/sample_mpd_asset_identifier similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_asset_identifier rename to testdata/src/test/assets/media/mpd/sample_mpd_asset_identifier diff --git a/testdata/src/test/assets/mpd/sample_mpd_cea_608_accessibility b/testdata/src/test/assets/media/mpd/sample_mpd_cea_608_accessibility similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_cea_608_accessibility rename to testdata/src/test/assets/media/mpd/sample_mpd_cea_608_accessibility diff --git a/testdata/src/test/assets/mpd/sample_mpd_cea_708_accessibility b/testdata/src/test/assets/media/mpd/sample_mpd_cea_708_accessibility similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_cea_708_accessibility rename to testdata/src/test/assets/media/mpd/sample_mpd_cea_708_accessibility diff --git a/testdata/src/test/assets/mpd/sample_mpd_event_stream b/testdata/src/test/assets/media/mpd/sample_mpd_event_stream similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_event_stream rename to testdata/src/test/assets/media/mpd/sample_mpd_event_stream diff --git a/testdata/src/test/assets/mpd/sample_mpd_labels b/testdata/src/test/assets/media/mpd/sample_mpd_labels similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_labels rename to testdata/src/test/assets/media/mpd/sample_mpd_labels diff --git a/testdata/src/test/assets/mpd/sample_mpd_segment_template b/testdata/src/test/assets/media/mpd/sample_mpd_segment_template similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_segment_template rename to testdata/src/test/assets/media/mpd/sample_mpd_segment_template diff --git a/testdata/src/test/assets/mpd/sample_mpd_stream_keys b/testdata/src/test/assets/media/mpd/sample_mpd_stream_keys similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_stream_keys rename to testdata/src/test/assets/media/mpd/sample_mpd_stream_keys diff --git a/testdata/src/test/assets/mpd/sample_mpd_switching_and_trick_play_property b/testdata/src/test/assets/media/mpd/sample_mpd_switching_and_trick_play_property similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_switching_and_trick_play_property rename to testdata/src/test/assets/media/mpd/sample_mpd_switching_and_trick_play_property diff --git a/testdata/src/test/assets/mpd/sample_mpd_switching_property b/testdata/src/test/assets/media/mpd/sample_mpd_switching_property similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_switching_property rename to testdata/src/test/assets/media/mpd/sample_mpd_switching_property diff --git a/testdata/src/test/assets/mpd/sample_mpd_text b/testdata/src/test/assets/media/mpd/sample_mpd_text similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_text rename to testdata/src/test/assets/media/mpd/sample_mpd_text diff --git a/testdata/src/test/assets/mpd/sample_mpd_trick_play b/testdata/src/test/assets/media/mpd/sample_mpd_trick_play similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_trick_play rename to testdata/src/test/assets/media/mpd/sample_mpd_trick_play diff --git a/testdata/src/test/assets/mpd/sample_mpd_trick_play_property b/testdata/src/test/assets/media/mpd/sample_mpd_trick_play_property similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_trick_play_property rename to testdata/src/test/assets/media/mpd/sample_mpd_trick_play_property diff --git a/testdata/src/test/assets/mpd/sample_mpd_unknown_mime_type b/testdata/src/test/assets/media/mpd/sample_mpd_unknown_mime_type similarity index 100% rename from testdata/src/test/assets/mpd/sample_mpd_unknown_mime_type rename to testdata/src/test/assets/media/mpd/sample_mpd_unknown_mime_type diff --git a/testdata/src/test/assets/offline/action_file_for_download_index_upgrade_dash.exi b/testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_dash.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_for_download_index_upgrade_dash.exi rename to testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_dash.exi diff --git a/testdata/src/test/assets/offline/action_file_for_download_index_upgrade_hls.exi b/testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_hls.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_for_download_index_upgrade_hls.exi rename to testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_hls.exi diff --git a/testdata/src/test/assets/offline/action_file_for_download_index_upgrade_progressive.exi b/testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_progressive.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_for_download_index_upgrade_progressive.exi rename to testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_progressive.exi diff --git a/testdata/src/test/assets/offline/action_file_for_download_index_upgrade_ss.exi b/testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_ss.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_for_download_index_upgrade_ss.exi rename to testdata/src/test/assets/media/offline/action_file_for_download_index_upgrade_ss.exi diff --git a/testdata/src/test/assets/offline/action_file_incomplete_header.exi b/testdata/src/test/assets/media/offline/action_file_incomplete_header.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_incomplete_header.exi rename to testdata/src/test/assets/media/offline/action_file_incomplete_header.exi diff --git a/testdata/src/test/assets/offline/action_file_no_data.exi b/testdata/src/test/assets/media/offline/action_file_no_data.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_no_data.exi rename to testdata/src/test/assets/media/offline/action_file_no_data.exi diff --git a/testdata/src/test/assets/offline/action_file_one_action.exi b/testdata/src/test/assets/media/offline/action_file_one_action.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_one_action.exi rename to testdata/src/test/assets/media/offline/action_file_one_action.exi diff --git a/testdata/src/test/assets/offline/action_file_two_actions.exi b/testdata/src/test/assets/media/offline/action_file_two_actions.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_two_actions.exi rename to testdata/src/test/assets/media/offline/action_file_two_actions.exi diff --git a/testdata/src/test/assets/offline/action_file_unsupported_version.exi b/testdata/src/test/assets/media/offline/action_file_unsupported_version.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_unsupported_version.exi rename to testdata/src/test/assets/media/offline/action_file_unsupported_version.exi diff --git a/testdata/src/test/assets/offline/action_file_zero_actions.exi b/testdata/src/test/assets/media/offline/action_file_zero_actions.exi similarity index 100% rename from testdata/src/test/assets/offline/action_file_zero_actions.exi rename to testdata/src/test/assets/media/offline/action_file_zero_actions.exi diff --git a/testdata/src/test/assets/offline/exoplayer_internal_v2.db b/testdata/src/test/assets/media/offline/exoplayer_internal_v2.db similarity index 100% rename from testdata/src/test/assets/offline/exoplayer_internal_v2.db rename to testdata/src/test/assets/media/offline/exoplayer_internal_v2.db diff --git a/testdata/src/test/assets/ogg/bear.opus b/testdata/src/test/assets/media/ogg/bear.opus similarity index 100% rename from testdata/src/test/assets/ogg/bear.opus rename to testdata/src/test/assets/media/ogg/bear.opus diff --git a/testdata/src/test/assets/ogg/bear_flac.ogg b/testdata/src/test/assets/media/ogg/bear_flac.ogg similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac.ogg rename to testdata/src/test/assets/media/ogg/bear_flac.ogg diff --git a/testdata/src/test/assets/ogg/bear_flac_noseektable.ogg b/testdata/src/test/assets/media/ogg/bear_flac_noseektable.ogg similarity index 100% rename from testdata/src/test/assets/ogg/bear_flac_noseektable.ogg rename to testdata/src/test/assets/media/ogg/bear_flac_noseektable.ogg diff --git a/testdata/src/test/assets/ogg/bear_vorbis.ogg b/testdata/src/test/assets/media/ogg/bear_vorbis.ogg similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis.ogg rename to testdata/src/test/assets/media/ogg/bear_vorbis.ogg diff --git a/testdata/src/test/assets/ogg/bear_vorbis_gap.ogg b/testdata/src/test/assets/media/ogg/bear_vorbis_gap.ogg similarity index 100% rename from testdata/src/test/assets/ogg/bear_vorbis_gap.ogg rename to testdata/src/test/assets/media/ogg/bear_vorbis_gap.ogg diff --git a/testdata/src/test/assets/ogg/continued_packet_at_start b/testdata/src/test/assets/media/ogg/continued_packet_at_start similarity index 100% rename from testdata/src/test/assets/ogg/continued_packet_at_start rename to testdata/src/test/assets/media/ogg/continued_packet_at_start diff --git a/testdata/src/test/assets/ogg/continued_packet_over_four_pages b/testdata/src/test/assets/media/ogg/continued_packet_over_four_pages similarity index 100% rename from testdata/src/test/assets/ogg/continued_packet_over_four_pages rename to testdata/src/test/assets/media/ogg/continued_packet_over_four_pages diff --git a/testdata/src/test/assets/ogg/continued_packet_over_two_pages b/testdata/src/test/assets/media/ogg/continued_packet_over_two_pages similarity index 100% rename from testdata/src/test/assets/ogg/continued_packet_over_two_pages rename to testdata/src/test/assets/media/ogg/continued_packet_over_two_pages diff --git a/testdata/src/test/assets/ogg/eof_header b/testdata/src/test/assets/media/ogg/eof_header similarity index 100% rename from testdata/src/test/assets/ogg/eof_header rename to testdata/src/test/assets/media/ogg/eof_header diff --git a/testdata/src/test/assets/ogg/flac_header b/testdata/src/test/assets/media/ogg/flac_header similarity index 100% rename from testdata/src/test/assets/ogg/flac_header rename to testdata/src/test/assets/media/ogg/flac_header diff --git a/testdata/src/test/assets/ogg/four_packets_with_empty_page b/testdata/src/test/assets/media/ogg/four_packets_with_empty_page similarity index 100% rename from testdata/src/test/assets/ogg/four_packets_with_empty_page rename to testdata/src/test/assets/media/ogg/four_packets_with_empty_page diff --git a/testdata/src/test/assets/ogg/invalid_header b/testdata/src/test/assets/media/ogg/invalid_header similarity index 100% rename from testdata/src/test/assets/ogg/invalid_header rename to testdata/src/test/assets/media/ogg/invalid_header diff --git a/testdata/src/test/assets/ogg/invalid_ogg_header b/testdata/src/test/assets/media/ogg/invalid_ogg_header similarity index 100% rename from testdata/src/test/assets/ogg/invalid_ogg_header rename to testdata/src/test/assets/media/ogg/invalid_ogg_header diff --git a/testdata/src/test/assets/ogg/opus_header b/testdata/src/test/assets/media/ogg/opus_header similarity index 100% rename from testdata/src/test/assets/ogg/opus_header rename to testdata/src/test/assets/media/ogg/opus_header diff --git a/testdata/src/test/assets/ogg/packet_with_zero_size_terminator b/testdata/src/test/assets/media/ogg/packet_with_zero_size_terminator similarity index 100% rename from testdata/src/test/assets/ogg/packet_with_zero_size_terminator rename to testdata/src/test/assets/media/ogg/packet_with_zero_size_terminator diff --git a/testdata/src/test/assets/ogg/page_header b/testdata/src/test/assets/media/ogg/page_header similarity index 100% rename from testdata/src/test/assets/ogg/page_header rename to testdata/src/test/assets/media/ogg/page_header diff --git a/testdata/src/test/assets/ogg/random_1000_pages b/testdata/src/test/assets/media/ogg/random_1000_pages similarity index 100% rename from testdata/src/test/assets/ogg/random_1000_pages rename to testdata/src/test/assets/media/ogg/random_1000_pages diff --git a/testdata/src/test/assets/ogg/three_headers b/testdata/src/test/assets/media/ogg/three_headers similarity index 100% rename from testdata/src/test/assets/ogg/three_headers rename to testdata/src/test/assets/media/ogg/three_headers diff --git a/testdata/src/test/assets/ogg/vorbis_header b/testdata/src/test/assets/media/ogg/vorbis_header similarity index 100% rename from testdata/src/test/assets/ogg/vorbis_header rename to testdata/src/test/assets/media/ogg/vorbis_header diff --git a/testdata/src/test/assets/ogg/zero_sized_packets_at_end_of_stream b/testdata/src/test/assets/media/ogg/zero_sized_packets_at_end_of_stream similarity index 100% rename from testdata/src/test/assets/ogg/zero_sized_packets_at_end_of_stream rename to testdata/src/test/assets/media/ogg/zero_sized_packets_at_end_of_stream diff --git a/testdata/src/test/assets/rawcc/sample.rawcc b/testdata/src/test/assets/media/rawcc/sample.rawcc similarity index 100% rename from testdata/src/test/assets/rawcc/sample.rawcc rename to testdata/src/test/assets/media/rawcc/sample.rawcc diff --git a/testdata/src/test/assets/smooth-streaming/sample_ismc_1 b/testdata/src/test/assets/media/smooth-streaming/sample_ismc_1 similarity index 100% rename from testdata/src/test/assets/smooth-streaming/sample_ismc_1 rename to testdata/src/test/assets/media/smooth-streaming/sample_ismc_1 diff --git a/testdata/src/test/assets/smooth-streaming/sample_ismc_2 b/testdata/src/test/assets/media/smooth-streaming/sample_ismc_2 similarity index 100% rename from testdata/src/test/assets/smooth-streaming/sample_ismc_2 rename to testdata/src/test/assets/media/smooth-streaming/sample_ismc_2 diff --git a/testdata/src/test/assets/ssa/empty b/testdata/src/test/assets/media/ssa/empty similarity index 100% rename from testdata/src/test/assets/ssa/empty rename to testdata/src/test/assets/media/ssa/empty diff --git a/testdata/src/test/assets/ssa/invalid_positioning b/testdata/src/test/assets/media/ssa/invalid_positioning similarity index 100% rename from testdata/src/test/assets/ssa/invalid_positioning rename to testdata/src/test/assets/media/ssa/invalid_positioning diff --git a/testdata/src/test/assets/ssa/invalid_timecodes b/testdata/src/test/assets/media/ssa/invalid_timecodes similarity index 100% rename from testdata/src/test/assets/ssa/invalid_timecodes rename to testdata/src/test/assets/media/ssa/invalid_timecodes diff --git a/testdata/src/test/assets/ssa/overlapping_timecodes b/testdata/src/test/assets/media/ssa/overlapping_timecodes similarity index 100% rename from testdata/src/test/assets/ssa/overlapping_timecodes rename to testdata/src/test/assets/media/ssa/overlapping_timecodes diff --git a/testdata/src/test/assets/ssa/positioning b/testdata/src/test/assets/media/ssa/positioning similarity index 100% rename from testdata/src/test/assets/ssa/positioning rename to testdata/src/test/assets/media/ssa/positioning diff --git a/testdata/src/test/assets/ssa/positioning_without_playres b/testdata/src/test/assets/media/ssa/positioning_without_playres similarity index 100% rename from testdata/src/test/assets/ssa/positioning_without_playres rename to testdata/src/test/assets/media/ssa/positioning_without_playres diff --git a/testdata/src/test/assets/ssa/typical b/testdata/src/test/assets/media/ssa/typical similarity index 100% rename from testdata/src/test/assets/ssa/typical rename to testdata/src/test/assets/media/ssa/typical diff --git a/testdata/src/test/assets/ssa/typical_dialogue b/testdata/src/test/assets/media/ssa/typical_dialogue similarity index 100% rename from testdata/src/test/assets/ssa/typical_dialogue rename to testdata/src/test/assets/media/ssa/typical_dialogue diff --git a/testdata/src/test/assets/ssa/typical_format b/testdata/src/test/assets/media/ssa/typical_format similarity index 100% rename from testdata/src/test/assets/ssa/typical_format rename to testdata/src/test/assets/media/ssa/typical_format diff --git a/testdata/src/test/assets/ssa/typical_header b/testdata/src/test/assets/media/ssa/typical_header similarity index 100% rename from testdata/src/test/assets/ssa/typical_header rename to testdata/src/test/assets/media/ssa/typical_header diff --git a/testdata/src/test/assets/subrip/empty b/testdata/src/test/assets/media/subrip/empty similarity index 100% rename from testdata/src/test/assets/subrip/empty rename to testdata/src/test/assets/media/subrip/empty diff --git a/testdata/src/test/assets/subrip/typical b/testdata/src/test/assets/media/subrip/typical similarity index 100% rename from testdata/src/test/assets/subrip/typical rename to testdata/src/test/assets/media/subrip/typical diff --git a/testdata/src/test/assets/subrip/typical_extra_blank_line b/testdata/src/test/assets/media/subrip/typical_extra_blank_line similarity index 100% rename from testdata/src/test/assets/subrip/typical_extra_blank_line rename to testdata/src/test/assets/media/subrip/typical_extra_blank_line diff --git a/testdata/src/test/assets/subrip/typical_missing_sequence b/testdata/src/test/assets/media/subrip/typical_missing_sequence similarity index 100% rename from testdata/src/test/assets/subrip/typical_missing_sequence rename to testdata/src/test/assets/media/subrip/typical_missing_sequence diff --git a/testdata/src/test/assets/subrip/typical_missing_timecode b/testdata/src/test/assets/media/subrip/typical_missing_timecode similarity index 100% rename from testdata/src/test/assets/subrip/typical_missing_timecode rename to testdata/src/test/assets/media/subrip/typical_missing_timecode diff --git a/testdata/src/test/assets/subrip/typical_negative_timestamps b/testdata/src/test/assets/media/subrip/typical_negative_timestamps similarity index 100% rename from testdata/src/test/assets/subrip/typical_negative_timestamps rename to testdata/src/test/assets/media/subrip/typical_negative_timestamps diff --git a/testdata/src/test/assets/subrip/typical_no_hours_and_millis b/testdata/src/test/assets/media/subrip/typical_no_hours_and_millis similarity index 100% rename from testdata/src/test/assets/subrip/typical_no_hours_and_millis rename to testdata/src/test/assets/media/subrip/typical_no_hours_and_millis diff --git a/testdata/src/test/assets/subrip/typical_unexpected_end b/testdata/src/test/assets/media/subrip/typical_unexpected_end similarity index 100% rename from testdata/src/test/assets/subrip/typical_unexpected_end rename to testdata/src/test/assets/media/subrip/typical_unexpected_end diff --git a/testdata/src/test/assets/subrip/typical_with_byte_order_mark b/testdata/src/test/assets/media/subrip/typical_with_byte_order_mark similarity index 100% rename from testdata/src/test/assets/subrip/typical_with_byte_order_mark rename to testdata/src/test/assets/media/subrip/typical_with_byte_order_mark diff --git a/testdata/src/test/assets/subrip/typical_with_tags b/testdata/src/test/assets/media/subrip/typical_with_tags similarity index 100% rename from testdata/src/test/assets/subrip/typical_with_tags rename to testdata/src/test/assets/media/subrip/typical_with_tags diff --git a/testdata/src/test/assets/ts/bbb_2500ms.ts b/testdata/src/test/assets/media/ts/bbb_2500ms.ts similarity index 100% rename from testdata/src/test/assets/ts/bbb_2500ms.ts rename to testdata/src/test/assets/media/ts/bbb_2500ms.ts diff --git a/testdata/src/test/assets/ts/elephants_dream.mpg b/testdata/src/test/assets/media/ts/elephants_dream.mpg similarity index 100% rename from testdata/src/test/assets/ts/elephants_dream.mpg rename to testdata/src/test/assets/media/ts/elephants_dream.mpg diff --git a/testdata/src/test/assets/ts/sample.ac3 b/testdata/src/test/assets/media/ts/sample.ac3 similarity index 100% rename from testdata/src/test/assets/ts/sample.ac3 rename to testdata/src/test/assets/media/ts/sample.ac3 diff --git a/testdata/src/test/assets/ts/sample.ac4 b/testdata/src/test/assets/media/ts/sample.ac4 similarity index 100% rename from testdata/src/test/assets/ts/sample.ac4 rename to testdata/src/test/assets/media/ts/sample.ac4 diff --git a/testdata/src/test/assets/ts/sample.adts b/testdata/src/test/assets/media/ts/sample.adts similarity index 100% rename from testdata/src/test/assets/ts/sample.adts rename to testdata/src/test/assets/media/ts/sample.adts diff --git a/testdata/src/test/assets/ts/sample.eac3 b/testdata/src/test/assets/media/ts/sample.eac3 similarity index 100% rename from testdata/src/test/assets/ts/sample.eac3 rename to testdata/src/test/assets/media/ts/sample.eac3 diff --git a/testdata/src/test/assets/ts/sample_ac3.ps b/testdata/src/test/assets/media/ts/sample_ac3.ps similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ps rename to testdata/src/test/assets/media/ts/sample_ac3.ps diff --git a/testdata/src/test/assets/ts/sample_ac3.ts b/testdata/src/test/assets/media/ts/sample_ac3.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_ac3.ts rename to testdata/src/test/assets/media/ts/sample_ac3.ts diff --git a/testdata/src/test/assets/ts/sample_ac4.ts b/testdata/src/test/assets/media/ts/sample_ac4.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_ac4.ts rename to testdata/src/test/assets/media/ts/sample_ac4.ts diff --git a/testdata/src/test/assets/ts/sample_ait.ts b/testdata/src/test/assets/media/ts/sample_ait.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_ait.ts rename to testdata/src/test/assets/media/ts/sample_ait.ts diff --git a/testdata/src/test/assets/ts/sample_cbs.adts b/testdata/src/test/assets/media/ts/sample_cbs.adts similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs.adts rename to testdata/src/test/assets/media/ts/sample_cbs.adts diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts b/testdata/src/test/assets/media/ts/sample_cbs_truncated.adts similarity index 100% rename from testdata/src/test/assets/ts/sample_cbs_truncated.adts rename to testdata/src/test/assets/media/ts/sample_cbs_truncated.adts diff --git a/testdata/src/test/assets/ts/sample_eac3.ts b/testdata/src/test/assets/media/ts/sample_eac3.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3.ts rename to testdata/src/test/assets/media/ts/sample_eac3.ts diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ec3 b/testdata/src/test/assets/media/ts/sample_eac3joc.ec3 similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ec3 rename to testdata/src/test/assets/media/ts/sample_eac3joc.ec3 diff --git a/testdata/src/test/assets/ts/sample_eac3joc.ts b/testdata/src/test/assets/media/ts/sample_eac3joc.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_eac3joc.ts rename to testdata/src/test/assets/media/ts/sample_eac3joc.ts diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps b/testdata/src/test/assets/media/ts/sample_h262_mpeg_audio.ps similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps rename to testdata/src/test/assets/media/ts/sample_h262_mpeg_audio.ps diff --git a/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts b/testdata/src/test/assets/media/ts/sample_h262_mpeg_audio.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h262_mpeg_audio.ts rename to testdata/src/test/assets/media/ts/sample_h262_mpeg_audio.ts diff --git a/testdata/src/test/assets/ts/sample_h263.ts b/testdata/src/test/assets/media/ts/sample_h263.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h263.ts rename to testdata/src/test/assets/media/ts/sample_h263.ts diff --git a/testdata/src/test/assets/ts/sample_h264_dts_audio.ts b/testdata/src/test/assets/media/ts/sample_h264_dts_audio.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_dts_audio.ts rename to testdata/src/test/assets/media/ts/sample_h264_dts_audio.ts diff --git a/testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts b/testdata/src/test/assets/media/ts/sample_h264_mpeg_audio.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_mpeg_audio.ts rename to testdata/src/test/assets/media/ts/sample_h264_mpeg_audio.ts diff --git a/testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts b/testdata/src/test/assets/media/ts/sample_h264_no_access_unit_delimiters.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h264_no_access_unit_delimiters.ts rename to testdata/src/test/assets/media/ts/sample_h264_no_access_unit_delimiters.ts diff --git a/testdata/src/test/assets/ts/sample_h265.ts b/testdata/src/test/assets/media/ts/sample_h265.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_h265.ts rename to testdata/src/test/assets/media/ts/sample_h265.ts diff --git a/testdata/src/test/assets/ts/sample_latm.ts b/testdata/src/test/assets/media/ts/sample_latm.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_latm.ts rename to testdata/src/test/assets/media/ts/sample_latm.ts diff --git a/testdata/src/test/assets/ts/sample_scte35.ts b/testdata/src/test/assets/media/ts/sample_scte35.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_scte35.ts rename to testdata/src/test/assets/media/ts/sample_scte35.ts diff --git a/testdata/src/test/assets/ts/sample_with_id3.adts b/testdata/src/test/assets/media/ts/sample_with_id3.adts similarity index 100% rename from testdata/src/test/assets/ts/sample_with_id3.adts rename to testdata/src/test/assets/media/ts/sample_with_id3.adts diff --git a/testdata/src/test/assets/ts/sample_with_junk b/testdata/src/test/assets/media/ts/sample_with_junk similarity index 100% rename from testdata/src/test/assets/ts/sample_with_junk rename to testdata/src/test/assets/media/ts/sample_with_junk diff --git a/testdata/src/test/assets/ts/sample_with_sdt.ts b/testdata/src/test/assets/media/ts/sample_with_sdt.ts similarity index 100% rename from testdata/src/test/assets/ts/sample_with_sdt.ts rename to testdata/src/test/assets/media/ts/sample_with_sdt.ts diff --git a/testdata/src/test/assets/ttml/bitmap_percentage_region.xml b/testdata/src/test/assets/media/ttml/bitmap_percentage_region.xml similarity index 100% rename from testdata/src/test/assets/ttml/bitmap_percentage_region.xml rename to testdata/src/test/assets/media/ttml/bitmap_percentage_region.xml diff --git a/testdata/src/test/assets/ttml/bitmap_pixel_region.xml b/testdata/src/test/assets/media/ttml/bitmap_pixel_region.xml similarity index 100% rename from testdata/src/test/assets/ttml/bitmap_pixel_region.xml rename to testdata/src/test/assets/media/ttml/bitmap_pixel_region.xml diff --git a/testdata/src/test/assets/ttml/bitmap_unsupported_region.xml b/testdata/src/test/assets/media/ttml/bitmap_unsupported_region.xml similarity index 100% rename from testdata/src/test/assets/ttml/bitmap_unsupported_region.xml rename to testdata/src/test/assets/media/ttml/bitmap_unsupported_region.xml diff --git a/testdata/src/test/assets/ttml/chain_multiple_styles.xml b/testdata/src/test/assets/media/ttml/chain_multiple_styles.xml similarity index 100% rename from testdata/src/test/assets/ttml/chain_multiple_styles.xml rename to testdata/src/test/assets/media/ttml/chain_multiple_styles.xml diff --git a/testdata/src/test/assets/ttml/font_size.xml b/testdata/src/test/assets/media/ttml/font_size.xml similarity index 100% rename from testdata/src/test/assets/ttml/font_size.xml rename to testdata/src/test/assets/media/ttml/font_size.xml diff --git a/testdata/src/test/assets/ttml/font_size_empty.xml b/testdata/src/test/assets/media/ttml/font_size_empty.xml similarity index 100% rename from testdata/src/test/assets/ttml/font_size_empty.xml rename to testdata/src/test/assets/media/ttml/font_size_empty.xml diff --git a/testdata/src/test/assets/ttml/font_size_invalid.xml b/testdata/src/test/assets/media/ttml/font_size_invalid.xml similarity index 100% rename from testdata/src/test/assets/ttml/font_size_invalid.xml rename to testdata/src/test/assets/media/ttml/font_size_invalid.xml diff --git a/testdata/src/test/assets/ttml/font_size_no_unit.xml b/testdata/src/test/assets/media/ttml/font_size_no_unit.xml similarity index 100% rename from testdata/src/test/assets/ttml/font_size_no_unit.xml rename to testdata/src/test/assets/media/ttml/font_size_no_unit.xml diff --git a/testdata/src/test/assets/ttml/frame_rate.xml b/testdata/src/test/assets/media/ttml/frame_rate.xml similarity index 100% rename from testdata/src/test/assets/ttml/frame_rate.xml rename to testdata/src/test/assets/media/ttml/frame_rate.xml diff --git a/testdata/src/test/assets/ttml/inherit_and_override_style.xml b/testdata/src/test/assets/media/ttml/inherit_and_override_style.xml similarity index 100% rename from testdata/src/test/assets/ttml/inherit_and_override_style.xml rename to testdata/src/test/assets/media/ttml/inherit_and_override_style.xml diff --git a/testdata/src/test/assets/ttml/inherit_global_and_parent.xml b/testdata/src/test/assets/media/ttml/inherit_global_and_parent.xml similarity index 100% rename from testdata/src/test/assets/ttml/inherit_global_and_parent.xml rename to testdata/src/test/assets/media/ttml/inherit_global_and_parent.xml diff --git a/testdata/src/test/assets/ttml/inherit_multiple_styles.xml b/testdata/src/test/assets/media/ttml/inherit_multiple_styles.xml similarity index 100% rename from testdata/src/test/assets/ttml/inherit_multiple_styles.xml rename to testdata/src/test/assets/media/ttml/inherit_multiple_styles.xml diff --git a/testdata/src/test/assets/ttml/inherit_style.xml b/testdata/src/test/assets/media/ttml/inherit_style.xml similarity index 100% rename from testdata/src/test/assets/ttml/inherit_style.xml rename to testdata/src/test/assets/media/ttml/inherit_style.xml diff --git a/testdata/src/test/assets/ttml/inline_style_attributes.xml b/testdata/src/test/assets/media/ttml/inline_style_attributes.xml similarity index 100% rename from testdata/src/test/assets/ttml/inline_style_attributes.xml rename to testdata/src/test/assets/media/ttml/inline_style_attributes.xml diff --git a/testdata/src/test/assets/ttml/multiple_regions.xml b/testdata/src/test/assets/media/ttml/multiple_regions.xml similarity index 100% rename from testdata/src/test/assets/ttml/multiple_regions.xml rename to testdata/src/test/assets/media/ttml/multiple_regions.xml diff --git a/testdata/src/test/assets/ttml/no_underline_linethrough.xml b/testdata/src/test/assets/media/ttml/no_underline_linethrough.xml similarity index 100% rename from testdata/src/test/assets/ttml/no_underline_linethrough.xml rename to testdata/src/test/assets/media/ttml/no_underline_linethrough.xml diff --git a/testdata/src/test/assets/ttml/rubies.xml b/testdata/src/test/assets/media/ttml/rubies.xml similarity index 100% rename from testdata/src/test/assets/ttml/rubies.xml rename to testdata/src/test/assets/media/ttml/rubies.xml diff --git a/testdata/src/test/assets/ttml/text_align.xml b/testdata/src/test/assets/media/ttml/text_align.xml similarity index 100% rename from testdata/src/test/assets/ttml/text_align.xml rename to testdata/src/test/assets/media/ttml/text_align.xml diff --git a/testdata/src/test/assets/ttml/text_combine.xml b/testdata/src/test/assets/media/ttml/text_combine.xml similarity index 100% rename from testdata/src/test/assets/ttml/text_combine.xml rename to testdata/src/test/assets/media/ttml/text_combine.xml diff --git a/testdata/src/test/assets/ttml/vertical_text.xml b/testdata/src/test/assets/media/ttml/vertical_text.xml similarity index 100% rename from testdata/src/test/assets/ttml/vertical_text.xml rename to testdata/src/test/assets/media/ttml/vertical_text.xml diff --git a/testdata/src/test/assets/tx3g/initialization b/testdata/src/test/assets/media/tx3g/initialization similarity index 100% rename from testdata/src/test/assets/tx3g/initialization rename to testdata/src/test/assets/media/tx3g/initialization diff --git a/testdata/src/test/assets/tx3g/initialization_all_defaults b/testdata/src/test/assets/media/tx3g/initialization_all_defaults similarity index 100% rename from testdata/src/test/assets/tx3g/initialization_all_defaults rename to testdata/src/test/assets/media/tx3g/initialization_all_defaults diff --git a/testdata/src/test/assets/tx3g/no_subtitle b/testdata/src/test/assets/media/tx3g/no_subtitle similarity index 100% rename from testdata/src/test/assets/tx3g/no_subtitle rename to testdata/src/test/assets/media/tx3g/no_subtitle diff --git a/testdata/src/test/assets/tx3g/sample_just_text b/testdata/src/test/assets/media/tx3g/sample_just_text similarity index 100% rename from testdata/src/test/assets/tx3g/sample_just_text rename to testdata/src/test/assets/media/tx3g/sample_just_text diff --git a/testdata/src/test/assets/tx3g/sample_utf16_be_no_styl b/testdata/src/test/assets/media/tx3g/sample_utf16_be_no_styl similarity index 100% rename from testdata/src/test/assets/tx3g/sample_utf16_be_no_styl rename to testdata/src/test/assets/media/tx3g/sample_utf16_be_no_styl diff --git a/testdata/src/test/assets/tx3g/sample_utf16_le_no_styl b/testdata/src/test/assets/media/tx3g/sample_utf16_le_no_styl similarity index 100% rename from testdata/src/test/assets/tx3g/sample_utf16_le_no_styl rename to testdata/src/test/assets/media/tx3g/sample_utf16_le_no_styl diff --git a/testdata/src/test/assets/tx3g/sample_with_multiple_styl b/testdata/src/test/assets/media/tx3g/sample_with_multiple_styl similarity index 100% rename from testdata/src/test/assets/tx3g/sample_with_multiple_styl rename to testdata/src/test/assets/media/tx3g/sample_with_multiple_styl diff --git a/testdata/src/test/assets/tx3g/sample_with_other_extension b/testdata/src/test/assets/media/tx3g/sample_with_other_extension similarity index 100% rename from testdata/src/test/assets/tx3g/sample_with_other_extension rename to testdata/src/test/assets/media/tx3g/sample_with_other_extension diff --git a/testdata/src/test/assets/tx3g/sample_with_styl b/testdata/src/test/assets/media/tx3g/sample_with_styl similarity index 100% rename from testdata/src/test/assets/tx3g/sample_with_styl rename to testdata/src/test/assets/media/tx3g/sample_with_styl diff --git a/testdata/src/test/assets/tx3g/sample_with_styl_all_defaults b/testdata/src/test/assets/media/tx3g/sample_with_styl_all_defaults similarity index 100% rename from testdata/src/test/assets/tx3g/sample_with_styl_all_defaults rename to testdata/src/test/assets/media/tx3g/sample_with_styl_all_defaults diff --git a/testdata/src/test/assets/tx3g/sample_with_tbox b/testdata/src/test/assets/media/tx3g/sample_with_tbox similarity index 100% rename from testdata/src/test/assets/tx3g/sample_with_tbox rename to testdata/src/test/assets/media/tx3g/sample_with_tbox diff --git a/testdata/src/test/assets/vp9/bear-vp9-odd-dimensions.webm b/testdata/src/test/assets/media/vp9/bear-vp9-odd-dimensions.webm similarity index 100% rename from testdata/src/test/assets/vp9/bear-vp9-odd-dimensions.webm rename to testdata/src/test/assets/media/vp9/bear-vp9-odd-dimensions.webm diff --git a/testdata/src/test/assets/vp9/bear-vp9.webm b/testdata/src/test/assets/media/vp9/bear-vp9.webm similarity index 100% rename from testdata/src/test/assets/vp9/bear-vp9.webm rename to testdata/src/test/assets/media/vp9/bear-vp9.webm diff --git a/testdata/src/test/assets/vp9/invalid-bitstream.webm b/testdata/src/test/assets/media/vp9/invalid-bitstream.webm similarity index 100% rename from testdata/src/test/assets/vp9/invalid-bitstream.webm rename to testdata/src/test/assets/media/vp9/invalid-bitstream.webm diff --git a/testdata/src/test/assets/vp9/roadtrip-vp92-10bit.webm b/testdata/src/test/assets/media/vp9/roadtrip-vp92-10bit.webm similarity index 100% rename from testdata/src/test/assets/vp9/roadtrip-vp92-10bit.webm rename to testdata/src/test/assets/media/vp9/roadtrip-vp92-10bit.webm diff --git a/testdata/src/test/assets/wav/sample.wav b/testdata/src/test/assets/media/wav/sample.wav similarity index 100% rename from testdata/src/test/assets/wav/sample.wav rename to testdata/src/test/assets/media/wav/sample.wav diff --git a/testdata/src/test/assets/wav/sample_ima_adpcm.wav b/testdata/src/test/assets/media/wav/sample_ima_adpcm.wav similarity index 100% rename from testdata/src/test/assets/wav/sample_ima_adpcm.wav rename to testdata/src/test/assets/media/wav/sample_ima_adpcm.wav diff --git a/testdata/src/test/assets/wav/sample_with_trailing_bytes.wav b/testdata/src/test/assets/media/wav/sample_with_trailing_bytes.wav similarity index 100% rename from testdata/src/test/assets/wav/sample_with_trailing_bytes.wav rename to testdata/src/test/assets/media/wav/sample_with_trailing_bytes.wav diff --git a/testdata/src/test/assets/webvtt/empty b/testdata/src/test/assets/media/webvtt/empty similarity index 100% rename from testdata/src/test/assets/webvtt/empty rename to testdata/src/test/assets/media/webvtt/empty diff --git a/testdata/src/test/assets/webvtt/typical b/testdata/src/test/assets/media/webvtt/typical similarity index 100% rename from testdata/src/test/assets/webvtt/typical rename to testdata/src/test/assets/media/webvtt/typical diff --git a/testdata/src/test/assets/webvtt/typical_with_bad_timestamps b/testdata/src/test/assets/media/webvtt/typical_with_bad_timestamps similarity index 100% rename from testdata/src/test/assets/webvtt/typical_with_bad_timestamps rename to testdata/src/test/assets/media/webvtt/typical_with_bad_timestamps diff --git a/testdata/src/test/assets/webvtt/typical_with_comments b/testdata/src/test/assets/media/webvtt/typical_with_comments similarity index 100% rename from testdata/src/test/assets/webvtt/typical_with_comments rename to testdata/src/test/assets/media/webvtt/typical_with_comments diff --git a/testdata/src/test/assets/webvtt/typical_with_identifiers b/testdata/src/test/assets/media/webvtt/typical_with_identifiers similarity index 100% rename from testdata/src/test/assets/webvtt/typical_with_identifiers rename to testdata/src/test/assets/media/webvtt/typical_with_identifiers diff --git a/testdata/src/test/assets/webvtt/with_bad_cue_header b/testdata/src/test/assets/media/webvtt/with_bad_cue_header similarity index 100% rename from testdata/src/test/assets/webvtt/with_bad_cue_header rename to testdata/src/test/assets/media/webvtt/with_bad_cue_header diff --git a/testdata/src/test/assets/webvtt/with_bom b/testdata/src/test/assets/media/webvtt/with_bom similarity index 100% rename from testdata/src/test/assets/webvtt/with_bom rename to testdata/src/test/assets/media/webvtt/with_bom diff --git a/testdata/src/test/assets/webvtt/with_css_complex_selectors b/testdata/src/test/assets/media/webvtt/with_css_complex_selectors similarity index 100% rename from testdata/src/test/assets/webvtt/with_css_complex_selectors rename to testdata/src/test/assets/media/webvtt/with_css_complex_selectors diff --git a/testdata/src/test/assets/webvtt/with_css_styles b/testdata/src/test/assets/media/webvtt/with_css_styles similarity index 100% rename from testdata/src/test/assets/webvtt/with_css_styles rename to testdata/src/test/assets/media/webvtt/with_css_styles diff --git a/testdata/src/test/assets/webvtt/with_css_text_combine_upright b/testdata/src/test/assets/media/webvtt/with_css_text_combine_upright similarity index 100% rename from testdata/src/test/assets/webvtt/with_css_text_combine_upright rename to testdata/src/test/assets/media/webvtt/with_css_text_combine_upright diff --git a/testdata/src/test/assets/webvtt/with_overlapping_timestamps b/testdata/src/test/assets/media/webvtt/with_overlapping_timestamps similarity index 100% rename from testdata/src/test/assets/webvtt/with_overlapping_timestamps rename to testdata/src/test/assets/media/webvtt/with_overlapping_timestamps diff --git a/testdata/src/test/assets/webvtt/with_positioning b/testdata/src/test/assets/media/webvtt/with_positioning similarity index 100% rename from testdata/src/test/assets/webvtt/with_positioning rename to testdata/src/test/assets/media/webvtt/with_positioning diff --git a/testdata/src/test/assets/webvtt/with_rubies b/testdata/src/test/assets/media/webvtt/with_rubies similarity index 100% rename from testdata/src/test/assets/webvtt/with_rubies rename to testdata/src/test/assets/media/webvtt/with_rubies diff --git a/testdata/src/test/assets/webvtt/with_tags b/testdata/src/test/assets/media/webvtt/with_tags similarity index 100% rename from testdata/src/test/assets/webvtt/with_tags rename to testdata/src/test/assets/media/webvtt/with_tags diff --git a/testdata/src/test/assets/webvtt/with_vertical b/testdata/src/test/assets/media/webvtt/with_vertical similarity index 100% rename from testdata/src/test/assets/webvtt/with_vertical rename to testdata/src/test/assets/media/webvtt/with_vertical diff --git a/testdata/src/test/assets/webvtt/with_x-timestamp-map_header b/testdata/src/test/assets/media/webvtt/with_x-timestamp-map_header similarity index 100% rename from testdata/src/test/assets/webvtt/with_x-timestamp-map_header rename to testdata/src/test/assets/media/webvtt/with_x-timestamp-map_header diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java index c396e41f4a..73664b44a8 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.testutil; +import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.common.truth.Truth.assertThat; import android.content.Context; @@ -29,6 +30,7 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; +import com.google.common.base.Joiner; import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -98,7 +100,12 @@ public final class ExtractorAsserts { /** * The prefix prepended to the dump files path. If not set, the path to the source data will be - * used. + * used to derive this assuming the following path structure: + * + *
    + *
  • Media: {@code media/$mediapath} + *
  • Dumps: {@code extractordumps/$mediapath} + *
*/ @Nullable public final String dumpFilesPrefix; @@ -238,7 +245,8 @@ public final class ExtractorAsserts { * by {@code simulationConfig}. * *

The output of the extractor is compared against prerecorded dump files whose names are - * derived from the {@code file} parameter. + * derived from the {@code file} parameter as specified in the docs for {@link + * AssertionConfig#dumpFilesPrefix}. * * @param factory An {@link ExtractorFactory} which creates instances of the {@link Extractor} * class which is to be tested. @@ -274,8 +282,24 @@ public final class ExtractorAsserts { // Assert output. Context context = ApplicationProvider.getApplicationContext(); byte[] fileData = TestUtil.getByteArray(context, file); - String dumpFilesPrefix = - assertionConfig.dumpFilesPrefix != null ? assertionConfig.dumpFilesPrefix : file; + String dumpFilesPrefix; + if (assertionConfig.dumpFilesPrefix != null) { + dumpFilesPrefix = assertionConfig.dumpFilesPrefix; + } else { + String[] path = file.split("/"); + checkState( + path.length > 0 && path[0].equals("media"), + "AssertionConfig.dumpFilesPrefix == null but file isn't in a media/ sub-directory.\n" + + "Expected : 'media/'\n" + + "Found : '" + + file + + "'\n" + + "You need to set AssertionConfig.dumpFilesPrefix explicitly if your media and dump" + + " file aren't located in the expected structure (see docs on" + + " AssertionConfig.dumpFilesPrefix)"); + path[0] = "extractordumps"; + dumpFilesPrefix = Joiner.on('/').join(path); + } assertOutput( factory.create(), dumpFilesPrefix, @@ -404,7 +428,7 @@ public final class ExtractorAsserts { readResult = extractor.read(input, seekPositionHolder); if (readResult == Extractor.RESULT_SEEK) { long seekPosition = seekPositionHolder.position; - Assertions.checkState(0 <= seekPosition && seekPosition <= Integer.MAX_VALUE); + checkState(0 <= seekPosition && seekPosition <= Integer.MAX_VALUE); input.setPosition((int) seekPosition); } } catch (SimulatedIOException e) {