ffmpeg | branch: master | Marvin Scholz <epira...@gmail.com> | Fri Jul 12 18:21:21 2024 +0200| [7857ba97ac556ccd1f4357fe5284b8e8d1c75f35] | committer: Marvin Scholz
lavfi/metal: simplify fallback Instead of using a fallback variable, just do an early return. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7857ba97ac556ccd1f4357fe5284b8e8d1c75f35 --- libavfilter/metal/utils.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/metal/utils.m b/libavfilter/metal/utils.m index f365d3ceea..f6f344158a 100644 --- a/libavfilter/metal/utils.m +++ b/libavfilter/metal/utils.m @@ -28,18 +28,19 @@ void ff_metal_compute_encoder_dispatch(id<MTLDevice> device, NSUInteger w = pipeline.threadExecutionWidth; NSUInteger h = pipeline.maxTotalThreadsPerThreadgroup / w; MTLSize threadsPerThreadgroup = MTLSizeMake(w, h, 1); - BOOL fallback = YES; // MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc) #ifdef MAC_OS_X_VERSION_10_15 if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) { if ([device supportsFamily:MTLGPUFamilyCommon3]) { MTLSize threadsPerGrid = MTLSizeMake(width, height, 1); [encoder dispatchThreads:threadsPerGrid threadsPerThreadgroup:threadsPerThreadgroup]; - fallback = NO; + return; } } #endif - if (fallback) { + + // Fallback path, if we took the above one we already returned so none of this is reached + { MTLSize threadgroups = MTLSizeMake((width + w - 1) / w, (height + h - 1) / h, 1); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
