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

Addressed review comments

Browse Source 
- Renamed `IVideo.CurrentFrameNumber` to `CurrentFrameIndex`
 - Improved logged error message in VideoPlayerWidget
 - Renumbered fields in ThreadedGraphicsContext
This commit is contained in:
penev92
2022-01-09 22:54:54 +02:00
committed by Matthias Mailänder
parent 248b8d1102
commit 860ec642b8
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Cnc/FileFormats/VqaVideo.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
public ushort Height { get; }
public byte[] CurrentFrameData { get; }
public int CurrentFrameNumber { get; private set; }
public int CurrentFrameIndex { get; private set; }
public bool HasAudio { get; set; }
public byte[] AudioData { get; private set; } // audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
@@ -163,7 +163,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
public void Reset()
{
CurrentFrameNumber = chunkBufferOffset = currentChunkBuffer = 0;
CurrentFrameIndex = chunkBufferOffset = currentChunkBuffer = 0;
LoadFrame();
}
@@ -260,18 +260,18 @@ namespace OpenRA.Mods.Cnc.FileFormats
public void AdvanceFrame()
{
CurrentFrameNumber++;
CurrentFrameIndex++;
LoadFrame();
}
void LoadFrame()
{
if (CurrentFrameNumber >= FrameCount)
if (CurrentFrameIndex >= FrameCount)
return;
// Seek to the start of the frame
stream.Seek(offsets[CurrentFrameNumber], SeekOrigin.Begin);
var end = (CurrentFrameNumber < FrameCount - 1) ? offsets[CurrentFrameNumber + 1] : stream.Length;
stream.Seek(offsets[CurrentFrameIndex], SeekOrigin.Begin);
var end = (CurrentFrameIndex < FrameCount - 1) ? offsets[CurrentFrameIndex + 1] : stream.Length;
while (stream.Position < end)
{

12
OpenRA.Mods.Cnc/FileFormats/WsaVideo.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
public ushort Height { get; }
public byte[] CurrentFrameData { get; }
public int CurrentFrameNumber { get; private set; }
public int CurrentFrameIndex { get; private set; }
public bool HasAudio => false;
public byte[] AudioData => null;
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
public void Reset()
{
CurrentFrameNumber = 0;
CurrentFrameIndex = 0;
previousFramePaletteIndexData = null;
LoadFrame();
}
@@ -107,18 +107,18 @@ namespace OpenRA.Mods.Cnc.FileFormats
public void AdvanceFrame()
{
previousFramePaletteIndexData = currentFramePaletteIndexData;
CurrentFrameNumber++;
CurrentFrameIndex++;
LoadFrame();
}
void LoadFrame()
{
if (CurrentFrameNumber >= FrameCount)
if (CurrentFrameIndex >= FrameCount)
return;
stream.Seek(frameOffsets[CurrentFrameNumber], SeekOrigin.Begin);
stream.Seek(frameOffsets[CurrentFrameIndex], SeekOrigin.Begin);
var dataLength = frameOffsets[CurrentFrameNumber + 1] - frameOffsets[CurrentFrameNumber];
var dataLength = frameOffsets[CurrentFrameIndex + 1] - frameOffsets[CurrentFrameIndex];
var rawData = StreamExts.ReadBytes(stream, (int)dataLength);
var intermediateData = new byte[Width * Height];