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

Format with google-java-format

Browse Source
This commit is contained in:
microkatz 2023-08-17 11:09:29 +00:00
parent ee1b1500e2
commit c72ec74e11
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
View File

@ -1022,7 +1022,7 @@ public class MatroskaExtractor implements Extractor {
case ID_COLOUR_BITS_PER_CHANNEL: case ID_COLOUR_BITS_PER_CHANNEL:
assertInTrackEntry(id); assertInTrackEntry(id);
currentTrack.hasColorInfo = true; currentTrack.hasColorInfo = true;
currentTrack.bitsPerChannel = (int)value; currentTrack.bitsPerChannel = (int) value;
break; break;
case ID_COLOUR_RANGE: case ID_COLOUR_RANGE:
assertInTrackEntry(id); assertInTrackEntry(id);
@ -2308,7 +2308,14 @@ public class MatroskaExtractor implements Extractor {
@Nullable ColorInfo colorInfo = null; @Nullable ColorInfo colorInfo = null;
if (hasColorInfo) { if (hasColorInfo) {
@Nullable byte[] hdrStaticInfo = getHdrStaticInfo(); @Nullable byte[] hdrStaticInfo = getHdrStaticInfo();
colorInfo = new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo, bitsPerChannel, bitsPerChannel); colorInfo =
new ColorInfo(
colorSpace,
colorRange,
colorTransfer,
hdrStaticInfo,
bitsPerChannel,
bitsPerChannel);
} }
int rotationDegrees = Format.NO_VALUE; int rotationDegrees = Format.NO_VALUE;

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

@ -1224,7 +1224,8 @@ 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);
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();
@ -1367,13 +1368,13 @@ import java.util.List;
// Note that if either mdcv or clli are missing, we leave the corresponding HDR static // Note that if either mdcv or clli are missing, we leave the corresponding HDR static
// metadata bytes with value zero. See [Internal ref: b/194535665]. // metadata bytes with value zero. See [Internal ref: b/194535665].
.setColorInfo( .setColorInfo(
new ColorInfo( new ColorInfo(
colorSpace, colorSpace,
colorRange, colorRange,
colorTransfer, colorTransfer,
hdrStaticInfo != null ? hdrStaticInfo.array() : null, hdrStaticInfo != null ? hdrStaticInfo.array() : null,
bitdepthLuma, bitdepthLuma,
bitdepthChroma)); bitdepthChroma));
if (esdsData != null) { if (esdsData != null) {
formatBuilder formatBuilder