loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-11 09:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes based on internal review

Browse Source
This commit is contained in:
Rohit Singh 2023-11-07 14:23:07 +00:00
parent 8e554c6d6a
commit 6297e7aeae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
View File

@ -1727,11 +1727,10 @@ import java.util.List;
parent.skipBytes(1); // configurationVersion parent.skipBytes(1); // configurationVersion
int mpeghProfileLevelIndication = parent.readUnsignedByte(); int mpeghProfileLevelIndication = parent.readUnsignedByte();
parent.skipBytes(1); // mpeghReferenceChannelLayout parent.skipBytes(1); // mpeghReferenceChannelLayout
if (MimeTypes.AUDIO_MPEGH_MHM1.equals(mimeType)) { codecs =
codecs = String.format("mhm1.%02X", mpeghProfileLevelIndication); MimeTypes.AUDIO_MPEGH_MHM1.equals(mimeType)
} else { ? String.format("mhm1.%02X", mpeghProfileLevelIndication)
codecs = String.format("mha1.%02X", mpeghProfileLevelIndication); : String.format("mha1.%02X", mpeghProfileLevelIndication);
}
int mpegh3daConfigLength = parent.readUnsignedShort(); int mpegh3daConfigLength = parent.readUnsignedShort();
byte[] initializationDataBytes = new byte[mpegh3daConfigLength]; byte[] initializationDataBytes = new byte[mpegh3daConfigLength];
parent.readBytes(initializationDataBytes, 0, mpegh3daConfigLength); parent.readBytes(initializationDataBytes, 0, mpegh3daConfigLength);
@ -1739,7 +1738,8 @@ import java.util.List;
if (initializationData == null) { if (initializationData == null) {
initializationData = ImmutableList.of(initializationDataBytes); initializationData = ImmutableList.of(initializationDataBytes);
} else { } else {
// We assume that the mhaP box has been parsed before and add the compatible profile level // We assume that the mhaP box has been parsed before and so add the compatible profile
// level
// sets as the second entry. // sets as the second entry.
initializationData = ImmutableList.of(initializationDataBytes, initializationData.get(0)); initializationData = ImmutableList.of(initializationDataBytes, initializationData.get(0));
} }
@ -1754,7 +1754,7 @@ import java.util.List;
if (initializationData == null) { if (initializationData == null) {
initializationData = ImmutableList.of(mpeghCompatibleProfileLevelSet); initializationData = ImmutableList.of(mpeghCompatibleProfileLevelSet);
} else { } else {
// We assume that the mhaC box has been parsed before and add the compatible profile // We assume that the mhaC box has been parsed before and so add the compatible profile
// level sets as the second entry. // level sets as the second entry.
initializationData = initializationData =
ImmutableList.of(initializationData.get(0), mpeghCompatibleProfileLevelSet); ImmutableList.of(initializationData.get(0), mpeghCompatibleProfileLevelSet);