From 195bf8ed553e09717bdb031d63554661998d6a13 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 13 Dec 2016 20:33:58 -0800 Subject: [PATCH] Apparently we're back to 8 byte first frame headers on GFE 3.2 --- .../nvstream/av/video/VideoDepacketizer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java index 3edac90c..fa49069d 100644 --- a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java +++ b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java @@ -51,14 +51,19 @@ public class VideoDepacketizer { this.nominalPacketDataLength = nominalPacketSize - VideoPacket.HEADER_SIZE; if ((context.serverAppVersion[0] > 7) || + (context.serverAppVersion[0] == 7 && context.serverAppVersion[1] > 1) || + (context.serverAppVersion[0] == 7 && context.serverAppVersion[1] == 1 && context.serverAppVersion[2] >= 350)) { + // >= 7.1.350 should use the 8 byte header again + frameHeaderOffset = 8; + } + else if ((context.serverAppVersion[0] > 7) || (context.serverAppVersion[0] == 7 && context.serverAppVersion[1] > 1) || (context.serverAppVersion[0] == 7 && context.serverAppVersion[1] == 1 && context.serverAppVersion[2] >= 320)) { - // Anything over 7.1.320 should use the 12 byte frame header + // [7.1.320, 7.1.350) should use the 12 byte frame header frameHeaderOffset = 12; } else if (context.serverGeneration >= ConnectionContext.SERVER_GENERATION_5) { - // Gen 5 servers have an 8 byte header in the data portion of the first - // packet of each frame + // [5.x, 7.1.320) should use the 8 byte header frameHeaderOffset = 8; } else {