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

Updated VideoPlayerWidget to play new IVideo data

Browse Source 
Added optional padding to video frames because that's what VideoPlayerWidget expects.
Keeping the option to not use padding for other use-cases like converting frames to PNG.
This commit is contained in:
penev92
2021-09-22 01:58:33 +03:00
committed by Matthias Mailänder
parent ee29d0f9c7
commit c4ab7041b8
8 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Graphics/VideoLoader.cs
View File

@@ -15,15 +15,15 @@ namespace OpenRA.Video
{
public interface IVideoLoader
{
bool TryParseVideo(Stream s, out IVideo video);
bool TryParseVideo(Stream s, bool useFramePadding, out IVideo video);
}
public static class VideoLoader
{
public static IVideo GetVideo(Stream stream, IVideoLoader[] loaders)
public static IVideo GetVideo(Stream stream, bool useFramePadding, IVideoLoader[] loaders)
{
foreach (var loader in loaders)
if (loader.TryParseVideo(stream, out var video))
if (loader.TryParseVideo(stream, useFramePadding, out var video))
return video;
return null;

19
OpenRA.Mods.Cnc/FileFormats/VqaReader.cs
View File

@@ -41,6 +41,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
readonly uint[] offsets;
readonly uint[] palette;
readonly uint videoFlags; // if 0x10 is set the video is a 16 bit hq video (ts and later)
readonly ushort totalFrameWidth;
// Stores a list of subpixels, referenced by the VPTZ chunk
byte[] cbf;
@@ -60,7 +61,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
// Top half contains block info, bottom half contains references to cbf array
byte[] origData;
public VqaReader(Stream stream)
public VqaReader(Stream stream, bool useFramePadding)
{
this.stream = stream;
@@ -145,7 +146,17 @@ namespace OpenRA.Mods.Cnc.FileFormats
CollectAudioData();
CurrentFrameData = new byte[Width * Height * 4];
if (useFramePadding)
{
var frameSize = Exts.NextPowerOf2(Math.Max(Width, Height));
CurrentFrameData = new byte[frameSize * frameSize * 4];
totalFrameWidth = (ushort)frameSize;
}
else
{
CurrentFrameData = new byte[Width * Height * 4];
totalFrameWidth = Width;
}
Reset();
}
@@ -485,7 +496,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
var pixelX = x * blockWidth + i;
var pixelY = y * blockHeight + j;
var pos = pixelY * Width + pixelX;
var pos = pixelY * totalFrameWidth + pixelX;
CurrentFrameData[pos * 4] = (byte)(color & 0xFF);
CurrentFrameData[pos * 4 + 1] = (byte)(color >> 8 & 0xFF);
CurrentFrameData[pos * 4 + 2] = (byte)(color >> 16 & 0xFF);
@@ -511,7 +522,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
var pixelX = x * blockWidth + bx;
var pixelY = y * blockHeight + by;
var pos = pixelY * Width + pixelX;
var pos = pixelY * totalFrameWidth + pixelX;
CurrentFrameData[pos * 4] = cbf[offset + p + 2];
CurrentFrameData[pos * 4 + 1] = cbf[offset + p + 1];
CurrentFrameData[pos * 4 + 2] = cbf[offset + p];

18
OpenRA.Mods.Cnc/FileFormats/WsaReader.cs
View File

@@ -34,11 +34,12 @@ namespace OpenRA.Mods.Cnc.FileFormats
readonly Stream stream;
readonly uint[] palette;
readonly uint[] frameOffsets;
readonly ushort totalFrameWidth;
byte[] previousFramePaletteIndexData;
byte[] currentFramePaletteIndexData;
public WsaReader(Stream stream)
public WsaReader(Stream stream, bool useFramePadding)
{
this.stream = stream;
@@ -78,7 +79,17 @@ namespace OpenRA.Mods.Cnc.FileFormats
frameOffsets[i] += 768;
}
CurrentFrameData = new byte[Width * Height * 4];
if (useFramePadding)
{
var frameSize = Exts.NextPowerOf2(Math.Max(Width, Height));
CurrentFrameData = new byte[frameSize * frameSize * 4];
totalFrameWidth = (ushort)frameSize;
}
else
{
CurrentFrameData = new byte[Width * Height * 4];
totalFrameWidth = Width;
}
Reset();
}
@@ -133,6 +144,9 @@ namespace OpenRA.Mods.Cnc.FileFormats
CurrentFrameData[position++] = (byte)(color >> 16 & 0xFF);
CurrentFrameData[position++] = (byte)(color >> 24 & 0xFF);
}
// Recalculate the position in the byte array to the start of the next pixel row just in case there is padding in the frame.
position = (y + 1) * totalFrameWidth * 4;
}
}
}

