Skip to content

SDK / exoplayer

Go to a project
Commit 0c19506d by olly Committed by kim-vde
Options

Remove deprecated Format.create methods 

PiperOrigin-RevId: 373144415
parent eb93e5c0
Inline Side-by-side
Showing with 0 additions and 144 deletions
library/common/src/main/java/com/google/android/exoplayer2/Format.java
...@@ -760,68 +760,6 @@ public final class Format implements Parcelable { ...@@ -760,68 +760,6 @@ public final class Format implements Parcelable {
/** @deprecated Use {@link Format.Builder}. */ /** @deprecated Use {@link Format.Builder}. */
@Deprecated @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
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,
@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)
.build();
}
/** @deprecated Use {@link Format.Builder}. */
@Deprecated
public static Format createVideoSampleFormat( public static Format createVideoSampleFormat(
@Nullable String id, @Nullable String id,
@Nullable String sampleMimeType, @Nullable String sampleMimeType,
...@@ -832,8 +770,6 @@ public final class Format implements Parcelable { ...@@ -832,8 +770,6 @@ public final class Format implements Parcelable {
int height, int height,
float frameRate, float frameRate,
@Nullable List<byte[]> initializationData, @Nullable List<byte[]> initializationData,
int rotationDegrees,
float pixelWidthHeightRatio,
@Nullable DrmInitData drmInitData) { @Nullable DrmInitData drmInitData) {
return new Builder() return new Builder()
.setId(id) .setId(id)
...@@ -847,8 +783,6 @@ public final class Format implements Parcelable { ...@@ -847,8 +783,6 @@ public final class Format implements Parcelable {
.setWidth(width) .setWidth(width)
.setHeight(height) .setHeight(height)
.setFrameRate(frameRate) .setFrameRate(frameRate)
.setRotationDegrees(rotationDegrees)
.setPixelWidthHeightRatio(pixelWidthHeightRatio)
.build(); .build();
} }
...@@ -866,9 +800,6 @@ public final class Format implements Parcelable { ...@@ -866,9 +800,6 @@ public final class Format implements Parcelable {
@Nullable List<byte[]> initializationData, @Nullable List<byte[]> initializationData,
int rotationDegrees, int rotationDegrees,
float pixelWidthHeightRatio, float pixelWidthHeightRatio,
@Nullable byte[] projectionData,
@C.StereoMode int stereoMode,
@Nullable ColorInfo colorInfo,
@Nullable DrmInitData drmInitData) { @Nullable DrmInitData drmInitData) {
return new Builder() return new Builder()
.setId(id) .setId(id)
...@@ -884,9 +815,6 @@ public final class Format implements Parcelable { ...@@ -884,9 +815,6 @@ public final class Format implements Parcelable {
.setFrameRate(frameRate) .setFrameRate(frameRate)
.setRotationDegrees(rotationDegrees) .setRotationDegrees(rotationDegrees)
.setPixelWidthHeightRatio(pixelWidthHeightRatio) .setPixelWidthHeightRatio(pixelWidthHeightRatio)
.setProjectionData(projectionData)
.setStereoMode(stereoMode)
.setColorInfo(colorInfo)
.build(); .build();
} }
...@@ -894,40 +822,6 @@ public final class Format implements Parcelable { ...@@ -894,40 +822,6 @@ public final class Format implements Parcelable {
/** @deprecated Use {@link Format.Builder}. */ /** @deprecated Use {@link Format.Builder}. */
@Deprecated @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
public static Format createAudioSampleFormat( public static Format createAudioSampleFormat(
@Nullable String id, @Nullable String id,
@Nullable String sampleMimeType, @Nullable String sampleMimeType,
...@@ -988,44 +882,6 @@ public final class Format implements Parcelable { ...@@ -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}. */
......
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