From d356d88c4fdf68be3476ae749f67bd112c70ca34 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 11 Dec 2023 11:02:44 -0800 Subject: [PATCH] Improve test dump output for role and selection flags PiperOrigin-RevId: 589878576 --- .../java/androidx/media3/common/Format.java | 62 +-------------- .../androidx/media3/common/util/Util.java | 77 +++++++++++++++++++ .../androidx/media3/common/util/UtilTest.java | 17 ++++ ...ixel-motion-photo-2-hevc-tracks.jpg.0.dump | 4 +- ...ixel-motion-photo-2-hevc-tracks.jpg.1.dump | 4 +- ...ixel-motion-photo-2-hevc-tracks.jpg.2.dump | 4 +- ...ixel-motion-photo-2-hevc-tracks.jpg.3.dump | 4 +- ...on-photo-jfif-segment-shortened.jpg.0.dump | 2 +- ...on-photo-jfif-segment-shortened.jpg.1.dump | 2 +- ...on-photo-jfif-segment-shortened.jpg.2.dump | 2 +- ...on-photo-jfif-segment-shortened.jpg.3.dump | 2 +- .../extractordumps/mkv/full_blocks.mkv.0.dump | 2 +- .../extractordumps/mkv/full_blocks.mkv.1.dump | 2 +- .../extractordumps/mkv/full_blocks.mkv.2.dump | 2 +- .../extractordumps/mkv/full_blocks.mkv.3.dump | 2 +- .../mkv/full_blocks.mkv.unknown_length.dump | 2 +- .../extractordumps/mkv/sample.mkv.0.dump | 4 +- .../extractordumps/mkv/sample.mkv.1.dump | 4 +- .../extractordumps/mkv/sample.mkv.2.dump | 4 +- .../extractordumps/mkv/sample.mkv.3.dump | 4 +- .../mkv/sample.mkv.unknown_length.dump | 4 +- ...le_with_htc_rotation_track_name.mkv.0.dump | 4 +- ...le_with_htc_rotation_track_name.mkv.1.dump | 4 +- ...le_with_htc_rotation_track_name.mkv.2.dump | 4 +- ...le_with_htc_rotation_track_name.mkv.3.dump | 4 +- ...otation_track_name.mkv.unknown_length.dump | 4 +- ...sample_with_null_terminated_srt.mkv.0.dump | 6 +- ...sample_with_null_terminated_srt.mkv.1.dump | 6 +- ...sample_with_null_terminated_srt.mkv.2.dump | 6 +- ...sample_with_null_terminated_srt.mkv.3.dump | 6 +- ...ull_terminated_srt.mkv.unknown_length.dump | 6 +- ...h_null_terminated_ssa_subtitles.mkv.0.dump | 6 +- ...h_null_terminated_ssa_subtitles.mkv.1.dump | 6 +- ...h_null_terminated_ssa_subtitles.mkv.2.dump | 6 +- ...h_null_terminated_ssa_subtitles.mkv.3.dump | 6 +- ...ated_ssa_subtitles.mkv.unknown_length.dump | 6 +- ...h_null_terminated_vtt_subtitles.mkv.0.dump | 6 +- ...h_null_terminated_vtt_subtitles.mkv.1.dump | 6 +- ...h_null_terminated_vtt_subtitles.mkv.2.dump | 6 +- ...h_null_terminated_vtt_subtitles.mkv.3.dump | 6 +- ...ated_vtt_subtitles.mkv.unknown_length.dump | 6 +- .../mkv/sample_with_opus_audio.mkv.0.dump | 2 +- .../mkv/sample_with_opus_audio.mkv.1.dump | 2 +- .../mkv/sample_with_opus_audio.mkv.2.dump | 2 +- .../mkv/sample_with_opus_audio.mkv.3.dump | 2 +- ...le_with_opus_audio.mkv.unknown_length.dump | 2 +- .../sample_with_overlapping_srt.mkv.0.dump | 6 +- .../sample_with_overlapping_srt.mkv.1.dump | 6 +- .../sample_with_overlapping_srt.mkv.2.dump | 6 +- .../sample_with_overlapping_srt.mkv.3.dump | 6 +- ...th_overlapping_srt.mkv.unknown_length.dump | 6 +- ..._with_overlapping_ssa_subtitles.mkv.0.dump | 6 +- ..._with_overlapping_ssa_subtitles.mkv.1.dump | 6 +- ..._with_overlapping_ssa_subtitles.mkv.2.dump | 6 +- ..._with_overlapping_ssa_subtitles.mkv.3.dump | 6 +- ...ping_ssa_subtitles.mkv.unknown_length.dump | 6 +- .../mkv/sample_with_srt.mkv.0.dump | 6 +- .../mkv/sample_with_srt.mkv.1.dump | 6 +- .../mkv/sample_with_srt.mkv.2.dump | 6 +- .../mkv/sample_with_srt.mkv.3.dump | 6 +- .../sample_with_srt.mkv.unknown_length.dump | 6 +- .../mkv/sample_with_ssa_subtitles.mkv.0.dump | 6 +- .../mkv/sample_with_ssa_subtitles.mkv.1.dump | 6 +- .../mkv/sample_with_ssa_subtitles.mkv.2.dump | 6 +- .../mkv/sample_with_ssa_subtitles.mkv.3.dump | 6 +- ...with_ssa_subtitles.mkv.unknown_length.dump | 6 +- .../mkv/sample_with_vorbis_audio.mkv.0.dump | 4 +- .../mkv/sample_with_vorbis_audio.mkv.1.dump | 4 +- .../mkv/sample_with_vorbis_audio.mkv.2.dump | 4 +- .../mkv/sample_with_vorbis_audio.mkv.3.dump | 4 +- ..._with_vorbis_audio.mkv.unknown_length.dump | 4 +- .../mkv/sample_with_vtt_subtitles.mkv.0.dump | 6 +- .../mkv/sample_with_vtt_subtitles.mkv.1.dump | 6 +- .../mkv/sample_with_vtt_subtitles.mkv.2.dump | 6 +- .../mkv/sample_with_vtt_subtitles.mkv.3.dump | 6 +- ...with_vtt_subtitles.mkv.unknown_length.dump | 6 +- .../subsample_encrypted_altref.webm.0.dump | 2 +- ..._encrypted_altref.webm.unknown_length.dump | 2 +- .../subsample_encrypted_noaltref.webm.0.dump | 2 +- ...ncrypted_noaltref.webm.unknown_length.dump | 2 +- .../overlapping_srt_in_mkv.0.dump | 6 +- .../overlapping_srt_in_mkv.1.dump | 6 +- .../overlapping_srt_in_mkv.2.dump | 6 +- .../overlapping_srt_in_mkv.3.dump | 6 +- ...overlapping_srt_in_mkv.unknown_length.dump | 6 +- .../overlapping_ssa_in_mkv.0.dump | 6 +- .../overlapping_ssa_in_mkv.1.dump | 6 +- .../overlapping_ssa_in_mkv.2.dump | 6 +- .../overlapping_ssa_in_mkv.3.dump | 6 +- ...overlapping_ssa_in_mkv.unknown_length.dump | 6 +- .../subtitle_transcoding/srt_in_mkv.0.dump | 6 +- .../subtitle_transcoding/srt_in_mkv.1.dump | 6 +- .../subtitle_transcoding/srt_in_mkv.2.dump | 6 +- .../subtitle_transcoding/srt_in_mkv.3.dump | 6 +- .../srt_in_mkv.unknown_length.dump | 6 +- .../subtitle_transcoding/ssa_in_mkv.0.dump | 6 +- .../subtitle_transcoding/ssa_in_mkv.1.dump | 6 +- .../subtitle_transcoding/ssa_in_mkv.2.dump | 6 +- .../subtitle_transcoding/ssa_in_mkv.3.dump | 6 +- .../ssa_in_mkv.unknown_length.dump | 6 +- .../mkv/sample_with_srt.mkv/noaudio.dump | 2 +- .../media3/test/utils/DumpableFormat.java | 13 +++- 102 files changed, 344 insertions(+), 299 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java index e5dba212e68..fbaad9b1445 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Format.java +++ b/libraries/common/src/main/java/androidx/media3/common/Format.java @@ -1278,71 +1278,13 @@ public static String toLogString(@Nullable Format format) { builder.append(", label=").append(format.label); } if (format.selectionFlags != 0) { - List selectionFlags = new ArrayList<>(); - // LINT.IfChange(selection_flags) - if ((format.selectionFlags & C.SELECTION_FLAG_AUTOSELECT) != 0) { - selectionFlags.add("auto"); - } - if ((format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0) { - selectionFlags.add("default"); - } - if ((format.selectionFlags & C.SELECTION_FLAG_FORCED) != 0) { - selectionFlags.add("forced"); - } builder.append(", selectionFlags=["); - Joiner.on(',').appendTo(builder, selectionFlags); + Joiner.on(',').appendTo(builder, Util.getSelectionFlagStrings(format.selectionFlags)); builder.append("]"); } if (format.roleFlags != 0) { - // LINT.IfChange(role_flags) - List roleFlags = new ArrayList<>(); - if ((format.roleFlags & C.ROLE_FLAG_MAIN) != 0) { - roleFlags.add("main"); - } - if ((format.roleFlags & C.ROLE_FLAG_ALTERNATE) != 0) { - roleFlags.add("alt"); - } - if ((format.roleFlags & C.ROLE_FLAG_SUPPLEMENTARY) != 0) { - roleFlags.add("supplementary"); - } - if ((format.roleFlags & C.ROLE_FLAG_COMMENTARY) != 0) { - roleFlags.add("commentary"); - } - if ((format.roleFlags & C.ROLE_FLAG_DUB) != 0) { - roleFlags.add("dub"); - } - if ((format.roleFlags & C.ROLE_FLAG_EMERGENCY) != 0) { - roleFlags.add("emergency"); - } - if ((format.roleFlags & C.ROLE_FLAG_CAPTION) != 0) { - roleFlags.add("caption"); - } - if ((format.roleFlags & C.ROLE_FLAG_SUBTITLE) != 0) { - roleFlags.add("subtitle"); - } - if ((format.roleFlags & C.ROLE_FLAG_SIGN) != 0) { - roleFlags.add("sign"); - } - if ((format.roleFlags & C.ROLE_FLAG_DESCRIBES_VIDEO) != 0) { - roleFlags.add("describes-video"); - } - if ((format.roleFlags & C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND) != 0) { - roleFlags.add("describes-music"); - } - if ((format.roleFlags & C.ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY) != 0) { - roleFlags.add("enhanced-intelligibility"); - } - if ((format.roleFlags & C.ROLE_FLAG_TRANSCRIBES_DIALOG) != 0) { - roleFlags.add("transcribes-dialog"); - } - if ((format.roleFlags & C.ROLE_FLAG_EASY_TO_READ) != 0) { - roleFlags.add("easy-read"); - } - if ((format.roleFlags & C.ROLE_FLAG_TRICK_PLAY) != 0) { - roleFlags.add("trick-play"); - } builder.append(", roleFlags=["); - Joiner.on(',').appendTo(builder, roleFlags); + Joiner.on(',').appendTo(builder, Util.getRoleFlagStrings(format.roleFlags)); builder.append("]"); } return builder.toString(); diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index 15b43939c44..27ee099eb9d 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -110,6 +110,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collections; @@ -3157,6 +3158,82 @@ public static String getTrackTypeString(@C.TrackType int trackType) { } } + /** + * Returns a list of strings representing the {@link C.SelectionFlags} values present in {@code + * selectionFlags}. + */ + @UnstableApi + public static List getSelectionFlagStrings(@C.SelectionFlags int selectionFlags) { + List result = new ArrayList<>(); + // LINT.IfChange(selection_flags) + if ((selectionFlags & C.SELECTION_FLAG_AUTOSELECT) != 0) { + result.add("auto"); + } + if ((selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0) { + result.add("default"); + } + if ((selectionFlags & C.SELECTION_FLAG_FORCED) != 0) { + result.add("forced"); + } + return result; + } + + /** + * Returns a list of strings representing the {@link C.RoleFlags} values present in {@code + * roleFlags}. + */ + @UnstableApi + public static List getRoleFlagStrings(@C.RoleFlags int roleFlags) { + List result = new ArrayList<>(); + // LINT.IfChange(role_flags) + if ((roleFlags & C.ROLE_FLAG_MAIN) != 0) { + result.add("main"); + } + if ((roleFlags & C.ROLE_FLAG_ALTERNATE) != 0) { + result.add("alt"); + } + if ((roleFlags & C.ROLE_FLAG_SUPPLEMENTARY) != 0) { + result.add("supplementary"); + } + if ((roleFlags & C.ROLE_FLAG_COMMENTARY) != 0) { + result.add("commentary"); + } + if ((roleFlags & C.ROLE_FLAG_DUB) != 0) { + result.add("dub"); + } + if ((roleFlags & C.ROLE_FLAG_EMERGENCY) != 0) { + result.add("emergency"); + } + if ((roleFlags & C.ROLE_FLAG_CAPTION) != 0) { + result.add("caption"); + } + if ((roleFlags & C.ROLE_FLAG_SUBTITLE) != 0) { + result.add("subtitle"); + } + if ((roleFlags & C.ROLE_FLAG_SIGN) != 0) { + result.add("sign"); + } + if ((roleFlags & C.ROLE_FLAG_DESCRIBES_VIDEO) != 0) { + result.add("describes-video"); + } + if ((roleFlags & C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND) != 0) { + result.add("describes-music"); + } + if ((roleFlags & C.ROLE_FLAG_ENHANCED_DIALOG_INTELLIGIBILITY) != 0) { + result.add("enhanced-intelligibility"); + } + if ((roleFlags & C.ROLE_FLAG_TRANSCRIBES_DIALOG) != 0) { + result.add("transcribes-dialog"); + } + if ((roleFlags & C.ROLE_FLAG_EASY_TO_READ) != 0) { + result.add("easy-read"); + } + if ((roleFlags & C.ROLE_FLAG_TRICK_PLAY) != 0) { + result.add("trick-play"); + } + return result; + } + /** * Returns the current time in milliseconds since the epoch. * diff --git a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java index 01c9ca1fd0f..5faa7b4389c 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/util/UtilTest.java @@ -55,6 +55,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Formatter; +import java.util.List; import java.util.NoSuchElementException; import java.util.Random; import java.util.concurrent.ExecutionException; @@ -1507,6 +1508,22 @@ public void transformFutureAsync_withSuccessfulTransform_returnsTransformedResul assertThat(outputFuture.get()).isEqualTo(expectedOutput); } + @Test + public void getSelectionFlagStrings() { + List selectionFlags = + Util.getSelectionFlagStrings(C.SELECTION_FLAG_AUTOSELECT | C.SELECTION_FLAG_FORCED); + + assertThat(selectionFlags).containsExactly("auto", "forced"); + } + + @Test + public void getRoleFlagStrings() { + List roleFlags = + Util.getRoleFlagStrings(C.ROLE_FLAG_DESCRIBES_MUSIC_AND_SOUND | C.ROLE_FLAG_EASY_TO_READ); + + assertThat(roleFlags).containsExactly("describes-music", "easy-read"); + } + private static void assertEscapeUnescapeFileName(String fileName, String escapedFileName) { assertThat(escapeFileName(fileName)).isEqualTo(escapedFileName); assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName); diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump index d80f37b49d0..9b9fb56ecb6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump @@ -24,7 +24,7 @@ track 0: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash C508E2F1 @@ -277,7 +277,7 @@ track 1: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 2 + roleFlags = [alt] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash 1924973 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump index 2c9e6410d08..101c1e62ced 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump @@ -24,7 +24,7 @@ track 0: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash C508E2F1 @@ -221,7 +221,7 @@ track 1: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 2 + roleFlags = [alt] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash 1924973 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump index 70aae0577c2..43a2b2db0d0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump @@ -24,7 +24,7 @@ track 0: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash C508E2F1 @@ -137,7 +137,7 @@ track 1: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 2 + roleFlags = [alt] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash 1924973 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump index cbb4657762b..1769eaa341a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump @@ -24,7 +24,7 @@ track 0: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash C508E2F1 @@ -53,7 +53,7 @@ track 1: colorTransfer = 3 lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 2 + roleFlags = [alt] metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000] initializationData: data = length 82, hash 1924973 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump index a412e89b79e..e01422f04a9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump @@ -20,7 +20,7 @@ track 0: colorInfo: lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump index a412e89b79e..e01422f04a9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump @@ -20,7 +20,7 @@ track 0: colorInfo: lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump index a412e89b79e..e01422f04a9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump @@ -20,7 +20,7 @@ track 0: colorInfo: lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump index a412e89b79e..e01422f04a9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump @@ -20,7 +20,7 @@ track 0: colorInfo: lumaBitdepth = 8 chromaBitdepth = 8 - roleFlags = 1 + roleFlags = [main] metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump index 3afc87eed20..27bfe2f3872 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump @@ -12,7 +12,7 @@ track 1: format 0: id = 1 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump index 3afc87eed20..27bfe2f3872 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump @@ -12,7 +12,7 @@ track 1: format 0: id = 1 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump index 3afc87eed20..27bfe2f3872 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump @@ -12,7 +12,7 @@ track 1: format 0: id = 1 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump index 3afc87eed20..27bfe2f3872 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump @@ -12,7 +12,7 @@ track 1: format 0: id = 1 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump index 3afc87eed20..27bfe2f3872 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump @@ -12,7 +12,7 @@ track 1: format 0: id = 1 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump index 61daa408d82..d31f181dd01 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump index 1bd0b7468de..749aee4faa3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -108,7 +108,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 408000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump index 7c862c73025..d7bbab94596 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -64,7 +64,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 791000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump index 09f073f8a89..f99f632e2f7 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -28,7 +28,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 1035000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump index 61daa408d82..d31f181dd01 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump index 6d84df8b0c4..96da57f7bd5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump @@ -16,7 +16,7 @@ track 1: width = 1080 height = 720 rotationDegrees = 90 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump index 6d84df8b0c4..96da57f7bd5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump @@ -16,7 +16,7 @@ track 1: width = 1080 height = 720 rotationDegrees = 90 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump index 6d84df8b0c4..96da57f7bd5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump @@ -16,7 +16,7 @@ track 1: width = 1080 height = 720 rotationDegrees = 90 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump index 6d84df8b0c4..96da57f7bd5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump @@ -16,7 +16,7 @@ track 1: width = 1080 height = 720 rotationDegrees = 90 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump index 6d84df8b0c4..96da57f7bd5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump @@ -16,7 +16,7 @@ track 1: width = 1080 height = 720 rotationDegrees = 90 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump index 24d9ce77123..3c09609d183 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump index 24d9ce77123..3c09609d183 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump index 24d9ce77123..3c09609d183 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump index 24d9ce77123..3c09609d183 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump index 24d9ce77123..3c09609d183 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump index 3f99d097585..9ece878f1bd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump index 3f99d097585..9ece878f1bd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump index 3f99d097585..9ece878f1bd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump index 3f99d097585..9ece878f1bd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump index 3f99d097585..9ece878f1bd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump index 68b4fdada97..70564176a42 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump index 68b4fdada97..70564176a42 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump index 68b4fdada97..70564176a42 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump index 68b4fdada97..70564176a42 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump index 68b4fdada97..70564176a42 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump index 162d49f061f..6c211ba544b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump @@ -15,7 +15,7 @@ track 1: maxInputSize = 5760 channelCount = 1 sampleRate = 48000 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 19, hash CB9E23BC diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump index 162d49f061f..6c211ba544b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump @@ -15,7 +15,7 @@ track 1: maxInputSize = 5760 channelCount = 1 sampleRate = 48000 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 19, hash CB9E23BC diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump index 162d49f061f..6c211ba544b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump @@ -15,7 +15,7 @@ track 1: maxInputSize = 5760 channelCount = 1 sampleRate = 48000 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 19, hash CB9E23BC diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump index 162d49f061f..6c211ba544b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump @@ -15,7 +15,7 @@ track 1: maxInputSize = 5760 channelCount = 1 sampleRate = 48000 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 19, hash CB9E23BC diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump index 162d49f061f..6c211ba544b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: maxInputSize = 5760 channelCount = 1 sampleRate = 48000 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 19, hash CB9E23BC diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump index 9b1477a5d03..a3112d6a62b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump index 9b1477a5d03..a3112d6a62b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump index 9b1477a5d03..a3112d6a62b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump index 9b1477a5d03..a3112d6a62b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump index 9b1477a5d03..a3112d6a62b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump index 2dee994ce7f..83704f6a5b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump index 2dee994ce7f..83704f6a5b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump index 2dee994ce7f..83704f6a5b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump index 2dee994ce7f..83704f6a5b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump index 2dee994ce7f..83704f6a5b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump index a5548a90cf0..e2c047c404c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump index a5548a90cf0..e2c047c404c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump index a5548a90cf0..e2c047c404c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump index a5548a90cf0..e2c047c404c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump index a5548a90cf0..e2c047c404c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump index 93b557015c6..df76c825d38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump index 93b557015c6..df76c825d38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump index 93b557015c6..df76c825d38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump index 93b557015c6..df76c825d38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump index 93b557015c6..df76c825d38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump index b3cfcbe766e..2c310f598bc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: maxInputSize = 8192 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash 71A77B76 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump index b3cfcbe766e..2c310f598bc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: maxInputSize = 8192 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash 71A77B76 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump index b3cfcbe766e..2c310f598bc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: maxInputSize = 8192 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash 71A77B76 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump index b3cfcbe766e..2c310f598bc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: maxInputSize = 8192 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash 71A77B76 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump index b3cfcbe766e..2c310f598bc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -149,7 +149,7 @@ track 2: maxInputSize = 8192 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash 71A77B76 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump index e79174312b5..d745bd3c52c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump index e79174312b5..d745bd3c52c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump index e79174312b5..d745bd3c52c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump index e79174312b5..d745bd3c52c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump index e79174312b5..d745bd3c52c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -272,7 +272,7 @@ track 3: format 0: id = 3 sampleMimeType = text/vtt - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump index 303654d721b..c7eb2e7efdc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump @@ -11,7 +11,7 @@ track 1: sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 - selectionFlags = 1 + selectionFlags = [default] language = en drmInitData = 1305012705 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump index 303654d721b..c7eb2e7efdc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump @@ -11,7 +11,7 @@ track 1: sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 - selectionFlags = 1 + selectionFlags = [default] language = en drmInitData = 1305012705 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump index af5a5af9a02..5590cd98c21 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump @@ -11,7 +11,7 @@ track 1: sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 - selectionFlags = 1 + selectionFlags = [default] language = en drmInitData = 1305012705 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump index af5a5af9a02..5590cd98c21 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump @@ -11,7 +11,7 @@ track 1: sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 - selectionFlags = 1 + selectionFlags = [default] language = en drmInitData = 1305012705 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump index 9e670450ef3..da12543d34c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump index 9e670450ef3..da12543d34c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump index 9e670450ef3..da12543d34c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump index 9e670450ef3..da12543d34c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump index 9e670450ef3..da12543d34c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_srt_in_mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 100000 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump index 9b9401f0939..9a1845b16aa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump index 9b9401f0939..9a1845b16aa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump index 9b9401f0939..9a1845b16aa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump index 9b9401f0939..9a1845b16aa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump index 9b9401f0939..9a1845b16aa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/overlapping_ssa_in_mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump index a0c3b4ab9fd..69069591f07 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump index a0c3b4ab9fd..69069591f07 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump index a0c3b4ab9fd..69069591f07 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump index a0c3b4ab9fd..69069591f07 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump index a0c3b4ab9fd..69069591f07 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/srt_in_mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 62000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = application/x-subrip - selectionFlags = 1 + selectionFlags = [default] language = en label = Subs Label sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump index 2f2ddb304c8..81ada8a4404 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.0.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump index 2f2ddb304c8..81ada8a4404 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.1.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump index 2f2ddb304c8..81ada8a4404 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.2.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump index 2f2ddb304c8..81ada8a4404 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.3.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump index 2f2ddb304c8..81ada8a4404 100644 --- a/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/subtitle_transcoding/ssa_in_mkv.unknown_length.dump @@ -15,7 +15,7 @@ track 1: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 @@ -148,7 +148,7 @@ track 2: sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 - selectionFlags = 1 + selectionFlags = [default] language = und sample 0: time = 129000 @@ -273,7 +273,7 @@ track 3: id = 3 sampleMimeType = application/x-media3-cues codecs = text/x-ssa - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 90, hash A5E21974 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump index b40c0439fed..d4ddb7241e8 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump @@ -4,7 +4,7 @@ format video: codecs = avc1.640034 width = 1080 height = 720 - selectionFlags = 1 + selectionFlags = [default] language = und initializationData: data = length 30, hash F6F3D010 diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java index 72acc27a666..13f4453d4da 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java @@ -88,8 +88,17 @@ public void dump(Dumper dumper) { addIfNonDefault( dumper, "subsampleOffsetUs", format, DEFAULT_FORMAT, format -> format.subsampleOffsetUs); addIfNonDefault( - dumper, "selectionFlags", format, DEFAULT_FORMAT, format -> format.selectionFlags); - addIfNonDefault(dumper, "roleFlags", format, DEFAULT_FORMAT, format -> format.roleFlags); + dumper, + "selectionFlags", + format, + DEFAULT_FORMAT, + format -> Util.getSelectionFlagStrings(format.selectionFlags)); + addIfNonDefault( + dumper, + "roleFlags", + format, + DEFAULT_FORMAT, + format -> Util.getRoleFlagStrings(format.roleFlags)); addIfNonDefault(dumper, "language", format, DEFAULT_FORMAT, format -> format.language); addIfNonDefault(dumper, "label", format, DEFAULT_FORMAT, format -> format.label); if (format.drmInitData != null) {