Remove FfmpegVideoRenderer from the 2.17.0 release branch

This class is not ready to be released, and only exists in the dev-v2 branch.
google · Feb 17, 2022 · da947c0 · da947c0
1 parent 7df544d
commit da947c0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 178 deletions.
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -42,7 +42,7 @@ private FfmpegLibrary() {}
   /**
    * Override the names of the FFmpeg native libraries. If an application wishes to call this
    * method, it must do so before calling any other method defined by this class, and before
-   * instantiating a {@link FfmpegAudioRenderer} or {@link FfmpegVideoRenderer} instance.
+   * instantiating a {@link FfmpegAudioRenderer} instance.
    *
    * @param libraries The names of the FFmpeg native libraries.
    */
@@ -140,10 +140,6 @@ public static boolean supportsFormat(String mimeType) {
         return "pcm_mulaw";
       case MimeTypes.AUDIO_ALAW:
         return "pcm_alaw";
-      case MimeTypes.VIDEO_H264:
-        return "h264";
-      case MimeTypes.VIDEO_H265:
-        return "hevc";
       default:
         return null;
     }

diff --git a/...ns/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java b/...ns/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java
diff --git a/...g/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/...g/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
@@ -22,8 +22,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer} and {@link
- * FfmpegVideoRenderer}.
+ * Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}.
  */
 @RunWith(AndroidJUnit4.class)
 public final class DefaultRenderersFactoryTest {
@@ -33,10 +32,4 @@ public void createRenderers_instantiatesFfmpegAudioRenderer() {
     DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
         FfmpegAudioRenderer.class, C.TRACK_TYPE_AUDIO);
   }
-
-  @Test
-  public void createRenderers_instantiatesFfmpegVideoRenderer() {
-    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
-        FfmpegVideoRenderer.class, C.TRACK_TYPE_VIDEO);
-  }
 }
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
@@ -9,10 +9,6 @@
 -keepclassmembers class com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer {
   <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
 }
--dontnote com.google.android.exoplayer2.ext.ffmpeg.FfmpegVideoRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.ffmpeg.FfmpegVideoRenderer {
-  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
-}
 -dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer
 -keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer {
   <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -453,32 +453,6 @@ protected void buildVideoRenderers(
       // The extension is present, but instantiation failed.
       throw new RuntimeException("Error instantiating AV1 extension", e);
     }
-
-    try {
-      // Full class names used for constructor args so the LINT rule triggers if any of them move.
-      Class<?> clazz =
-          Class.forName("com.google.android.exoplayer2.ext.ffmpeg.FfmpegVideoRenderer");
-      Constructor<?> constructor =
-          clazz.getConstructor(
-              long.class,
-              android.os.Handler.class,
-              com.google.android.exoplayer2.video.VideoRendererEventListener.class,
-              int.class);
-      Renderer renderer =
-          (Renderer)
-              constructor.newInstance(
-                  allowedVideoJoiningTimeMs,
-                  eventHandler,
-                  eventListener,
-                  MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY);
-      out.add(extensionRendererIndex++, renderer);
-      Log.i(TAG, "Loaded FfmpegVideoRenderer.");
-    } catch (ClassNotFoundException e) {
-      // Expected if the app was built without the extension.
-    } catch (Exception e) {
-      // The extension is present, but instantiation failed.
-      throw new RuntimeException("Error instantiating FFmpeg extension", e);
-    }
   }
 
   /**