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

buffer up all the audio upfront

Browse Source
This commit is contained in:
Chris Forbes
2010-08-11 22:56:32 +12:00
parent 8dd9848636
commit ca6debde66
4 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
OpenRA.FileFormats/Graphics/VqaReader.cs
View File

@@ -6,15 +6,12 @@
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
#endregion
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System;
using System.Drawing.Imaging;
#endregion
using System;
using System.Drawing;
using System.IO;
namespace OpenRA.FileFormats
{
public class VqaReader
@@ -48,7 +45,8 @@ namespace OpenRA.FileFormats
int[,] frameData;
byte[] audioData; // audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
public byte[] AudioData { get { return audioData; } }
public byte[] AudioData { get { return audioData; } }
public int CurrentFrame { get { return currentFrame; } }
public VqaReader( Stream stream )
{
@@ -107,13 +105,49 @@ namespace OpenRA.FileFormats
offsets[i] = reader.ReadUInt32();
if (offsets[i] > 0x40000000) offsets[i] -= 0x40000000;
offsets[i] <<= 1;
}
}
CollectAudioData();
// Load the first frame
currentFrame = 0;
AdvanceFrame();
}
}
void CollectAudioData()
{
var ms = new MemoryStream();
var adpcmIndex = 0;
for (var i = 0; i < Frames; i++)
{
stream.Seek(offsets[i], SeekOrigin.Begin);
BinaryReader reader = new BinaryReader(stream);
var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
while (reader.BaseStream.Position < end)
{
var type = new String(reader.ReadChars(4));
var length = Swap(reader.ReadUInt32());
switch (type)
{
case "SND2":
var rawAudio = reader.ReadBytes((int)length);
ms.Write(rawAudio);
break;
default:
reader.ReadBytes((int)length);
break;
}
if (reader.PeekChar() == 0) reader.ReadByte();
}
}
audioData = AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex);
}
public void AdvanceFrame()
{
// Seek to the start of the frame
@@ -129,11 +163,8 @@ namespace OpenRA.FileFormats
switch(type)
{
case "SND2":
// Don't parse sound (yet); skip data
{
var rawAudio = reader.ReadBytes((int)length);
audioData = AudLoader.LoadSound(rawAudio, ref adpcmIndex);
}
// Don't parse sound here.
reader.ReadBytes((int)length);
break;
case "VQFR":
DecodeVQFR(reader);
@@ -147,9 +178,7 @@ namespace OpenRA.FileFormats
}
if (++currentFrame == Frames)
currentFrame = cbOffset = cbChunk = 0;
}
int adpcmIndex = 0;
}
// VQA Frame
public void DecodeVQFR(BinaryReader reader)