From 61a5dd76e3fc5c5ca95a658d6cdf97043da6bfbb Mon Sep 17 00:00:00 2001 From: rohks Date: Wed, 17 May 2023 16:13:02 +0000 Subject: [PATCH] Remove deprecated methods that create an instance of `Format` Use `Format.Builder` instead. #minor-release PiperOrigin-RevId: 532808478 (cherry picked from commit 18aa664cb8574d1bad4aca24917ffeb74181309a) --- RELEASENOTES.md | 4 + .../java/androidx/media3/common/Format.java | 178 ------------------ 2 files changed, 4 insertions(+), 178 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3c5f6a5a15..8a2a49c8af 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -40,6 +40,10 @@ * Remove deprecated `WorkManagerScheduler` constructor, use a non deprecated constructor that includes the option to provide a `Context` parameter instead. + * Remove the deprecated methods `createVideoSampleFormat`, + `createAudioSampleFormat`, `createContainerFormat`, and + `createSampleFormat`, which were used to instantiate the `Format` class. + Instead use `Format.Builder` for creating instances of `Format`. ### 1.0.2 (2023-05-18) diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java index b9b935c239..e2e7e52f0b 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Format.java +++ b/libraries/common/src/main/java/androidx/media3/common/Format.java @@ -846,184 +846,6 @@ public final class Format implements Bundleable { // Lazily initialized hashcode. private int hashCode; - // Video. - - /** - * @deprecated Use {@link Format.Builder}. - */ - @UnstableApi - @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, - @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}. - */ - @UnstableApi - @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 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) - .build(); - } - - // Audio. - - /** - * @deprecated Use {@link Format.Builder}. - */ - @UnstableApi - @Deprecated - public static Format createAudioSampleFormat( - @Nullable String id, - @Nullable String sampleMimeType, - @Nullable String codecs, - int bitrate, - int maxInputSize, - int channelCount, - int sampleRate, - @Nullable List initializationData, - @Nullable DrmInitData drmInitData, - @C.SelectionFlags int selectionFlags, - @Nullable String language) { - return new Builder() - .setId(id) - .setLanguage(language) - .setSelectionFlags(selectionFlags) - .setAverageBitrate(bitrate) - .setPeakBitrate(bitrate) - .setCodecs(codecs) - .setSampleMimeType(sampleMimeType) - .setMaxInputSize(maxInputSize) - .setInitializationData(initializationData) - .setDrmInitData(drmInitData) - .setChannelCount(channelCount) - .setSampleRate(sampleRate) - .build(); - } - - /** - * @deprecated Use {@link Format.Builder}. - */ - @UnstableApi - @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, - @Nullable List initializationData, - @Nullable DrmInitData drmInitData, - @C.SelectionFlags int selectionFlags, - @Nullable String language) { - return new Builder() - .setId(id) - .setLanguage(language) - .setSelectionFlags(selectionFlags) - .setAverageBitrate(bitrate) - .setPeakBitrate(bitrate) - .setCodecs(codecs) - .setSampleMimeType(sampleMimeType) - .setMaxInputSize(maxInputSize) - .setInitializationData(initializationData) - .setDrmInitData(drmInitData) - .setChannelCount(channelCount) - .setSampleRate(sampleRate) - .setPcmEncoding(pcmEncoding) - .build(); - } - - // Generic. - - /** - * @deprecated Use {@link Format.Builder}. - */ - @UnstableApi - @Deprecated - public static Format createContainerFormat( - @Nullable String id, - @Nullable String label, - @Nullable String containerMimeType, - @Nullable String sampleMimeType, - @Nullable String codecs, - int bitrate, - @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) - .setContainerMimeType(containerMimeType) - .setSampleMimeType(sampleMimeType) - .build(); - } - - /** - * @deprecated Use {@link Format.Builder}. - */ - @UnstableApi - @Deprecated - public static Format createSampleFormat(@Nullable String id, @Nullable String sampleMimeType) { - return new Builder().setId(id).setSampleMimeType(sampleMimeType).build(); - } - private Format(Builder builder) { id = builder.id; label = builder.label;