Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 20:04:13 +08:00
Code Issues Projects Releases Wiki Activity

(Mp3Input): removed wave conversion streams.

Browse Source
This commit is contained in:
morkt 2015-05-13 23:19:09 +04:00
parent 83aafca437
commit 6150e7f29c
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ArcFormats/AudioMP3.cs
View File

@ -32,15 +32,15 @@ namespace GameRes.Formats
public class Mp3Input : SoundInput
{
int m_bitrate;
Stream m_source;
Mp3FileReader m_reader;
public override long Position
{
get { return m_input.Position; }
set { m_input.Position = value; }
get { return m_reader.Position; }
set { m_reader.Position = value; }
}
public override bool CanSeek { get { return m_input.CanSeek; } }
public override bool CanSeek { get { return m_reader.CanSeek; } }
public override int SourceBitrate
{
@ -49,39 +49,34 @@ namespace GameRes.Formats
public Mp3Input (Stream file) : base (file)
{
var rdr = new Mp3FileReader (m_input);
var wav = WaveFormatConversionStream.CreatePcmStream (rdr);
var bar = new BlockAlignReductionStream (wav);
m_source = m_input;
m_input = bar;
m_bitrate = rdr.Mp3WaveFormat.AverageBytesPerSecond*8;
m_reader = new Mp3FileReader (m_input);
m_bitrate = m_reader.Mp3WaveFormat.AverageBytesPerSecond*8;
var format = new GameRes.WaveFormat();
format.FormatTag = (ushort)wav.WaveFormat.Encoding;
format.Channels = (ushort)wav.WaveFormat.Channels;
format.SamplesPerSecond = (uint)wav.WaveFormat.SampleRate;
format.BitsPerSample = (ushort)wav.WaveFormat.BitsPerSample;
format.BlockAlign = (ushort)bar.BlockAlign;
format.AverageBytesPerSecond = (uint)wav.WaveFormat.AverageBytesPerSecond;
format.FormatTag = (ushort)m_reader.WaveFormat.Encoding;
format.Channels = (ushort)m_reader.WaveFormat.Channels;
format.SamplesPerSecond = (uint)m_reader.WaveFormat.SampleRate;
format.BitsPerSample = (ushort)m_reader.WaveFormat.BitsPerSample;
format.BlockAlign = (ushort)m_reader.BlockAlign;
format.AverageBytesPerSecond = (uint)m_reader.WaveFormat.AverageBytesPerSecond;
this.Format = format;
this.PcmSize = m_input.Length;
this.PcmSize = m_reader.Length;
}
public override int Read(byte[] buffer, int offset, int count)
{
return m_input.Read (buffer, offset, count);
return m_reader.Read (buffer, offset, count);
}
#region IDisposable Members
protected override void Dispose (bool disposing)
{
if (null != m_source)
if (null != m_reader)
{
if (disposing)
{
m_source.Dispose();
m_reader.Dispose();
}
m_source = null;
m_reader = null;
base.Dispose (disposing);
}
}