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

Set PCM encoding in Flac extractor

Browse Source 
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
This commit is contained in:
tonihei 2024-01-09 10:25:02 -08:00 committed by Copybara-Service
parent 320dd32be9
commit ba8f55694a
55 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/extractor/src/main/java/androidx/media3/extractor/FlacStreamMetadata.java
View File

@ -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();

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump
View File

@ -13,6 +13,7 @@ track 0:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 9218FDB7
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump
View File

@ -13,6 +13,7 @@ track 0:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 9218FDB7
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump
View File

@ -13,6 +13,7 @@ track 0:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 9218FDB7
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump
View File

@ -13,6 +13,7 @@ track 0:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 9218FDB7
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump
View File

@ -13,6 +13,7 @@ track 0:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 9218FDB7
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump
View File

@ -12,6 +12,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 49FA2C21
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump
View File

@ -12,6 +12,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 49FA2C21
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump
View File

@ -11,6 +11,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 49FA2C21
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump
View File

@ -11,6 +11,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 49FA2C21
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump
View File

@ -11,6 +11,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 6456
channelCount = 2
sampleRate = 44000
pcmEncoding = 2
initializationData:
data = length 42, hash 7249A1B8
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 6456
channelCount = 2
sampleRate = 44000
pcmEncoding = 2
initializationData:
data = length 42, hash 7249A1B8
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 6456
channelCount = 2
sampleRate = 44000
pcmEncoding = 2
initializationData:
data = length 42, hash 7249A1B8
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 6456
channelCount = 2
sampleRate = 44000
pcmEncoding = 2
initializationData:
data = length 42, hash 7249A1B8
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 6456
channelCount = 2
sampleRate = 44000
pcmEncoding = 2
initializationData:
data = length 42, hash 7249A1B8
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.0.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.1.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.2.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.3.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_enabled_flac.unknown_length.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.0.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.1.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.2.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.3.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_picture_flac.unknown_length.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.0.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.1.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.2.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.3.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/flac/bear_with_vorbis_comments_flac.unknown_length.dump
View File

@ -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

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump
View File

@ -14,6 +14,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0:

1
libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.unknown_length.dump
View File

@ -11,6 +11,7 @@ track 0:
maxInputSize = 5776
channelCount = 2
sampleRate = 48000
pcmEncoding = 2
initializationData:
data = length 42, hash 83F6895
sample 0: