Apparently we're back to 8 byte first frame headers on GFE 3.2

This commit is contained in:
Cameron Gutman 2016-12-13 20:33:58 -08:00
parent 52678cfe35
commit 195bf8ed55

View File

@ -51,14 +51,19 @@ public class VideoDepacketizer {
this.nominalPacketDataLength = nominalPacketSize - VideoPacket.HEADER_SIZE; this.nominalPacketDataLength = nominalPacketSize - VideoPacket.HEADER_SIZE;
if ((context.serverAppVersion[0] > 7) || 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[0] == 7 && context.serverAppVersion[1] == 1 && context.serverAppVersion[2] >= 320)) { (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; frameHeaderOffset = 12;
} }
else if (context.serverGeneration >= ConnectionContext.SERVER_GENERATION_5) { else if (context.serverGeneration >= ConnectionContext.SERVER_GENERATION_5) {
// Gen 5 servers have an 8 byte header in the data portion of the first // [5.x, 7.1.320) should use the 8 byte header
// packet of each frame
frameHeaderOffset = 8; frameHeaderOffset = 8;
} }
else { else {