Merge pull request #1905 from khouzam:placeholderSurface

copybara-github · copybara-github · commit fc1d133454c5 · 2025-01-30T06:34:26.000-08:00
PiperOrigin-RevId: 721367514
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -11,6 +11,10 @@
 *   Audio:
     *   Make `androidx.media3.common.audio.SonicAudioProcessor` final.
 *   Video:
+    *   Change `MediaCodecVideoRenderer.shouldUsePlaceholderSurface` to
+        protected so that applications can override to block usage of
+        placeholder surfaces
+        ([#1905](https://github.com/androidx/media/pull/1905)).
 *   Text:
 *   Metadata:
 *   Image:
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
@@ -1882,7 +1882,7 @@ protected boolean shouldUseDetachedSurface(MediaCodecInfo codecInfo) {
     return Util.SDK_INT >= 35 && codecInfo.detachedSurfaceSupported;
   }
 
-  private boolean shouldUsePlaceholderSurface(MediaCodecInfo codecInfo) {
+  protected boolean shouldUsePlaceholderSurface(MediaCodecInfo codecInfo) {
     return Util.SDK_INT >= 23
         && !tunneling
         && !codecNeedsSetOutputSurfaceWorkaround(codecInfo.name)

Original file line number	Diff line number	Diff line change
`@@ -1882,7 +1882,7 @@ protected boolean shouldUseDetachedSurface(MediaCodecInfo codecInfo) {`
`1882`	`1882`	`return Util.SDK_INT >= 35 && codecInfo.detachedSurfaceSupported;`
`1883`	`1883`	`}`
`1884`	`1884`
`1885`		`- private boolean shouldUsePlaceholderSurface(MediaCodecInfo codecInfo) {`
	`1885`	`+ protected boolean shouldUsePlaceholderSurface(MediaCodecInfo codecInfo) {`
`1886`	`1886`	`return Util.SDK_INT >= 23`
`1887`	`1887`	`&& !tunneling`
`1888`	`1888`	`&& !codecNeedsSetOutputSurfaceWorkaround(codecInfo.name)`