hermes-agent/VoidLink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Acaki committed 2025-07-12 22:05:31 +08:00
1 parent 47a590e92a
commit 29c8382825
2 files changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VoidLink/Stream/VideoDecoderRenderer.h
+2
View File
@@ -19,6 +19,8 @@
@property (atomic, readonly) PlotMetrics decodeMetrics; @property (atomic, readonly) PlotMetrics decodeMetrics;
@property (atomic, readonly) PlotMetrics frameQueueMetrics; @property (atomic, readonly) PlotMetrics frameQueueMetrics;
@property (nonatomic, strong, readonly) AVSampleBufferDisplayLayer *displayLayer;
- (id)initWithView:(UIView*)view callbacks:(id<ConnectionCallbacks>)callbacks streamAspectRatio:(float)aspectRatio; - (id)initWithView:(UIView*)view callbacks:(id<ConnectionCallbacks>)callbacks streamAspectRatio:(float)aspectRatio;
- (void)setupWithVideoFormat:(int)videoFormat width:(int)videoWidth height:(int)videoHeight frameRate:(int)frameRate; - (void)setupWithVideoFormat:(int)videoFormat width:(int)videoWidth height:(int)videoHeight frameRate:(int)frameRate;
VoidLink/Stream/VideoDecoderRenderer.m
+5 -4
View File
@@ -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. // can see the loading progress label as the stream is starting.
_displayLayer.hidden = YES; _displayLayer.hidden = YES;
if (formatDesc != nil) { if (_formatDesc != nil) {
CFRelease(formatDesc); CFRelease(_formatDesc);
formatDesc = nil; _formatDesc = nil;
}
if (_formatDescImageBuffer != nil) { if (_formatDescImageBuffer != nil) {
CFRelease(_formatDescImageBuffer); 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<ConnectionCallbacks>)callbacks streamAspectRatio:(float)aspectRatio - (id)initWithView:(UIView* )view callbacks:(id<ConnectionCallbacks>)callbacks streamAspectRatio:(float)aspectRatio
{ {
NSLog(@"initializing video decoder %f", CACurrentMediaTime()); NSLog(@"initializing video decoder %f", CACurrentMediaTime());
self = [super init]; self = [super init];