From 9c712bb40433475174510f6a71cf269c23c222fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Mon, 21 Oct 2019 17:06:02 +0200 Subject: [PATCH] Fix invalid @Nullable handling in TextureBufferImpl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: Ic0b75c62512e9bcb88d562c754e4ed38058a5ece Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157886 Reviewed-by: Paulina Hensman Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#29650} --- sdk/android/api/org/webrtc/TextureBufferImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/android/api/org/webrtc/TextureBufferImpl.java b/sdk/android/api/org/webrtc/TextureBufferImpl.java index 3d3bbabf91..8d752162dc 100644 --- a/sdk/android/api/org/webrtc/TextureBufferImpl.java +++ b/sdk/android/api/org/webrtc/TextureBufferImpl.java @@ -39,7 +39,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer { private final Handler toI420Handler; private final YuvConverter yuvConverter; private final RefCountDelegate refCountDelegate; - private final @Nullable RefCountMonitor refCountMonitor; + private final RefCountMonitor refCountMonitor; public TextureBufferImpl(int width, int height, Type type, int id, Matrix transformMatrix, Handler toI420Handler, YuvConverter yuvConverter, @Nullable Runnable releaseCallback) { @@ -53,7 +53,9 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer { @Override public void onDestroy(TextureBufferImpl textureBuffer) { - releaseCallback.run(); + if (releaseCallback != null) { + releaseCallback.run(); + } } }); }