From 04218bdeb819046290ca829f3a856a1d7ad275d2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 31 Jan 2020 16:59:16 +0000
Subject: [PATCH] Remove deprecated Format constructors

PiperOrigin-RevId: 292554283
---
 .../com/google/android/exoplayer2/Format.java | 89 -------------------
 1 file changed, 89 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 b59a50ad34..75ea2d78c9 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
@@ -172,38 +172,6 @@ public final class Format implements Parcelable {
 
   // Video.
 
-  /**
-   * @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String,
-   *     Metadata, int, int, int, float, List, int, int)} instead.
-   */
-  @Deprecated
-  public static Format createVideoContainerFormat(
-      @Nullable String id,
-      @Nullable String containerMimeType,
-      @Nullable String sampleMimeType,
-      @Nullable String codecs,
-      int bitrate,
-      int width,
-      int height,
-      float frameRate,
-      @Nullable List<byte[]> initializationData,
-      @C.SelectionFlags int selectionFlags) {
-    return createVideoContainerFormat(
-        id,
-        /* label= */ null,
-        containerMimeType,
-        sampleMimeType,
-        codecs,
-        /* metadata= */ null,
-        bitrate,
-        width,
-        height,
-        frameRate,
-        initializationData,
-        selectionFlags,
-        /* roleFlags= */ 0);
-  }
-
   public static Format createVideoContainerFormat(
       @Nullable String id,
       @Nullable String label,
@@ -357,38 +325,6 @@ public final class Format implements Parcelable {
 
   // Audio.
 
-  /**
-   * @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String,
-   *     Metadata, int, int, int, List, int, int, String)} instead.
-   */
-  @Deprecated
-  public static Format createAudioContainerFormat(
-      @Nullable String id,
-      @Nullable String containerMimeType,
-      @Nullable String sampleMimeType,
-      @Nullable String codecs,
-      int bitrate,
-      int channelCount,
-      int sampleRate,
-      @Nullable List<byte[]> initializationData,
-      @C.SelectionFlags int selectionFlags,
-      @Nullable String language) {
-    return createAudioContainerFormat(
-        id,
-        /* label= */ null,
-        containerMimeType,
-        sampleMimeType,
-        codecs,
-        /* metadata= */ null,
-        bitrate,
-        channelCount,
-        sampleRate,
-        initializationData,
-        selectionFlags,
-        /* roleFlags= */ 0,
-        language);
-  }
-
   public static Format createAudioContainerFormat(
       @Nullable String id,
       @Nullable String label,
@@ -768,31 +704,6 @@ public final class Format implements Parcelable {
 
   // Generic.
 
-  /**
-   * @deprecated Use {@link #createContainerFormat(String, String, String, String, String, int, int,
-   *     int, String)} instead.
-   */
-  @Deprecated
-  public static Format createContainerFormat(
-      @Nullable String id,
-      @Nullable String containerMimeType,
-      @Nullable String sampleMimeType,
-      @Nullable String codecs,
-      int bitrate,
-      @C.SelectionFlags int selectionFlags,
-      @Nullable String language) {
-    return createContainerFormat(
-        id,
-        /* label= */ null,
-        containerMimeType,
-        sampleMimeType,
-        codecs,
-        bitrate,
-        selectionFlags,
-        /* roleFlags= */ 0,
-        language);
-  }
-
   public static Format createContainerFormat(
       @Nullable String id,
       @Nullable String label,