From ba8f55694a8db873e9c1cb9c67ba479ceebc99a8 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 9 Jan 2024 10:25:02 -0800 Subject: [PATCH] Set PCM encoding in Flac extractor The extractor knows the PCM encoding of the losslessly encoded data in the samples and should set it in the Format to allow downstream components to use this information. PiperOrigin-RevId: 596974863 --- .../main/java/androidx/media3/extractor/FlacStreamMetadata.java | 1 + .../src/test/assets/extractordumps/flac/bear_flac.0.dump | 1 + .../src/test/assets/extractordumps/flac/bear_flac.1.dump | 1 + .../src/test/assets/extractordumps/flac/bear_flac.2.dump | 1 + .../src/test/assets/extractordumps/flac/bear_flac.3.dump | 1 + .../assets/extractordumps/flac/bear_flac.unknown_length.dump | 1 + .../extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump | 1 + .../extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump | 1 + .../extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump | 1 + .../extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump | 1 + .../flac/bear_no_min_max_frame_size_flac.unknown_length.dump | 1 + .../assets/extractordumps/flac/bear_no_num_samples_flac.0.dump | 1 + .../flac/bear_no_num_samples_flac.unknown_length.dump | 1 + .../flac/bear_no_seek_table_no_num_samples_flac.0.dump | 1 + .../bear_no_seek_table_no_num_samples_flac.unknown_length.dump | 1 + .../extractordumps/flac/bear_one_metadata_block_flac.0.dump | 1 + .../extractordumps/flac/bear_one_metadata_block_flac.1.dump | 1 + .../extractordumps/flac/bear_one_metadata_block_flac.2.dump | 1 + .../extractordumps/flac/bear_one_metadata_block_flac.3.dump | 1 + .../flac/bear_one_metadata_block_flac.unknown_length.dump | 1 + .../extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump | 1 + .../extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump | 1 + .../extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump | 1 + .../extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump | 1 + .../flac/bear_uncommon_sample_rate_flac.unknown_length.dump | 1 + .../extractordumps/flac/bear_with_id3_disabled_flac.0.dump | 1 + .../extractordumps/flac/bear_with_id3_disabled_flac.1.dump | 1 + .../extractordumps/flac/bear_with_id3_disabled_flac.2.dump | 1 + .../extractordumps/flac/bear_with_id3_disabled_flac.3.dump | 1 + .../flac/bear_with_id3_disabled_flac.unknown_length.dump | 1 + .../assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump | 1 + .../assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump | 1 + .../assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump | 1 + .../assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump | 1 + .../flac/bear_with_id3_enabled_flac.unknown_length.dump | 1 + .../assets/extractordumps/flac/bear_with_picture_flac.0.dump | 1 + .../assets/extractordumps/flac/bear_with_picture_flac.1.dump | 1 + .../assets/extractordumps/flac/bear_with_picture_flac.2.dump | 1 + .../assets/extractordumps/flac/bear_with_picture_flac.3.dump | 1 + .../flac/bear_with_picture_flac.unknown_length.dump | 1 + .../extractordumps/flac/bear_with_vorbis_comments_flac.0.dump | 1 + .../extractordumps/flac/bear_with_vorbis_comments_flac.1.dump | 1 + .../extractordumps/flac/bear_with_vorbis_comments_flac.2.dump | 1 + .../extractordumps/flac/bear_with_vorbis_comments_flac.3.dump | 1 + .../flac/bear_with_vorbis_comments_flac.unknown_length.dump | 1 + .../src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump | 1 + .../src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump | 1 + .../src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump | 1 + .../src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump | 1 + .../assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump | 1 + .../assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump | 1 + .../assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump | 1 + .../assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump | 1 + .../assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump | 1 + .../ogg/bear_flac_noseektable.ogg.unknown_length.dump | 1 + 55 files changed, 55 insertions(+) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/FlacStreamMetadata.java b/libraries/extractor/src/main/java/androidx/media3/extractor/FlacStreamMetadata.java index bf85418310..151e6314ee 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/FlacStreamMetadata.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/FlacStreamMetadata.java @@ -260,6 +260,7 @@ public final class FlacStreamMetadata { .setMaxInputSize(maxInputSize) .setChannelCount(channels) .setSampleRate(sampleRate) + .setPcmEncoding(Util.getPcmEncoding(bitsPerSample)) .setInitializationData(Collections.singletonList(streamMarkerAndInfoBlock)) .setMetadata(metadataWithId3) .build(); diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump index 6b9ba356f4..e1c86d80b5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump index dc636b9837..d6f42c909d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump index 6562202e9d..f3f3968a18 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump index a12d386453..17d4c9bc89 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump index 6b9ba356f4..e1c86d80b5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump index 3a94f57d11..c9e52bed9c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump @@ -13,6 +13,7 @@ track 0: sampleMimeType = audio/flac channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 9218FDB7 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump index a101b03b09..1f138a7949 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump @@ -13,6 +13,7 @@ track 0: sampleMimeType = audio/flac channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 9218FDB7 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump index 6e72772a14..bbf5bb67ab 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump @@ -13,6 +13,7 @@ track 0: sampleMimeType = audio/flac channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 9218FDB7 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump index 566c93cc5b..6e5d13d76d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump @@ -13,6 +13,7 @@ track 0: sampleMimeType = audio/flac channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 9218FDB7 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump index 3a94f57d11..c9e52bed9c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump @@ -13,6 +13,7 @@ track 0: sampleMimeType = audio/flac channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 9218FDB7 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump index 072524eb5e..d1c1adac7b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump @@ -12,6 +12,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 49FA2C21 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump index 072524eb5e..d1c1adac7b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump @@ -12,6 +12,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 49FA2C21 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump index 28aa56e94d..4299f800c8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump @@ -11,6 +11,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 49FA2C21 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump index 28aa56e94d..4299f800c8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump @@ -11,6 +11,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 49FA2C21 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump index 2c97070225..25463f2de4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump index efb7caa6fb..8ff888877b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump index 851efbcd8d..f22042bc01 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump index c699876269..0db79b7e05 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump index 80dd2e9045..133051d653 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump @@ -11,6 +11,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump index 5e197bd2bf..f2cc27968b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 6456 channelCount = 2 sampleRate = 44000 + pcmEncoding = 2 initializationData: data = length 42, hash 7249A1B8 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump index 3845602fa4..6795c576e9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 6456 channelCount = 2 sampleRate = 44000 + pcmEncoding = 2 initializationData: data = length 42, hash 7249A1B8 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump index 1f68fe1905..e755721ec1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 6456 channelCount = 2 sampleRate = 44000 + pcmEncoding = 2 initializationData: data = length 42, hash 7249A1B8 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump index 334f59a1d8..b781fb0c0c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 6456 channelCount = 2 sampleRate = 44000 + pcmEncoding = 2 initializationData: data = length 42, hash 7249A1B8 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump index 5e197bd2bf..f2cc27968b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 6456 channelCount = 2 sampleRate = 44000 + pcmEncoding = 2 initializationData: data = length 42, hash 7249A1B8 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump index 3b3f6611be..9485afee4e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump index 57501d7c1b..cd08be339a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump index c931549e2e..18acf26d5e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump index 1344af155c..fff1d992e7 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump index 3b3f6611be..9485afee4e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump index b6a9c0947d..eea2426078 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: values=[105519843], TIT2: description=null: values=[那么爱你为什么], TPE1: description=null: values=[阿强], TALB: description=null: values=[华丽的外衣], TXXX: description=ID: values=[105519843], APIC: mimeType=image/jpeg, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump index 725c496cec..08ed567d1c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: values=[105519843], TIT2: description=null: values=[那么爱你为什么], TPE1: description=null: values=[阿强], TALB: description=null: values=[华丽的外衣], TXXX: description=ID: values=[105519843], APIC: mimeType=image/jpeg, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump index c310e1ffdc..2d56a17b7e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: values=[105519843], TIT2: description=null: values=[那么爱你为什么], TPE1: description=null: values=[阿强], TALB: description=null: values=[华丽的外衣], TXXX: description=ID: values=[105519843], APIC: mimeType=image/jpeg, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump index 1423a1df78..481fbc45df 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: values=[105519843], TIT2: description=null: values=[那么爱你为什么], TPE1: description=null: values=[阿强], TALB: description=null: values=[华丽的外衣], TXXX: description=ID: values=[105519843], APIC: mimeType=image/jpeg, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump index b6a9c0947d..eea2426078 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[TXXX: description=ID: values=[105519843], TIT2: description=null: values=[那么爱你为什么], TPE1: description=null: values=[阿强], TALB: description=null: values=[华丽的外衣], TXXX: description=ID: values=[105519843], APIC: mimeType=image/jpeg, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump index 57c1816674..cf0e5853e5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump index 90da891d74..84582a2ba8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump index f916615934..f334790544 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump index a3292df552..aacdf4993e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump index 57c1816674..cf0e5853e5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[Picture: mimeType=image/png, description=] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump index d5cdf8cc92..353bd76e08 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump index b3d7f93ada..5931e47492 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump index 58c8fb343f..0f2bc12887 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump index 7f2a7eb16b..3ce2778bab 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump index d5cdf8cc92..353bd76e08 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist] initializationData: data = length 42, hash 83F6895 diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump index f303cda1c0..7c59b0fda1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump index 0d4ab25dbd..89a41b8d70 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump index 9a03aa3292..b2dc3916c5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump index ed1ca0357a..0e4a330e60 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump index f303cda1c0..7c59b0fda1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump index 101b6db26a..b8badab368 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump index f90ed83365..d5ec4be867 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump index 3bef927e79..73ee968169 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump index 1916e6bb84..59e3d3b35d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump @@ -14,6 +14,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump index bc49c37893..475b771e92 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump @@ -11,6 +11,7 @@ track 0: maxInputSize = 5776 channelCount = 2 sampleRate = 48000 + pcmEncoding = 2 initializationData: data = length 42, hash 83F6895 sample 0: