From 3bc9e050f19e255e7396b7985b4e436cdfb8b1d2 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 3 Dec 2017 11:33:11 -0800 Subject: [PATCH] Update common-c and use codec masks rather than exact formats --- Limelight/Stream/VideoDecoderRenderer.m | 6 +++--- moonlight-common/moonlight-common-c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Limelight/Stream/VideoDecoderRenderer.m b/Limelight/Stream/VideoDecoderRenderer.m index cdaed16..54be973 100644 --- a/Limelight/Stream/VideoDecoderRenderer.m +++ b/Limelight/Stream/VideoDecoderRenderer.m @@ -75,7 +75,7 @@ - (Boolean)readyForPictureData { - if (videoFormat == VIDEO_FORMAT_H264) { + if (videoFormat & VIDEO_FORMAT_MASK_H264) { return !waitingForSps && !waitingForPps; } else { @@ -86,7 +86,7 @@ - (Boolean)isNalReferencePicture:(unsigned char)nalType { - if (videoFormat == VIDEO_FORMAT_H264) { + if (videoFormat & VIDEO_FORMAT_MASK_H264) { return nalType == 0x65; } else { @@ -201,7 +201,7 @@ // See if we've got all the parameter sets we need for our video format if ([self readyForPictureData]) { - if (videoFormat == VIDEO_FORMAT_H264) { + if (videoFormat & VIDEO_FORMAT_MASK_H264) { const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] }; const size_t parameterSetSizes[] = { [spsData length], [ppsData length] }; diff --git a/moonlight-common/moonlight-common-c b/moonlight-common/moonlight-common-c index 1c386a8..f6ae7fc 160000 --- a/moonlight-common/moonlight-common-c +++ b/moonlight-common/moonlight-common-c @@ -1 +1 @@ -Subproject commit 1c386a898731ae07168d52c835657409b54f7790 +Subproject commit f6ae7fc2b4d2c0c5d2a8cb8ebc55f4157156c9f1