Skip to content

Refactor PCM format handling to use Util methods #3063

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

Merged
copybara-service merged 2 commits into from
Feb 25, 2026
+11 −27
Merged

Refactor PCM format handling to use Util methods #3063

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
ca61f3f
Tidy up pcm format handling in some places
nift4 Feb 10, 2026
01c269d
Remove bug fix change
rohitjoins Feb 25, 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
10 changes: 1 addition & 9 deletions libraries/common/src/main/java/androidx/media3/common/audio/ToInt16PcmAudioProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,7 @@ public final class ToInt16PcmAudioProcessor extends BaseAudioProcessor {
public AudioFormat onConfigure(AudioFormat inputAudioFormat)
throws UnhandledAudioFormatException {
@C.PcmEncoding int encoding = inputAudioFormat.encoding;
if (encoding != C.ENCODING_PCM_8BIT
&& encoding != C.ENCODING_PCM_16BIT
&& encoding != C.ENCODING_PCM_16BIT_BIG_ENDIAN
&& encoding != C.ENCODING_PCM_24BIT
&& encoding != C.ENCODING_PCM_24BIT_BIG_ENDIAN
&& encoding != C.ENCODING_PCM_32BIT
&& encoding != C.ENCODING_PCM_32BIT_BIG_ENDIAN
&& encoding != C.ENCODING_PCM_FLOAT
&& encoding != C.ENCODING_PCM_DOUBLE) {
if (!Util.isEncodingLinearPcm(encoding)) {
throw new UnhandledAudioFormatException(inputAudioFormat);
}
return encoding != C.ENCODING_PCM_16BIT
Expand Down
4 changes: 4 additions & 0 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,8 @@ private static String encodingAsString(@C.Encoding int encoding) {
return "dts-hd";
case C.ENCODING_DTS_UHD_P2:
return "dts-uhd-p2";
case C.ENCODING_DSD:
return "dsd";
case C.ENCODING_E_AC3:
return "eac3";
case C.ENCODING_E_AC3_JOC:
Expand All @@ -829,6 +831,8 @@ private static String encodingAsString(@C.Encoding int encoding) {
return "pcm-32";
case C.ENCODING_PCM_32BIT_BIG_ENDIAN:
return "pcm-32be";
case C.ENCODING_PCM_DOUBLE:
return "pcm-double";
case C.ENCODING_PCM_FLOAT:
return "pcm-float";
case C.ENCODING_INVALID:
Expand Down
11 changes: 2 additions & 9 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 @@ -2437,15 +2437,8 @@ public void initializeFormat(int trackId) throws ParserException {
break;
case CODEC_ID_PCM_INT_BIG:
mimeType = MimeTypes.AUDIO_RAW;
if (audioBitDepth == 8) {
pcmEncoding = C.ENCODING_PCM_8BIT;
} else if (audioBitDepth == 16) {
pcmEncoding = C.ENCODING_PCM_16BIT_BIG_ENDIAN;
} else if (audioBitDepth == 24) {
pcmEncoding = C.ENCODING_PCM_24BIT_BIG_ENDIAN;
} else if (audioBitDepth == 32) {
pcmEncoding = C.ENCODING_PCM_32BIT_BIG_ENDIAN;
} else {
pcmEncoding = Util.getPcmEncoding(audioBitDepth, ByteOrder.BIG_ENDIAN);
if (pcmEncoding == C.ENCODING_INVALID) {
pcmEncoding = Format.NO_VALUE;
mimeType = MimeTypes.AUDIO_UNKNOWN;
Log.w(
Expand Down
13 changes: 4 additions & 9 deletions libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,18 +2130,13 @@ private static void parseAudioSampleEntry(
boolean isFloat = (formatSpecificFlags & 1) != 0;
boolean isBigEndian = (formatSpecificFlags & (1 << 1)) != 0;
if (!isFloat) {
if (bitsPerSample == 8) {
pcmEncoding = C.ENCODING_PCM_8BIT;
} else if (bitsPerSample == 16) {
pcmEncoding = isBigEndian ? C.ENCODING_PCM_16BIT_BIG_ENDIAN : C.ENCODING_PCM_16BIT;
} else if (bitsPerSample == 24) {
pcmEncoding = isBigEndian ? C.ENCODING_PCM_24BIT_BIG_ENDIAN : C.ENCODING_PCM_24BIT;
} else if (bitsPerSample == 32) {
pcmEncoding = isBigEndian ? C.ENCODING_PCM_32BIT_BIG_ENDIAN : C.ENCODING_PCM_32BIT;
}
pcmEncoding = Util.getPcmEncoding(bitsPerSample, isBigEndian ? BIG_ENDIAN : LITTLE_ENDIAN);
} else if (bitsPerSample == 32) {
pcmEncoding = C.ENCODING_PCM_FLOAT;
}
if (pcmEncoding == C.ENCODING_INVALID) {
pcmEncoding = Format.NO_VALUE;
}
parent.skipBytes(8); // constBytesPerAudioPacket, constLPCMFramesPerAudioPacket
} else {
// Unsupported version.
Expand Down