Commit 7683c8bf by tonihei Committed by Rohit Singh

Rename shouldUseDummySurface to shouldUsePlaceholderSurface

This was likely missed in https://github.com/androidx/media/commit/33373d0d0a159ad9c9c3590c838098c4c1530910.

PiperOrigin-RevId: 457422574
(cherry picked from commit 8e716d68)
parent 2f1260e3
...@@ -629,7 +629,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -629,7 +629,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
surface = placeholderSurface; surface = placeholderSurface;
} else { } else {
MediaCodecInfo codecInfo = getCodecInfo(); MediaCodecInfo codecInfo = getCodecInfo();
if (codecInfo != null && shouldUseDummySurface(codecInfo)) { if (codecInfo != null && shouldUsePlaceholderSurface(codecInfo)) {
placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure); placeholderSurface = PlaceholderSurface.newInstanceV17(context, codecInfo.secure);
surface = placeholderSurface; surface = placeholderSurface;
} }
...@@ -675,7 +675,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -675,7 +675,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
@Override @Override
protected boolean shouldInitCodec(MediaCodecInfo codecInfo) { protected boolean shouldInitCodec(MediaCodecInfo codecInfo) {
return surface != null || shouldUseDummySurface(codecInfo); return surface != null || shouldUsePlaceholderSurface(codecInfo);
} }
@Override @Override
...@@ -706,7 +706,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -706,7 +706,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
deviceNeedsNoPostProcessWorkaround, deviceNeedsNoPostProcessWorkaround,
tunneling ? tunnelingAudioSessionId : C.AUDIO_SESSION_ID_UNSET); tunneling ? tunnelingAudioSessionId : C.AUDIO_SESSION_ID_UNSET);
if (surface == null) { if (surface == null) {
if (!shouldUseDummySurface(codecInfo)) { if (!shouldUsePlaceholderSurface(codecInfo)) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
if (placeholderSurface == null) { if (placeholderSurface == null) {
...@@ -1333,7 +1333,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -1333,7 +1333,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
maybeNotifyRenderedFirstFrame(); maybeNotifyRenderedFirstFrame();
} }
private boolean shouldUseDummySurface(MediaCodecInfo codecInfo) { private boolean shouldUsePlaceholderSurface(MediaCodecInfo codecInfo) {
return Util.SDK_INT >= 23 return Util.SDK_INT >= 23
&& !tunneling && !tunneling
&& !codecNeedsSetOutputSurfaceWorkaround(codecInfo.name) && !codecNeedsSetOutputSurfaceWorkaround(codecInfo.name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment