Added support for ADPCM codec, new features and bugfix in audio player

This commit is contained in:
kolardavid 2018-01-11 20:55:56 +01:00
parent 7dbaa8dd82
commit 54681da20a
4 changed files with 1113 additions and 871 deletions

View File

@ -32,6 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AwcForm));
this.MainTabControl = new System.Windows.Forms.TabControl();
this.PlayerTabPage = new System.Windows.Forms.TabPage();
this.LabelInfo = new System.Windows.Forms.Label();
this.LabelTime = new System.Windows.Forms.Label();
this.StopButton = new System.Windows.Forms.Button();
this.VolumeLabel = new System.Windows.Forms.Label();
this.chbAutoJump = new System.Windows.Forms.CheckBox();
this.PrevButton = new System.Windows.Forms.Button();
@ -41,13 +44,18 @@
this.PlaylistNameHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.PlaylistTypeHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.PlaylistLengthHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ExportAsWav = new System.Windows.Forms.ToolStripMenuItem();
this.VolumeTrackBar = new System.Windows.Forms.TrackBar();
this.PositionTrackBar = new System.Windows.Forms.TrackBar();
this.DetailsTabPage = new System.Windows.Forms.TabPage();
this.DetailsPropertyGrid = new CodeWalker.WinForms.PropertyGridFix();
this.Timer = new System.Windows.Forms.Timer(this.components);
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.PlaylistSizeHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.MainTabControl.SuspendLayout();
this.PlayerTabPage.SuspendLayout();
this.contextMenuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.VolumeTrackBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PositionTrackBar)).BeginInit();
this.DetailsTabPage.SuspendLayout();
@ -61,11 +69,14 @@
this.MainTabControl.Location = new System.Drawing.Point(0, 0);
this.MainTabControl.Name = "MainTabControl";
this.MainTabControl.SelectedIndex = 0;
this.MainTabControl.Size = new System.Drawing.Size(576, 358);
this.MainTabControl.Size = new System.Drawing.Size(576, 361);
this.MainTabControl.TabIndex = 0;
//
// PlayerTabPage
//
this.PlayerTabPage.Controls.Add(this.LabelInfo);
this.PlayerTabPage.Controls.Add(this.LabelTime);
this.PlayerTabPage.Controls.Add(this.StopButton);
this.PlayerTabPage.Controls.Add(this.VolumeLabel);
this.PlayerTabPage.Controls.Add(this.chbAutoJump);
this.PlayerTabPage.Controls.Add(this.PrevButton);
@ -77,25 +88,54 @@
this.PlayerTabPage.Location = new System.Drawing.Point(4, 22);
this.PlayerTabPage.Name = "PlayerTabPage";
this.PlayerTabPage.Padding = new System.Windows.Forms.Padding(3);
this.PlayerTabPage.Size = new System.Drawing.Size(568, 332);
this.PlayerTabPage.Size = new System.Drawing.Size(568, 335);
this.PlayerTabPage.TabIndex = 0;
this.PlayerTabPage.Text = "Player";
this.PlayerTabPage.UseVisualStyleBackColor = true;
//
// LabelInfo
//
this.LabelInfo.AutoSize = true;
this.LabelInfo.Location = new System.Drawing.Point(8, 247);
this.LabelInfo.Name = "LabelInfo";
this.LabelInfo.Size = new System.Drawing.Size(0, 13);
this.LabelInfo.TabIndex = 12;
//
// LabelTime
//
this.LabelTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.LabelTime.Location = new System.Drawing.Point(285, 308);
this.LabelTime.Name = "LabelTime";
this.LabelTime.Size = new System.Drawing.Size(114, 17);
this.LabelTime.TabIndex = 11;
this.LabelTime.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// StopButton
//
this.StopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.StopButton.Enabled = false;
this.StopButton.Location = new System.Drawing.Point(211, 304);
this.StopButton.Name = "StopButton";
this.StopButton.Size = new System.Drawing.Size(31, 23);
this.StopButton.TabIndex = 10;
this.StopButton.Text = "◼";
this.StopButton.UseVisualStyleBackColor = true;
//
// VolumeLabel
//
this.VolumeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.VolumeLabel.AutoSize = true;
this.VolumeLabel.Location = new System.Drawing.Point(414, 305);
this.VolumeLabel.Location = new System.Drawing.Point(405, 308);
this.VolumeLabel.Name = "VolumeLabel";
this.VolumeLabel.Size = new System.Drawing.Size(42, 13);
this.VolumeLabel.Size = new System.Drawing.Size(60, 13);
this.VolumeLabel.TabIndex = 9;
this.VolumeLabel.Text = "Volume";
this.VolumeLabel.Text = "🕩 Volume";
//
// chbAutoJump
//
this.chbAutoJump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.chbAutoJump.AutoSize = true;
this.chbAutoJump.Enabled = false;
this.chbAutoJump.Location = new System.Drawing.Point(17, 305);
this.chbAutoJump.Location = new System.Drawing.Point(17, 308);
this.chbAutoJump.Name = "chbAutoJump";
this.chbAutoJump.Size = new System.Drawing.Size(108, 17);
this.chbAutoJump.TabIndex = 8;
@ -104,34 +144,34 @@
//
// PrevButton
//
this.PrevButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.PrevButton.Location = new System.Drawing.Point(137, 301);
this.PrevButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.PrevButton.Location = new System.Drawing.Point(137, 304);
this.PrevButton.Name = "PrevButton";
this.PrevButton.Size = new System.Drawing.Size(31, 23);
this.PrevButton.TabIndex = 2;
this.PrevButton.Text = "<<";
this.PrevButton.Text = "";
this.PrevButton.UseVisualStyleBackColor = true;
this.PrevButton.Click += new System.EventHandler(this.PrevButton_Click);
//
// NextButton
//
this.NextButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.NextButton.Location = new System.Drawing.Point(255, 301);
this.NextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.NextButton.Location = new System.Drawing.Point(248, 304);
this.NextButton.Name = "NextButton";
this.NextButton.Size = new System.Drawing.Size(31, 23);
this.NextButton.TabIndex = 4;
this.NextButton.Text = ">>";
this.NextButton.Text = "";
this.NextButton.UseVisualStyleBackColor = true;
this.NextButton.Click += new System.EventHandler(this.NextButton_Click);
//
// PlayButton
//
this.PlayButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.PlayButton.Location = new System.Drawing.Point(174, 301);
this.PlayButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.PlayButton.Location = new System.Drawing.Point(174, 304);
this.PlayButton.Name = "PlayButton";
this.PlayButton.Size = new System.Drawing.Size(75, 23);
this.PlayButton.Size = new System.Drawing.Size(31, 23);
this.PlayButton.TabIndex = 3;
this.PlayButton.Text = "Play/Pause";
this.PlayButton.Text = "";
this.PlayButton.UseVisualStyleBackColor = true;
this.PlayButton.Click += new System.EventHandler(this.PlayButton_Click);
//
@ -143,13 +183,15 @@
this.PlayListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.PlaylistNameHeader,
this.PlaylistTypeHeader,
this.PlaylistLengthHeader});
this.PlaylistLengthHeader,
this.PlaylistSizeHeader});
this.PlayListView.ContextMenuStrip = this.contextMenuStrip;
this.PlayListView.FullRowSelect = true;
this.PlayListView.HideSelection = false;
this.PlayListView.Location = new System.Drawing.Point(6, 6);
this.PlayListView.MultiSelect = false;
this.PlayListView.Name = "PlayListView";
this.PlayListView.Size = new System.Drawing.Size(556, 235);
this.PlayListView.Size = new System.Drawing.Size(556, 238);
this.PlayListView.TabIndex = 0;
this.PlayListView.UseCompatibleStateImageBehavior = false;
this.PlayListView.View = System.Windows.Forms.View.Details;
@ -158,7 +200,7 @@
// PlaylistNameHeader
//
this.PlaylistNameHeader.Text = "Name";
this.PlaylistNameHeader.Width = 303;
this.PlaylistNameHeader.Width = 260;
//
// PlaylistTypeHeader
//
@ -168,14 +210,29 @@
// PlaylistLengthHeader
//
this.PlaylistLengthHeader.Text = "Length";
this.PlaylistLengthHeader.Width = 110;
this.PlaylistLengthHeader.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.PlaylistLengthHeader.Width = 80;
//
// contextMenuStrip
//
this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ExportAsWav});
this.contextMenuStrip.Name = "contextMenuStrip1";
this.contextMenuStrip.Size = new System.Drawing.Size(153, 48);
//
// ExportAsWav
//
this.ExportAsWav.Name = "ExportAsWav";
this.ExportAsWav.Size = new System.Drawing.Size(152, 22);
this.ExportAsWav.Text = "Export as .wav";
this.ExportAsWav.Click += new System.EventHandler(this.ExportAsWav_Click);
//
// VolumeTrackBar
//
this.VolumeTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.VolumeTrackBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.VolumeTrackBar.LargeChange = 10;
this.VolumeTrackBar.Location = new System.Drawing.Point(455, 301);
this.VolumeTrackBar.Location = new System.Drawing.Point(455, 304);
this.VolumeTrackBar.Maximum = 100;
this.VolumeTrackBar.Name = "VolumeTrackBar";
this.VolumeTrackBar.Size = new System.Drawing.Size(105, 45);
@ -190,7 +247,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.PositionTrackBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.PositionTrackBar.LargeChange = 1000;
this.PositionTrackBar.Location = new System.Drawing.Point(6, 263);
this.PositionTrackBar.Location = new System.Drawing.Point(6, 266);
this.PositionTrackBar.Maximum = 1000;
this.PositionTrackBar.Name = "PositionTrackBar";
this.PositionTrackBar.Size = new System.Drawing.Size(554, 45);
@ -204,7 +261,7 @@
this.DetailsTabPage.Location = new System.Drawing.Point(4, 22);
this.DetailsTabPage.Name = "DetailsTabPage";
this.DetailsTabPage.Padding = new System.Windows.Forms.Padding(3);
this.DetailsTabPage.Size = new System.Drawing.Size(568, 332);
this.DetailsTabPage.Size = new System.Drawing.Size(568, 335);
this.DetailsTabPage.TabIndex = 1;
this.DetailsTabPage.Text = "Details";
this.DetailsTabPage.UseVisualStyleBackColor = true;
@ -215,27 +272,41 @@
this.DetailsPropertyGrid.HelpVisible = false;
this.DetailsPropertyGrid.Location = new System.Drawing.Point(3, 3);
this.DetailsPropertyGrid.Name = "DetailsPropertyGrid";
this.DetailsPropertyGrid.Size = new System.Drawing.Size(562, 326);
this.DetailsPropertyGrid.Size = new System.Drawing.Size(562, 329);
this.DetailsPropertyGrid.TabIndex = 0;
//
// Timer
//
this.Timer.Enabled = true;
this.Timer.Interval = 25;
this.Timer.Tick += new System.EventHandler(this.Timer_Tick);
//
// saveFileDialog
//
this.saveFileDialog.DefaultExt = "wav";
this.saveFileDialog.Filter = "Wave files (*.wav)|*.wav";
//
// PlaylistSizeHeader
//
this.PlaylistSizeHeader.Text = "Size";
this.PlaylistSizeHeader.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.PlaylistSizeHeader.Width = 80;
//
// AwcForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(576, 358);
this.ClientSize = new System.Drawing.Size(576, 361);
this.Controls.Add(this.MainTabControl);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(592, 300);
this.Name = "AwcForm";
this.Text = "AWC Player - CodeWalker by dexyfex";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AwcForm_FormClosing);
this.MainTabControl.ResumeLayout(false);
this.PlayerTabPage.ResumeLayout(false);
this.PlayerTabPage.PerformLayout();
this.contextMenuStrip.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.VolumeTrackBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.PositionTrackBar)).EndInit();
this.DetailsTabPage.ResumeLayout(false);
@ -261,5 +332,12 @@
private System.Windows.Forms.Timer Timer;
private System.Windows.Forms.CheckBox chbAutoJump;
private System.Windows.Forms.Label VolumeLabel;
private System.Windows.Forms.Button StopButton;
private System.Windows.Forms.Label LabelTime;
private System.Windows.Forms.Label LabelInfo;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
private System.Windows.Forms.ToolStripMenuItem ExportAsWav;
private System.Windows.Forms.SaveFileDialog saveFileDialog;
private System.Windows.Forms.ColumnHeader PlaylistSizeHeader;
}
}

View File

@ -12,6 +12,7 @@ namespace CodeWalker.Forms
{
public AwcFile Awc { get; set; }
private AwcAudio currentAudio;
private XAudio2 xAudio2;
private MasteringVoice masteringVoice;
private AudioBuffer audioBuffer;
@ -33,7 +34,9 @@ namespace CodeWalker.Forms
private PlayerState playerState = PlayerState.Stopped;
private Stopwatch playtime;
private int playBeginMs;
private float trackLength;
private bool trackFinished;
public AwcForm()
{
@ -59,6 +62,8 @@ namespace CodeWalker.Forms
}
PlayListView.Items.Clear();
float totalLength = 0;
if (awc.Audios != null)
{
foreach (var audio in awc.Audios)
@ -66,10 +71,13 @@ namespace CodeWalker.Forms
var item = PlayListView.Items.Add(audio.Name);
item.SubItems.Add(audio.Type);
item.SubItems.Add(audio.LengthStr);
item.SubItems.Add(TextUtil.GetBytesReadable(audio.Data.Length));
item.Tag = audio;
totalLength += audio.Length;
}
}
LabelInfo.Text = awc.Audios.Length.ToString() + " track(s), Length: " + TimeSpan.FromSeconds((float)totalLength).ToString("m\\:ss");
UpdateFormTitle();
}
@ -94,18 +102,33 @@ namespace CodeWalker.Forms
if (playerState == PlayerState.Stopped)
playtime.Reset();
playtime.Start();
PlayButton.Text = "\u275A\u275A";
StopButton.Enabled = true;
LabelTime.Visible = true;
break;
default:
case PlayerState.Paused:
playtime.Stop();
PlayButton.Text = "\u25B6";
StopButton.Enabled = true;
LabelTime.Visible = true;
break;
case PlayerState.Stopped:
playtime.Stop();
PlayButton.Text = "\u25B6";
LabelTime.Visible = false;
StopButton.Enabled = true;
break;
}
playerState = newState;
UpdateUI();
}
}
private void InitializeAudio(AwcAudio audio)
private void InitializeAudio(AwcAudio audio, float playBegin = 0)
{
currentAudio = audio;
trackLength = audio.Length;
if (xAudio2 == null)
@ -122,11 +145,24 @@ namespace CodeWalker.Forms
AudioBytes = (int)soundStream.Length,
Flags = BufferFlags.EndOfStream
};
if (playBegin > 0)
{
audioBuffer.PlayBegin = (int)(soundStream.Format.SampleRate * playBegin) / 128 * 128;
if (playtime.IsRunning)
playtime.Restart();
else
playtime.Reset();
playBeginMs = (int)(playBegin * 1000);
}
else
playBeginMs = 0;
soundStream.Close();
wavStream.Close();
trackFinished = false;
sourceVoice = new SourceVoice(xAudio2, soundStream.Format, true);
sourceVoice.SubmitSourceBuffer(audioBuffer, soundStream.DecodedPacketsInfo);
sourceVoice.BufferEnd += (context) => trackFinished = true;
sourceVoice.SetVolume((float)VolumeTrackBar.Value / 100);
}
@ -199,6 +235,9 @@ namespace CodeWalker.Forms
private void PositionTrackBar_Scroll(object sender, EventArgs e)
{
sourceVoice.Stop();
InitializeAudio(currentAudio, PositionTrackBar.Value / 1000);
sourceVoice.Start();
}
private void PlayButton_Click(object sender, EventArgs e)
@ -233,14 +272,25 @@ namespace CodeWalker.Forms
sourceVoice.SetVolume((float)VolumeTrackBar.Value / 100);
}
private void Timer_Tick(object sender, EventArgs e)
private void UpdateUI()
{
if (playerState != PlayerState.Stopped && trackFinished)
{
if (chbAutoJump.Checked)
PlayNext();
else
Stop();
}
if (playerState != PlayerState.Stopped)
{
int playedMs = (int)playtime.Elapsed.TotalMilliseconds;
int playedMs = (int)playtime.Elapsed.TotalMilliseconds + playBeginMs;
int totalMs = (int)(trackLength * 1000);
PositionTrackBar.Maximum = totalMs;
PositionTrackBar.Value = playedMs < totalMs ? playedMs : totalMs;
LabelTime.Text = TimeSpan.FromSeconds(playedMs / 1000).ToString("m\\:ss")
+ " / " + TimeSpan.FromSeconds(totalMs / 1000).ToString("m\\:ss");
}
else
{
@ -248,6 +298,11 @@ namespace CodeWalker.Forms
}
}
private void Timer_Tick(object sender, EventArgs e)
{
UpdateUI();
}
private void PlayListView_DoubleClick(object sender, EventArgs e)
{
if (playerState == PlayerState.Playing)
@ -264,5 +319,24 @@ namespace CodeWalker.Forms
xAudio2.Dispose();
}
}
private void ExportAsWav_Click(object sender, EventArgs e)
{
if (PlayListView.SelectedItems.Count == 1)
{
var item = PlayListView.SelectedItems[0];
var audio = item.Tag as AwcAudio;
saveFileDialog.FileName = audio.Name + ".wav";
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
Stream wavStream = audio.GetWavStream();
FileStream stream = File.Create(saveFileDialog.FileName);
wavStream.CopyTo(stream);
stream.Close();
wavStream.Close();
}
}
}
}
}

View File

@ -117,9 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>99, 17</value>
</metadata>
<metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>254, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@ -30,7 +30,7 @@ namespace CodeWalker.GameFiles
public uint[] AudioIds { get; set; }
public AwcAudio[] Audios { get; set; }
public void Decrypt_RSXXTEA(ref byte[] data, uint[] key)
static public void Decrypt_RSXXTEA(byte[] data, uint[] key)
{
// Rockstar's modified version of XXTEA
uint[] blocks = new uint[data.Length / 4];
@ -77,7 +77,7 @@ namespace CodeWalker.GameFiles
{
if (data.Length % 4 == 0)
{
Decrypt_RSXXTEA(ref data, GTA5Keys.PC_AWC_KEY);
Decrypt_RSXXTEA(data, GTA5Keys.PC_AWC_KEY);
Magic = BitConverter.ToUInt32(data, 0);
} else
ErrorMessage = "Corrupted data!";
@ -417,11 +417,16 @@ namespace CodeWalker.GameFiles
public int LoopPoint { get; set; }
public ushort SamplesPerSecond { get; set; }
public short Headroom { get; set; }
public ushort Unk2 { get; set; }
public ushort Unk3 { get; set; }
public ushort Unk4 { get; set; }
public byte Unk5 { get; set; }
public byte Unk6 { get; set; }
public ushort LoopBegin { get; set; }
public ushort LoopEnd { get; set; }
public ushort PlayEnd { get; set; }
public byte PlayBegin { get; set; }
public enum CodecFormat {
PCM = 0,
ADPCM = 4
}
public CodecFormat Codec { get; set; }
public AwcFormatChunk(DataReader r)
{
@ -429,11 +434,11 @@ namespace CodeWalker.GameFiles
LoopPoint = r.ReadInt32();
SamplesPerSecond = r.ReadUInt16();
Headroom = r.ReadInt16();
Unk2 = r.ReadUInt16();
Unk3 = r.ReadUInt16();
Unk4 = r.ReadUInt16();
Unk5 = r.ReadByte();
Unk6 = r.ReadByte();
LoopBegin = r.ReadUInt16();
LoopEnd = r.ReadUInt16();
PlayEnd = r.ReadUInt16();
PlayBegin = r.ReadByte();
Codec = (CodecFormat)r.ReadByte();
//Apparently sometimes this struct is longer? TODO: fix??
//r.ReadUInt16();
@ -443,7 +448,7 @@ namespace CodeWalker.GameFiles
public override string ToString()
{
return Headroom.ToString() + ", " + Unk6.ToString() + ": " + Samples.ToString() + " samples, " + SamplesPerSecond.ToString() + " samples/sec";
return Headroom.ToString() + ", " + Codec.ToString() + ": " + Samples.ToString() + " samples, " + SamplesPerSecond.ToString() + " samples/sec";
}
}
@ -459,7 +464,7 @@ namespace CodeWalker.GameFiles
public short Channels = 1;
public short BitsPerSample = 4;//16;
public short BitsPerSample = 16;
public int SamplesPerSecond
{
get
@ -489,18 +494,23 @@ namespace CodeWalker.GameFiles
{
if (Format == null) return "Unknown";
string fmt = "ADPCM";
switch (Format.Unk6)
string codec;
switch (Format.Codec)
{
case 4:
case AwcFormatChunk.CodecFormat.PCM:
codec = "PCM";
break;
case AwcFormatChunk.CodecFormat.ADPCM:
codec = "ADPCM";
break;
default:
codec = "Unknown";
break;
}
var hz = Format?.SamplesPerSecond ?? 0;
var hz = Format.SamplesPerSecond;
return fmt + ((hz > 0) ? (", " + hz.ToString() + " Hz") : "");
return codec + ((hz > 0) ? (", " + hz.ToString() + " Hz") : "");
}
}
@ -520,7 +530,6 @@ namespace CodeWalker.GameFiles
}
}
public AwcAudio(DataReader r, AwcStreamInfo s, AwcFormatChunk f, AwcChunkInfo d)
{
StreamInfo = s;
@ -536,55 +545,130 @@ namespace CodeWalker.GameFiles
return "0x" + hash + ": " + Format?.ToString() ?? "AwcAudio";
}
public byte[] DecodeADPCM(byte[] data, int sampleCount)
{
byte[] dataPCM = new byte[data.Length * 4];
int predictor = 0, step_index = 0, step = 0;
int readingOffset = 0, writingOffset = 0, bytesInBlock = 0;
int[] ima_index_table = {
-1, -1, -1, -1, 2, 4, 6, 8,
-1, -1, -1, -1, 2, 4, 6, 8
};
short[] ima_step_table = {
7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
};
int clip(int value, int min, int max)
{
if (value < min)
return min;
if (value > max)
return max;
return value;
}
void parseNibble(byte nibble)
{
step_index = clip(step_index + ima_index_table[nibble], 0, 88);
int diff = step >> 3;
if ((nibble & 4) > 0) diff += step;
if ((nibble & 2) > 0) diff += step >> 1;
if ((nibble & 1) > 0) diff += step >> 2;
if ((nibble & 8) > 0) predictor -= diff;
else predictor += diff;
step = ima_step_table[step_index];
int samplePCM = clip(predictor, -32768, 32767);
dataPCM[writingOffset] = (byte)(samplePCM & 0xFF);
dataPCM[writingOffset + 1] = (byte)((samplePCM >> 8) & 0xFF);
writingOffset += 2;
}
while ((readingOffset < data.Length) && (sampleCount > 0))
{
if (bytesInBlock == 0)
{
step_index = clip(data[readingOffset], 0, 88);
predictor = BitConverter.ToInt16(data, readingOffset + 2);
step = ima_step_table[step_index];
bytesInBlock = 2044;
readingOffset += 4;
}
else
{
parseNibble((byte)(data[readingOffset] & 0x0F));
parseNibble((byte)((data[readingOffset] >> 4) & 0x0F));
bytesInBlock--;
sampleCount -= 2;
readingOffset++;
}
}
return dataPCM;
}
public Stream GetWavStream()
{
byte[] dataPCM = null;
int bitsPerSample = BitsPerSample;
switch (Format.Codec)
{
case AwcFormatChunk.CodecFormat.PCM:
dataPCM = Data;
break;
case AwcFormatChunk.CodecFormat.ADPCM:
dataPCM = new byte[Data.Length];
Buffer.BlockCopy(Data, 0, dataPCM, 0, Data.Length);
AwcFile.Decrypt_RSXXTEA(dataPCM, GTA5Keys.PC_AWC_KEY);
dataPCM = DecodeADPCM(dataPCM, SampleCount);
bitsPerSample = 16;
break;
}
int byteRate = SamplesPerSecond * Channels * bitsPerSample / 8;
short blockAlign = (short)(Channels * bitsPerSample / 8);
MemoryStream stream = new MemoryStream();
BinaryWriter w = new BinaryWriter(stream);
//see http://icculus.org/SDL_sound/downloads/external_documentation/wavecomp.htm
//see https://github.com/naudio/NAudio/blob/master/NAudio/Wave/WaveFormats/AdpcmWaveFormat.cs
//see https://msdn.microsoft.com/en-us/library/windows/desktop/ff538799(v=vs.85).aspx
int samplesPerSec = SamplesPerSecond;
Channels = 1;
BitsPerSample = 16;
int byteRate = samplesPerSec * Channels * BitsPerSample / 8;
short blockAlign = (short)(Channels * BitsPerSample / 8);
int wavLength = 12 + 24 + 8 + Data.Length;
// RIFF chunk
var fileSize = 4 + 24 + 8 + Data.Length;
w.Write("RIFF".ToCharArray()); // 0x00 - "RIFF" magic
w.Write(fileSize); // 0x04 - file size
w.Write("WAVE".ToCharArray()); // 0x08 - "WAVE" magic
w.Write("RIFF".ToCharArray());
w.Write((int)(wavLength - 8));
w.Write("WAVE".ToCharArray());
// fmt sub-chunk
w.Write("fmt ".ToCharArray()); // 0x0C - "fmt " magic
w.Write(16); // 0x10 - header size (16 bytes)
w.Write((short)1); // 0x14 - audio format (1=PCM)
w.Write(Channels); // 0x16 - number of channels
w.Write(samplesPerSec); // 0x18
w.Write(byteRate); // 0x1C
w.Write(blockAlign);// sampleSize); // 0x20
w.Write(BitsPerSample); // 0x22
w.Write("fmt ".ToCharArray());
w.Write((int)16); // fmt size
w.Write((short)1); // 1 = WAVE_FORMAT_PCM
w.Write((short)Channels);
w.Write((int)SamplesPerSecond);
w.Write((int)byteRate);
w.Write((short)blockAlign);
w.Write((short)bitsPerSample);
// data sub-chunk
w.Write("data".ToCharArray());
w.Write(Data.Length);
w.Write(Data);
w.Write((int)dataPCM.Length);
w.Write(dataPCM);
w.Flush();
stream.Position = 0;
return stream;
}
}
[TC(typeof(EXP))] public class AwcAudioAnimClipDict