From 8f22a28e30b05a4716091f6425d34e537cddcb86 Mon Sep 17 00:00:00 2001 From: Paulina Hensman Date: Tue, 26 Mar 2019 16:47:08 +0100 Subject: [PATCH] Check render size instead of frame size. Even if neither frame height nor frame width is <=0 we can end up with <=0 dimensions in renderHeight or renderWidth. With this change, we perform the check on the latter. Bug: webrtc:10367 Change-Id: I9672672659ad7d12cf1e7ccab5b5cde583ae7e8c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129760 Reviewed-by: Magnus Jedvert Commit-Queue: Paulina Hensman Cr-Commit-Position: refs/heads/master@{#27307} --- sdk/android/api/org/webrtc/VideoFrameDrawer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/android/api/org/webrtc/VideoFrameDrawer.java b/sdk/android/api/org/webrtc/VideoFrameDrawer.java index 7563ebabc9..66c1c4fb0e 100644 --- a/sdk/android/api/org/webrtc/VideoFrameDrawer.java +++ b/sdk/android/api/org/webrtc/VideoFrameDrawer.java @@ -190,13 +190,12 @@ public class VideoFrameDrawer { int viewportHeight) { final int width = frame.getRotatedWidth(); final int height = frame.getRotatedHeight(); - if (width <= 0 || height <= 0) { - Logging.w(TAG, "Illegal frame size: " + height + "x" + width); + calculateTransformedRenderSize(width, height, additionalRenderMatrix); + if (renderWidth <= 0 || renderHeight <= 0) { + Logging.w(TAG, "Illegal frame size: " + renderWidth + "x" + renderHeight); return; } - calculateTransformedRenderSize(width, height, additionalRenderMatrix); - final boolean isTextureFrame = frame.getBuffer() instanceof VideoFrame.TextureBuffer; renderMatrix.reset(); renderMatrix.preTranslate(0.5f, 0.5f);