From 0c19506d7d0946046e51651cddd0d69b9d97eb84 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 11 May 2021 15:16:22 +0100 Subject: [PATCH] Remove deprecated Format.create methods PiperOrigin-RevId: 373144415 --- .../com/google/android/exoplayer2/Format.java | 144 ------------------ 1 file changed, 144 deletions(-) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Format.java b/library/common/src/main/java/com/google/android/exoplayer2/Format.java index 252266a874..325f2f0505 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Format.java @@ -758,40 +758,6 @@ public final class Format implements Parcelable { // 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 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( @@ -852,80 +818,8 @@ public final class Format implements Parcelable { .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 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. - /** @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 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( @@ -988,44 +882,6 @@ public final class Format implements Parcelable { .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 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. /** @deprecated Use {@link Format.Builder}. */