Remove deprecated Format.create methods
PiperOrigin-RevId: 373144415
This commit is contained in:
parent
eb93e5c0b5
commit
0c19506d7d
@ -758,40 +758,6 @@ public final class Format implements Parcelable {
|
|||||||
|
|
||||||
// Video.
|
// Video.
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
|
||||||
@Deprecated
|
|
||||||
public static Format createVideoContainerFormat(
|
|
||||||
@Nullable String id,
|
|
||||||
@Nullable String label,
|
|
||||||
@Nullable String containerMimeType,
|
|
||||||
@Nullable String sampleMimeType,
|
|
||||||
@Nullable String codecs,
|
|
||||||
@Nullable Metadata metadata,
|
|
||||||
int bitrate,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
float frameRate,
|
|
||||||
@Nullable List<byte[]> initializationData,
|
|
||||||
@C.SelectionFlags int selectionFlags,
|
|
||||||
@C.RoleFlags int roleFlags) {
|
|
||||||
return new Builder()
|
|
||||||
.setId(id)
|
|
||||||
.setLabel(label)
|
|
||||||
.setSelectionFlags(selectionFlags)
|
|
||||||
.setRoleFlags(roleFlags)
|
|
||||||
.setAverageBitrate(bitrate)
|
|
||||||
.setPeakBitrate(bitrate)
|
|
||||||
.setCodecs(codecs)
|
|
||||||
.setMetadata(metadata)
|
|
||||||
.setContainerMimeType(containerMimeType)
|
|
||||||
.setSampleMimeType(sampleMimeType)
|
|
||||||
.setInitializationData(initializationData)
|
|
||||||
.setWidth(width)
|
|
||||||
.setHeight(height)
|
|
||||||
.setFrameRate(frameRate)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
/** @deprecated Use {@link Format.Builder}. */
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static Format createVideoSampleFormat(
|
public static Format createVideoSampleFormat(
|
||||||
@ -852,80 +818,8 @@ public final class Format implements Parcelable {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
|
||||||
@Deprecated
|
|
||||||
public static Format createVideoSampleFormat(
|
|
||||||
@Nullable String id,
|
|
||||||
@Nullable String sampleMimeType,
|
|
||||||
@Nullable String codecs,
|
|
||||||
int bitrate,
|
|
||||||
int maxInputSize,
|
|
||||||
int width,
|
|
||||||
int height,
|
|
||||||
float frameRate,
|
|
||||||
@Nullable List<byte[]> initializationData,
|
|
||||||
int rotationDegrees,
|
|
||||||
float pixelWidthHeightRatio,
|
|
||||||
@Nullable byte[] projectionData,
|
|
||||||
@C.StereoMode int stereoMode,
|
|
||||||
@Nullable ColorInfo colorInfo,
|
|
||||||
@Nullable DrmInitData drmInitData) {
|
|
||||||
return new Builder()
|
|
||||||
.setId(id)
|
|
||||||
.setAverageBitrate(bitrate)
|
|
||||||
.setPeakBitrate(bitrate)
|
|
||||||
.setCodecs(codecs)
|
|
||||||
.setSampleMimeType(sampleMimeType)
|
|
||||||
.setMaxInputSize(maxInputSize)
|
|
||||||
.setInitializationData(initializationData)
|
|
||||||
.setDrmInitData(drmInitData)
|
|
||||||
.setWidth(width)
|
|
||||||
.setHeight(height)
|
|
||||||
.setFrameRate(frameRate)
|
|
||||||
.setRotationDegrees(rotationDegrees)
|
|
||||||
.setPixelWidthHeightRatio(pixelWidthHeightRatio)
|
|
||||||
.setProjectionData(projectionData)
|
|
||||||
.setStereoMode(stereoMode)
|
|
||||||
.setColorInfo(colorInfo)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Audio.
|
// Audio.
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
|
||||||
@Deprecated
|
|
||||||
public static Format createAudioContainerFormat(
|
|
||||||
@Nullable String id,
|
|
||||||
@Nullable String label,
|
|
||||||
@Nullable String containerMimeType,
|
|
||||||
@Nullable String sampleMimeType,
|
|
||||||
@Nullable String codecs,
|
|
||||||
@Nullable Metadata metadata,
|
|
||||||
int bitrate,
|
|
||||||
int channelCount,
|
|
||||||
int sampleRate,
|
|
||||||
@Nullable List<byte[]> initializationData,
|
|
||||||
@C.SelectionFlags int selectionFlags,
|
|
||||||
@C.RoleFlags int roleFlags,
|
|
||||||
@Nullable String language) {
|
|
||||||
return new Builder()
|
|
||||||
.setId(id)
|
|
||||||
.setLabel(label)
|
|
||||||
.setLanguage(language)
|
|
||||||
.setSelectionFlags(selectionFlags)
|
|
||||||
.setRoleFlags(roleFlags)
|
|
||||||
.setAverageBitrate(bitrate)
|
|
||||||
.setPeakBitrate(bitrate)
|
|
||||||
.setCodecs(codecs)
|
|
||||||
.setMetadata(metadata)
|
|
||||||
.setContainerMimeType(containerMimeType)
|
|
||||||
.setSampleMimeType(sampleMimeType)
|
|
||||||
.setInitializationData(initializationData)
|
|
||||||
.setChannelCount(channelCount)
|
|
||||||
.setSampleRate(sampleRate)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
/** @deprecated Use {@link Format.Builder}. */
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static Format createAudioSampleFormat(
|
public static Format createAudioSampleFormat(
|
||||||
@ -988,44 +882,6 @@ public final class Format implements Parcelable {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
|
||||||
@Deprecated
|
|
||||||
public static Format createAudioSampleFormat(
|
|
||||||
@Nullable String id,
|
|
||||||
@Nullable String sampleMimeType,
|
|
||||||
@Nullable String codecs,
|
|
||||||
int bitrate,
|
|
||||||
int maxInputSize,
|
|
||||||
int channelCount,
|
|
||||||
int sampleRate,
|
|
||||||
@C.PcmEncoding int pcmEncoding,
|
|
||||||
int encoderDelay,
|
|
||||||
int encoderPadding,
|
|
||||||
@Nullable List<byte[]> initializationData,
|
|
||||||
@Nullable DrmInitData drmInitData,
|
|
||||||
@C.SelectionFlags int selectionFlags,
|
|
||||||
@Nullable String language,
|
|
||||||
@Nullable Metadata metadata) {
|
|
||||||
return new Builder()
|
|
||||||
.setId(id)
|
|
||||||
.setLanguage(language)
|
|
||||||
.setSelectionFlags(selectionFlags)
|
|
||||||
.setAverageBitrate(bitrate)
|
|
||||||
.setPeakBitrate(bitrate)
|
|
||||||
.setCodecs(codecs)
|
|
||||||
.setMetadata(metadata)
|
|
||||||
.setSampleMimeType(sampleMimeType)
|
|
||||||
.setMaxInputSize(maxInputSize)
|
|
||||||
.setInitializationData(initializationData)
|
|
||||||
.setDrmInitData(drmInitData)
|
|
||||||
.setChannelCount(channelCount)
|
|
||||||
.setSampleRate(sampleRate)
|
|
||||||
.setPcmEncoding(pcmEncoding)
|
|
||||||
.setEncoderDelay(encoderDelay)
|
|
||||||
.setEncoderPadding(encoderPadding)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generic.
|
// Generic.
|
||||||
|
|
||||||
/** @deprecated Use {@link Format.Builder}. */
|
/** @deprecated Use {@link Format.Builder}. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user