Skip to content

Detect FLAC bit depth in mka container #3261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nift4 wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −0
Open

Detect FLAC bit depth in mka container #3261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc13d0
Detect FLAC bit depth in mka container
nift4 May 29, 2026
3e17f22
Update test dump files
icbaker Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2593,6 +2593,10 @@ public void initializeFormat(int trackId) throws ParserException {
case CODEC_ID_FLAC:
mimeType = MimeTypes.AUDIO_FLAC;
initializationData = Collections.singletonList(getCodecPrivate(codecId));
pcmEncoding = Util.getPcmEncoding(audioBitDepth);
if (pcmEncoding == C.ENCODING_INVALID) {
pcmEncoding = Format.NO_VALUE;
}
break;
case CODEC_ID_ACM:
mimeType = MimeTypes.AUDIO_RAW;
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-16bit.mka.0.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-16
selectionFlags = [default]
language = und
initializationData:
Expand Down
1 change: 1 addition & 0 deletions ...ries/test_data/src/test/assets/extractordumps/mka/bear-flac-16bit.mka.unknown_length.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-16
selectionFlags = [default]
language = und
initializationData:
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-24bit.mka.0.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-24
selectionFlags = [default]
language = und
initializationData:
Expand Down
1 change: 1 addition & 0 deletions ...ries/test_data/src/test/assets/extractordumps/mka/bear-flac-24bit.mka.unknown_length.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-24
selectionFlags = [default]
language = und
initializationData:
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-32bit.mka.0.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-32
language = und
initializationData:
data = length 42, hash DE0B9CE3
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-32bit.mka.1.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-32
language = und
initializationData:
data = length 42, hash DE0B9CE3
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-32bit.mka.2.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-32
language = und
initializationData:
data = length 42, hash DE0B9CE3
Expand Down
1 change: 1 addition & 0 deletions libraries/test_data/src/test/assets/extractordumps/mka/bear-flac-32bit.mka.3.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-32
language = und
initializationData:
data = length 42, hash DE0B9CE3
Expand Down
1 change: 1 addition & 0 deletions ...ries/test_data/src/test/assets/extractordumps/mka/bear-flac-32bit.mka.unknown_length.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ track 1:
sampleMimeType = audio/flac
channelCount = 2
sampleRate = 48000
pcmEncoding = pcm-32
language = und
initializationData:
data = length 42, hash DE0B9CE3
Expand Down