From 29c8382825e3e94b20f5590c31b55e90f118705f Mon Sep 17 00:00:00 2001 From: Acaki Date: Sat, 12 Jul 2025 22:05:31 +0800 Subject: [PATCH] fix: conflicts --- VoidLink/Stream/VideoDecoderRenderer.h | 2 ++ VoidLink/Stream/VideoDecoderRenderer.m | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/VoidLink/Stream/VideoDecoderRenderer.h b/VoidLink/Stream/VideoDecoderRenderer.h index b1f1cff1..1b1adbb0 100644 --- a/VoidLink/Stream/VideoDecoderRenderer.h +++ b/VoidLink/Stream/VideoDecoderRenderer.h @@ -19,6 +19,8 @@ @property (atomic, readonly) PlotMetrics decodeMetrics; @property (atomic, readonly) PlotMetrics frameQueueMetrics; +@property (nonatomic, strong, readonly) AVSampleBufferDisplayLayer *displayLayer; + - (id)initWithView:(UIView*)view callbacks:(id)callbacks streamAspectRatio:(float)aspectRatio; - (void)setupWithVideoFormat:(int)videoFormat width:(int)videoWidth height:(int)videoHeight frameRate:(int)frameRate; diff --git a/VoidLink/Stream/VideoDecoderRenderer.m b/VoidLink/Stream/VideoDecoderRenderer.m index 8b9b725f..13353731 100644 --- a/VoidLink/Stream/VideoDecoderRenderer.m +++ b/VoidLink/Stream/VideoDecoderRenderer.m @@ -87,9 +87,10 @@ extern int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size, // can see the loading progress label as the stream is starting. _displayLayer.hidden = YES; - if (formatDesc != nil) { - CFRelease(formatDesc); - formatDesc = nil; + if (_formatDesc != nil) { + CFRelease(_formatDesc); + _formatDesc = nil; + } if (_formatDescImageBuffer != nil) { CFRelease(_formatDescImageBuffer); @@ -103,7 +104,7 @@ extern int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size, } } -- (id)initWithView:(StreamView*)view callbacks:(id)callbacks streamAspectRatio:(float)aspectRatio +- (id)initWithView:(UIView* )view callbacks:(id)callbacks streamAspectRatio:(float)aspectRatio { NSLog(@"initializing video decoder %f", CACurrentMediaTime()); self = [super init];