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

Refactor audioEsdsBox to esdsBox

Browse Source 
Since the muxer supported only AAC audio codec, the esdsBox was unconditionally created within the audioSampleEntry. This CL refactors the box creation logic by moving it to the codecSpecificBox method. This is to make adding support for new audio codecs easier.

PiperOrigin-RevId: 650130935
This commit is contained in:
Googler 2024-07-07 23:10:43 -07:00 committed by Copybara-Service
parent b2585aad0f
commit a269355369
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libraries/muxer/src/main/java/androidx/media3/muxer/Boxes.java
View File

@ -508,17 +508,11 @@ import java.util.List;
/** Returns an audio sample entry box based on the MIME type. */ /** Returns an audio sample entry box based on the MIME type. */
public static ByteBuffer audioSampleEntry(Format format) { public static ByteBuffer audioSampleEntry(Format format) {
String mimeType = checkNotNull(format.sampleMimeType); String fourcc = codecSpecificFourcc(format);
checkArgument(mimeType.equals(MimeTypes.AUDIO_AAC), "Unsupported audio format: " + mimeType); ByteBuffer codecSpecificBox = codecSpecificBox(format);
String fourcc = "mp4a";
checkArgument(!format.initializationData.isEmpty(), "csd-0 not found in the format."); ByteBuffer contents =
ByteBuffer.allocate(codecSpecificBox.remaining() + MAX_FIXED_LEAF_BOX_SIZE);
byte[] csd0 = format.initializationData.get(0);
checkArgument(csd0.length > 0, "csd-0 is empty.");
ByteBuffer csd0ByteBuffer = ByteBuffer.wrap(csd0);
ByteBuffer contents = ByteBuffer.allocate(csd0ByteBuffer.limit() + MAX_FIXED_LEAF_BOX_SIZE);
contents.putInt(0x00); // reserved contents.putInt(0x00); // reserved
contents.putShort((short) 0x0); // reserved contents.putShort((short) 0x0); // reserved
@ -535,7 +529,7 @@ import java.util.List;
int sampleRate = format.sampleRate; int sampleRate = format.sampleRate;
contents.putInt(sampleRate << 16); contents.putInt(sampleRate << 16);
contents.put(audioEsdsBox(csd0ByteBuffer, format.peakBitrate, format.averageBitrate)); contents.put(codecSpecificBox);
contents.flip(); contents.flip();
return BoxUtils.wrapIntoBox(fourcc, contents); return BoxUtils.wrapIntoBox(fourcc, contents);
@ -545,14 +539,16 @@ import java.util.List;
public static ByteBuffer codecSpecificBox(Format format) { public static ByteBuffer codecSpecificBox(Format format) {
String mimeType = checkNotNull(format.sampleMimeType); String mimeType = checkNotNull(format.sampleMimeType);
switch (mimeType) { switch (mimeType) {
case "video/avc": case MimeTypes.AUDIO_AAC:
return esdsBox(format);
case MimeTypes.VIDEO_H264:
return avcCBox(format); return avcCBox(format);
case "video/hevc": case MimeTypes.VIDEO_H265:
return hvcCBox(format); return hvcCBox(format);
case "video/av01": case MimeTypes.VIDEO_AV1:
return av1CBox(format); return av1CBox(format);
default: default:
throw new IllegalArgumentException("Unsupported video format: " + mimeType); throw new IllegalArgumentException("Unsupported format: " + mimeType);
} }
} }
@ -1315,24 +1311,33 @@ import java.util.List;
return BoxUtils.wrapIntoBox("colr", contents); return BoxUtils.wrapIntoBox("colr", contents);
} }
/** Returns video codec specific fourcc. */ /** Returns codec specific fourcc. */
private static String codecSpecificFourcc(Format format) { private static String codecSpecificFourcc(Format format) {
String mimeType = checkNotNull(format.sampleMimeType); String mimeType = checkNotNull(format.sampleMimeType);
switch (mimeType) { switch (mimeType) {
case "video/avc": case MimeTypes.AUDIO_AAC:
return "mp4a";
case MimeTypes.VIDEO_H264:
return "avc1"; return "avc1";
case "video/hevc": case MimeTypes.VIDEO_H265:
return "hvc1"; return "hvc1";
case "video/av01": case MimeTypes.VIDEO_AV1:
return "av01"; return "av01";
default: default:
throw new IllegalArgumentException("Unsupported video format: " + mimeType); throw new IllegalArgumentException("Unsupported format: " + mimeType);
} }
} }
/** Returns the esds box. */ /** Returns the esds box. */
private static ByteBuffer audioEsdsBox( private static ByteBuffer esdsBox(Format format) {
ByteBuffer csd0ByteBuffer, int peakBitrate, int averageBitrate) { checkArgument(!format.initializationData.isEmpty(), "csd-0 not found in the format.");
byte[] csd0 = format.initializationData.get(0);
checkArgument(csd0.length > 0, "csd-0 is empty.");
ByteBuffer csd0ByteBuffer = ByteBuffer.wrap(csd0);
int peakBitrate = format.peakBitrate;
int averageBitrate = format.averageBitrate;
int csd0Size = csd0ByteBuffer.limit(); int csd0Size = csd0ByteBuffer.limit();
ByteBuffer contents = ByteBuffer.allocate(csd0Size + MAX_FIXED_LEAF_BOX_SIZE); ByteBuffer contents = ByteBuffer.allocate(csd0Size + MAX_FIXED_LEAF_BOX_SIZE);