mirror of
https://github.com/moonlight-stream/moonlight-ios.git
synced 2026-04-20 23:40:17 +00:00
Add a hack as a possible workaround for #372
This commit is contained in:
@@ -48,10 +48,15 @@ static VideoDecoderRenderer* renderer;
|
|||||||
|
|
||||||
int DrDecoderSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags)
|
int DrDecoderSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags)
|
||||||
{
|
{
|
||||||
[renderer setupWithVideoFormat:videoFormat];
|
[renderer setupWithVideoFormat:videoFormat refreshRate:redrawRate];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DrCleanup(void)
|
||||||
|
{
|
||||||
|
[renderer cleanup];
|
||||||
|
}
|
||||||
|
|
||||||
int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
|
int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
|
||||||
{
|
{
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
@@ -380,6 +385,7 @@ void ClConnectionStatusUpdate(int status)
|
|||||||
|
|
||||||
LiInitializeVideoCallbacks(&_drCallbacks);
|
LiInitializeVideoCallbacks(&_drCallbacks);
|
||||||
_drCallbacks.setup = DrDecoderSetup;
|
_drCallbacks.setup = DrDecoderSetup;
|
||||||
|
_drCallbacks.cleanup = DrCleanup;
|
||||||
_drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
|
_drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit;
|
||||||
|
|
||||||
// RFI doesn't work properly with HEVC on iOS 11 with an iPhone SE (at least)
|
// RFI doesn't work properly with HEVC on iOS 11 with an iPhone SE (at least)
|
||||||
|
|||||||
@@ -12,7 +12,9 @@
|
|||||||
|
|
||||||
- (id)initWithView:(OSView*)view;
|
- (id)initWithView:(OSView*)view;
|
||||||
|
|
||||||
- (void)setupWithVideoFormat:(int)videoFormat;
|
- (void)setupWithVideoFormat:(int)videoFormat refreshRate:(int)refreshRate;
|
||||||
|
|
||||||
|
- (void)cleanup;
|
||||||
|
|
||||||
- (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength;
|
- (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength;
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,8 @@
|
|||||||
|
|
||||||
NSData *spsData, *ppsData, *vpsData;
|
NSData *spsData, *ppsData, *vpsData;
|
||||||
CMVideoFormatDescriptionRef formatDesc;
|
CMVideoFormatDescriptionRef formatDesc;
|
||||||
|
|
||||||
|
CADisplayLink* _displayLink;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)reinitializeDisplayLayer
|
- (void)reinitializeDisplayLayer
|
||||||
@@ -70,12 +72,33 @@
|
|||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setupWithVideoFormat:(int)videoFormat
|
- (void)setupWithVideoFormat:(int)videoFormat refreshRate:(int)refreshRate
|
||||||
{
|
{
|
||||||
self->videoFormat = videoFormat;
|
self->videoFormat = videoFormat;
|
||||||
#if !TARGET_OS_IPHONE
|
#if !TARGET_OS_IPHONE
|
||||||
_view.codec = videoFormat;
|
_view.codec = videoFormat;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (refreshRate > 60) {
|
||||||
|
// HACK: We seem to just get 60 Hz screen updates even with a 120 FPS stream if
|
||||||
|
// we don't set preferredFramesPerSecond somewhere. Since we're a UIKit view, we
|
||||||
|
// have to use CADisplayLink for that. See https://github.com/moonlight-stream/moonlight-ios/issues/372
|
||||||
|
_displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkCallback:)];
|
||||||
|
if (@available(iOS 10.0, tvOS 10.0, *)) {
|
||||||
|
_displayLink.preferredFramesPerSecond = refreshRate;
|
||||||
|
}
|
||||||
|
[_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)displayLinkCallback:(CADisplayLink *)sender
|
||||||
|
{
|
||||||
|
// No-op - rendering done in submitDecodeBuffer
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)cleanup
|
||||||
|
{
|
||||||
|
[_displayLink invalidate];
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FRAME_START_PREFIX_SIZE 4
|
#define FRAME_START_PREFIX_SIZE 4
|
||||||
@@ -356,8 +379,10 @@
|
|||||||
// Enqueue the next frame
|
// Enqueue the next frame
|
||||||
[self->displayLayer enqueueSampleBuffer:sampleBuffer];
|
[self->displayLayer enqueueSampleBuffer:sampleBuffer];
|
||||||
|
|
||||||
// Ensure the layer is visible now
|
if ([self isNalReferencePicture:nalType]) {
|
||||||
self->displayLayer.hidden = NO;
|
// Ensure the layer is visible now
|
||||||
|
self->displayLayer.hidden = NO;
|
||||||
|
}
|
||||||
|
|
||||||
// Dereference the buffers
|
// Dereference the buffers
|
||||||
CFRelease(blockBuffer);
|
CFRelease(blockBuffer);
|
||||||
|
|||||||
Reference in New Issue
Block a user