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

Improve isobmff atom parsing changes

Browse Source
This commit is contained in:
Daniele Sparano 2023-07-25 11:49:49 +01:00 committed by microkatz
parent d454bd0601
commit 59ff0dbb85
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1224,21 +1224,19 @@ import java.util.List;
ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null); ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null);
mimeType = MimeTypes.VIDEO_AV1; mimeType = MimeTypes.VIDEO_AV1;
parent.setPosition(childStartPosition + Atom.HEADER_SIZE); parent.setPosition(childStartPosition + Atom.HEADER_SIZE);
if (childAtomSize > Atom.HEADER_SIZE) { parent.skipBytes(1); ; // marker(1), version(7)
parent.skipBytes(1); ; // marker(1), version(7) int byte2 = parent.readUnsignedByte();
int byte2 = parent.readUnsignedByte(); int seqProfile = byte2 >> 5;
int seqProfile = byte2 >> 5; int byte3 = parent.readUnsignedByte();
int byte3 = parent.readUnsignedByte(); boolean highBitdepth = ((byte3 >> 6) & 0b1) != 0;
boolean highBitdepth = ((byte3 >> 6) & 0b1) != 0; // From https://aomediacodec.github.io/av1-spec/av1-spec.pdf#page=44
if (seqProfile == 2 && highBitdepth) {
boolean twelveBit = ((byte3 >> 5) & 0b1) != 0; boolean twelveBit = ((byte3 >> 5) & 0b1) != 0;
// From https://aomediacodec.github.io/av1-spec/av1-spec.pdf#page=44 bitdepthLuma = twelveBit ? 12 : 10;
if (seqProfile == 2 && highBitdepth) { } else if (seqProfile <= 2) {
bitdepthLuma = twelveBit ? 12 : 10; bitdepthLuma = highBitdepth ? 10 : 8;
} else if (seqProfile <= 2) {
bitdepthLuma = highBitdepth ? 10 : 8;
}
bitdepthChroma = bitdepthLuma;
} }
bitdepthChroma = bitdepthLuma;
} else if (childAtomType == Atom.TYPE_clli) { } else if (childAtomType == Atom.TYPE_clli) {
if (hdrStaticInfo == null) { if (hdrStaticInfo == null) {
hdrStaticInfo = allocateHdrStaticInfo(); hdrStaticInfo = allocateHdrStaticInfo();