From 48fcf943fd2a4d52f6e77d7f99eccd1aac577c43 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 28 Nov 2018 13:55:55 +0100 Subject: [PATCH] React to changes in either width or height in iOS Metal renderer. Bug: webrtc:10024 Change-Id: Ia17ab43887fc1dfdf4058bed097c05b396a6d895 Reviewed-on: https://webrtc-review.googlesource.com/c/112281 Reviewed-by: Peter Hanspers Commit-Queue: Anders Carlsson Cr-Commit-Position: refs/heads/master@{#25824} --- sdk/objc/components/renderer/metal/RTCMTLI420Renderer.mm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/objc/components/renderer/metal/RTCMTLI420Renderer.mm b/sdk/objc/components/renderer/metal/RTCMTLI420Renderer.mm index 668b9aed13..a6e22035bd 100644 --- a/sdk/objc/components/renderer/metal/RTCMTLI420Renderer.mm +++ b/sdk/objc/components/renderer/metal/RTCMTLI420Renderer.mm @@ -118,7 +118,7 @@ static NSString *const shaderSource = MTL_STRINGIFY( id buffer = [frame.buffer toI420]; // Luma (y) texture. - if (!_descriptor || (_width != frame.width && _height != frame.height)) { + if (!_descriptor || _width != frame.width || _height != frame.height) { _width = frame.width; _height = frame.height; _descriptor = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatR8Unorm @@ -135,8 +135,7 @@ static NSString *const shaderSource = MTL_STRINGIFY( withBytes:buffer.dataY bytesPerRow:buffer.strideY]; - if (!_chromaDescriptor || - (_chromaWidth != frame.width / 2 && _chromaHeight != frame.height / 2)) { + if (!_chromaDescriptor || _chromaWidth != frame.width / 2 || _chromaHeight != frame.height / 2) { _chromaWidth = frame.width / 2; _chromaHeight = frame.height / 2; _chromaDescriptor =