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

Remove deprecated ColorInfo constructor

Browse Source 
This was first deprecated in a4bc0959be, submitted Dec 2022

PiperOrigin-RevId: 578152077
This commit is contained in:
huangdarwin 2023-10-31 05:43:56 -07:00 committed by Copybara-Service
parent 3a527a888a
commit 8d87a27fb9
2 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/common/src/main/java/androidx/media3/common/ColorInfo.java
View File

@ -253,37 +253,7 @@ public final class ColorInfo implements Bundleable {
// Lazily initialized hashcode. // Lazily initialized hashcode.
private int hashCode; private int hashCode;
/** private ColorInfo(
* Constructs the ColorInfo.
*
* @param colorSpace The color space of the video.
* @param colorRange The color range of the video.
* @param colorTransfer The color transfer characteristics of the video.
* @param hdrStaticInfo HdrStaticInfo as defined in CTA-861.3, or null if none specified.
* @deprecated Use {@link Builder}.
*/
@Deprecated
public ColorInfo(
@C.ColorSpace int colorSpace,
@C.ColorRange int colorRange,
@C.ColorTransfer int colorTransfer,
@Nullable byte[] hdrStaticInfo) {
this(colorSpace, colorRange, colorTransfer, hdrStaticInfo, Format.NO_VALUE, Format.NO_VALUE);
}
/**
* Constructs the ColorInfo.
*
* @param colorSpace The color space of the video.
* @param colorRange The color range of the video.
* @param colorTransfer The color transfer characteristics of the video.
* @param hdrStaticInfo HdrStaticInfo as defined in CTA-861.3, or null if none specified.
* @param lumaBitdepth The bit depth of the luma samples of the video.
* @param chromaBitdepth The bit depth of the chroma samples of the video.
* @deprecated Use {@link Builder}.
*/
@Deprecated
public ColorInfo(
@C.ColorSpace int colorSpace, @C.ColorSpace int colorSpace,
@C.ColorRange int colorRange, @C.ColorRange int colorRange,
@C.ColorTransfer int colorTransfer, @C.ColorTransfer int colorTransfer,

15
libraries/common/src/test/java/androidx/media3/common/FormatTest.java
View File

@ -74,13 +74,14 @@ public final class FormatTest {
Metadata metadata = new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2")); Metadata metadata = new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2"));
ColorInfo colorInfo = ColorInfo colorInfo =
new ColorInfo( new ColorInfo.Builder()
C.COLOR_SPACE_BT709, .setColorSpace(C.COLOR_SPACE_BT709)
C.COLOR_RANGE_LIMITED, .setColorRange(C.COLOR_RANGE_LIMITED)
C.COLOR_TRANSFER_SDR, .setColorTransfer(C.COLOR_TRANSFER_SDR)
new byte[] {1, 2, 3, 4, 5, 6, 7}, .setHdrStaticInfo(new byte[] {1, 2, 3, 4, 5, 6, 7})
/* lumaBitdepth */ 9, .setLumaBitdepth(9)
/* chromaBitdepth */ 11); .setChromaBitdepth(11)
.build();
return new Format.Builder() return new Format.Builder()
.setId("id") .setId("id")