epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix corrupted final frame in VQA playback.

Browse Source
This commit is contained in:
Paul Chote
2020-10-01 01:39:29 +01:00
committed by reaperrr
parent 92189e4b50
commit cc2e369475
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Mods.Common/FileFormats/VqaReader.cs
View File

@@ -39,6 +39,7 @@ namespace OpenRA.Mods.Common.FileFormats
byte[] cbf; byte[] cbf;
byte[] cbp; byte[] cbp;
byte[] cbfBuffer; byte[] cbfBuffer;
bool cbpIsCompressed;
// Buffer for loading file subchunks, the maximum chunk size of a file is not defined // Buffer for loading file subchunks, the maximum chunk size of a file is not defined
// and the header definition for the size of the biggest chunks (color data) isn't accurate. // and the header definition for the size of the biggest chunks (color data) isn't accurate.
@@ -314,6 +315,20 @@ namespace OpenRA.Mods.Common.FileFormats
// VQA Frame // VQA Frame
public void DecodeVQFR(Stream s, string parentType = "VQFR") public void DecodeVQFR(Stream s, string parentType = "VQFR")
{ {
// The CBP chunks each contain 1/8th of the full lookup table
// Annoyingly, the complete table is not applied until the frame
// *after* the one that contains the 8th chunk.
// Do we have a set of partial lookup tables ready to apply?
if (currentChunkBuffer == chunkBufferParts)
{
if (!cbpIsCompressed)
cbf = (byte[])cbp.Clone();
else
LCWDecodeInto(cbp, cbf);
chunkBufferOffset = currentChunkBuffer = 0;
}
while (true) while (true)
{ {
// Chunks are aligned on even bytes; may be padded with a single null // Chunks are aligned on even bytes; may be padded with a single null
@@ -360,21 +375,11 @@ namespace OpenRA.Mods.Common.FileFormats
// frame-modifier chunk // frame-modifier chunk
case "CBP0": case "CBP0":
case "CBPZ": case "CBPZ":
// Partial buffer is full; dump and recreate
if (currentChunkBuffer == chunkBufferParts)
{
if (type == "CBP0")
cbf = (byte[])cbp.Clone();
else
LCWDecodeInto(cbp, cbf);
chunkBufferOffset = currentChunkBuffer = 0;
}
var bytes = s.ReadBytes(subchunkLength); var bytes = s.ReadBytes(subchunkLength);
bytes.CopyTo(cbp, chunkBufferOffset); bytes.CopyTo(cbp, chunkBufferOffset);
chunkBufferOffset += subchunkLength; chunkBufferOffset += subchunkLength;
currentChunkBuffer++; currentChunkBuffer++;
cbpIsCompressed = type == "CBPZ";
break; break;
// Palette // Palette