moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-10 18:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only interact with the AVSampleBufferDisplayLayer on the main thread

Browse Source
This commit is contained in:
Cameron Gutman
2018-06-01 00:31:41 -07:00
parent ec0124e255
commit 04b2fccaef
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Limelight/Stream/VideoDecoderRenderer.m
View File

@@ -269,8 +269,13 @@
if (displayLayer.status == AVQueuedSampleBufferRenderingStatusFailed) {
Log(LOG_E, @"Display layer rendering failed: %@", displayLayer.error);
// Recreate the display layer
[self reinitializeDisplayLayer];
// Recreate the display layer on the main thread.
// We need to use dispatch_sync() or we may miss
// some parameter sets while the layer is being
// recreated.
dispatch_sync(dispatch_get_main_queue(), ^{
[self reinitializeDisplayLayer];
});
// Request an IDR frame to initialize the new decoder
free(data);
@@ -337,14 +342,19 @@
CFDictionarySetValue(dict, kCMSampleAttachmentKey_NotSync, kCFBooleanFalse);
CFDictionarySetValue(dict, kCMSampleAttachmentKey_DependsOnOthers, kCFBooleanFalse);
}
[displayLayer enqueueSampleBuffer:sampleBuffer];
#if !TARGET_OS_IPHONE
_view.frameCount++;
#endif
// Dereference the buffers
CFRelease(blockBuffer);
CFRelease(sampleBuffer);
// Enqueue video samples on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
[self->displayLayer enqueueSampleBuffer:sampleBuffer];
// Dereference the buffers
CFRelease(blockBuffer);
CFRelease(sampleBuffer);
});
return DR_OK;
}