4
OpenRA.Mods.Cnc/VideoLoaders/VqaLoader.cs
View File

@@ -17,14 +17,14 @@ namespace OpenRA.Mods.Cnc.VideoLoaders
{
public class VqaLoader : IVideoLoader
{
public bool TryParseVideo(Stream s, out IVideo video)
public bool TryParseVideo(Stream s, bool useFramePadding, out IVideo video)
{
video = null;
if (!IsWestwoodVqa(s))
return false;
video = new VqaReader(s);
video = new VqaReader(s, useFramePadding);
return true;
}

4
OpenRA.Mods.Cnc/VideoLoaders/WsaLoader.cs
View File

@@ -18,14 +18,14 @@ namespace OpenRA.Mods.Cnc.VideoLoaders
{
public class WsaLoader : IVideoLoader
{
public bool TryParseVideo(Stream s, out IVideo video)
public bool TryParseVideo(Stream s, bool useFramePadding, out IVideo video)
{
video = null;
if (!IsWsa(s))
return false;
video = new WsaReader(s);
video = new WsaReader(s, useFramePadding);
return true;
}

2
OpenRA.Mods.Common/Scripting/Media.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Scripting
public static IVideo LoadVideo(Stream s)
{
return VideoLoader.GetVideo(s, Game.ModData.VideoLoaders);
return VideoLoader.GetVideo(s, true, Game.ModData.VideoLoaders);
}
}
}

2
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -506,7 +506,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Mute music so it doesn't interfere with the current asset.
MuteSounds();
var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(filename), Game.ModData.VideoLoaders);
var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(filename), true, Game.ModData.VideoLoaders);
if (video != null)
{
player = panel.Get<VideoPlayerWidget>("PLAYER");

13
OpenRA.Mods.Common/Widgets/VideoPlayerWidget.cs
View File

@@ -37,6 +37,7 @@ namespace OpenRA.Mods.Common.Widgets
float overlayScale;
bool stopped;
bool paused;
int textureSize;
Action onComplete;
@@ -45,7 +46,7 @@ namespace OpenRA.Mods.Common.Widgets
if (filename == cachedVideo)
return;
var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(filename), Game.ModData.VideoLoaders);
var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(filename), true, Game.ModData.VideoLoaders);
Open(video);
cachedVideo = filename;
@@ -63,11 +64,11 @@ namespace OpenRA.Mods.Common.Widgets
invLength = video.Framerate * 1f / video.FrameCount;
var size = Math.Max(video.Width, video.Height);
var textureSize = Exts.NextPowerOf2(size);
textureSize = Exts.NextPowerOf2(size);
var videoSheet = new Sheet(SheetType.BGRA, new Size(textureSize, textureSize));
videoSheet.GetTexture().ScaleFilter = TextureScaleFilter.Linear;
videoSheet.GetTexture().SetData(video.CurrentFrameData);
videoSheet.GetTexture().SetData(video.CurrentFrameData, textureSize, textureSize);
videoSprite = new Sprite(videoSheet,
new Rectangle(
@@ -110,12 +111,12 @@ namespace OpenRA.Mods.Common.Widgets
while (nextFrame > video.CurrentFrameNumber)
{
video.AdvanceFrame();
videoSprite.Sheet.GetTexture().SetData(video.CurrentFrameData);
videoSprite.Sheet.GetTexture().SetData(video.CurrentFrameData, textureSize, textureSize);
skippedFrames++;
}
if (skippedFrames > 1)
Log.Write("perf", "VqaPlayer : {0} skipped {1} frames at position {2}", cachedVideo, skippedFrames, video.CurrentFrameNumber);
Log.Write("perf", "VideoPlayer: {0} skipped {1} frames at position {2}", cachedVideo, skippedFrames, video.CurrentFrameNumber);
}
WidgetUtils.DrawSprite(videoSprite, videoOrigin, videoSize);
@@ -218,7 +219,7 @@ namespace OpenRA.Mods.Common.Widgets
paused = true;
Game.Sound.StopVideo();
video.Reset();
videoSprite.Sheet.GetTexture().SetData(video.CurrentFrameData);
videoSprite.Sheet.GetTexture().SetData(video.CurrentFrameData, textureSize, textureSize);
Game.RunAfterTick(onComplete);
}