From 032bb0498dcabfed897faa5ac5c10e2d52ff132f Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 11 Jun 2020 10:09:29 +0100 Subject: [PATCH] Move FakeRenderer's DrmSession releasing from onReset() to onDisable() This seems to match DecoderVideoRenderer more closely: https://github.com/google/ExoPlayer/blob/b1e56304a1fda8075fc637074927c0886f49fdf1/library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java#L300 Although MediaCodecRenderer does it in onReset() and then calls that from onDisable(): https://github.com/google/ExoPlayer/blob/b1e56304a1fda8075fc637074927c0886f49fdf1/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java#L754 PiperOrigin-RevId: 315859212 --- .../com/google/android/exoplayer2/testutil/FakeRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java index e4f96e0147..d8a0724544 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java @@ -154,7 +154,7 @@ public class FakeRenderer extends BaseRenderer { } @Override - protected void onReset() { + protected void onDisabled() { if (currentDrmSession != null) { currentDrmSession.release(/* eventDispatcher= */ null); currentDrmSession = null;