Commit e8498054 by aquilescanta Committed by Oliver Woodman

Add ColorInfo to extractor tests' format serialization

PiperOrigin-RevId: 375992627
parent 095e2feb
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.testutil; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.testutil;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.base.Function; import com.google.common.base.Function;
import org.checkerframework.checker.nullness.compatqual.NullableType; import org.checkerframework.checker.nullness.compatqual.NullableType;
...@@ -48,6 +49,15 @@ public final class DumpableFormat implements Dumper.Dumpable { ...@@ -48,6 +49,15 @@ public final class DumpableFormat implements Dumper.Dumpable {
addIfNonDefault(dumper, "frameRate", format -> format.frameRate); addIfNonDefault(dumper, "frameRate", format -> format.frameRate);
addIfNonDefault(dumper, "rotationDegrees", format -> format.rotationDegrees); addIfNonDefault(dumper, "rotationDegrees", format -> format.rotationDegrees);
addIfNonDefault(dumper, "pixelWidthHeightRatio", format -> format.pixelWidthHeightRatio); addIfNonDefault(dumper, "pixelWidthHeightRatio", format -> format.pixelWidthHeightRatio);
@Nullable ColorInfo colorInfo = format.colorInfo;
if (colorInfo != null) {
dumper.startBlock("colorInfo");
dumper.add("colorSpace", colorInfo.colorSpace);
dumper.add("colorRange", colorInfo.colorRange);
dumper.add("colorTransfer", colorInfo.colorTransfer);
dumper.add("hdrStaticInfo", colorInfo.hdrStaticInfo);
dumper.endBlock();
}
addIfNonDefault(dumper, "channelCount", format -> format.channelCount); addIfNonDefault(dumper, "channelCount", format -> format.channelCount);
addIfNonDefault(dumper, "sampleRate", format -> format.sampleRate); addIfNonDefault(dumper, "sampleRate", format -> format.sampleRate);
addIfNonDefault(dumper, "pcmEncoding", format -> format.pcmEncoding); addIfNonDefault(dumper, "pcmEncoding", format -> format.pcmEncoding);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment