Move the linear resampler to RageSoundReader_Resample_Fast.
Add RageSoundReader_Resample_Good, using libresample.
This commit is contained in:
@@ -1,103 +1,23 @@
|
||||
#include "global.h"
|
||||
#include "RageSoundReader_Resample.h"
|
||||
#include "RageSoundReader_Resample_Fast.h"
|
||||
#include "RageSoundReader_Resample_Good.h"
|
||||
|
||||
RageSoundReader_Resample::RageSoundReader_Resample()
|
||||
RageSoundReader_Resample *RageSoundReader_Resample::MakeResampler( ResampleQuality q )
|
||||
{
|
||||
source = NULL;
|
||||
samplerate = -1;
|
||||
}
|
||||
|
||||
void RageSoundReader_Resample::Open(SoundReader *source_)
|
||||
{
|
||||
source = source_;
|
||||
ASSERT(source);
|
||||
|
||||
samplerate = source->GetSampleRate();
|
||||
resamp.SetInputSampleRate(samplerate);
|
||||
}
|
||||
|
||||
|
||||
RageSoundReader_Resample::~RageSoundReader_Resample()
|
||||
{
|
||||
delete source;
|
||||
}
|
||||
|
||||
void RageSoundReader_Resample::SetSampleRate(int hz)
|
||||
{
|
||||
samplerate = hz;
|
||||
resamp.SetOutputSampleRate(samplerate);
|
||||
}
|
||||
|
||||
int RageSoundReader_Resample::GetLength() const
|
||||
{
|
||||
resamp.reset();
|
||||
return source->GetLength();
|
||||
}
|
||||
|
||||
int RageSoundReader_Resample::GetLength_Fast() const
|
||||
{
|
||||
resamp.reset();
|
||||
return source->GetLength_Fast();
|
||||
}
|
||||
|
||||
int RageSoundReader_Resample::SetPosition_Accurate(int ms)
|
||||
{
|
||||
resamp.reset();
|
||||
return source->SetPosition_Accurate(ms);
|
||||
}
|
||||
|
||||
int RageSoundReader_Resample::SetPosition_Fast(int ms)
|
||||
{
|
||||
resamp.reset();
|
||||
return source->SetPosition_Fast(ms);
|
||||
}
|
||||
static const int BUFSIZE = 1024*16;
|
||||
|
||||
int RageSoundReader_Resample::Read(char *buf, unsigned len)
|
||||
{
|
||||
int bytes_read = 0;
|
||||
while(len)
|
||||
switch( q )
|
||||
{
|
||||
int size = resamp.read(buf, len);
|
||||
|
||||
if(size == -1)
|
||||
break;
|
||||
|
||||
buf += size;
|
||||
len -= size;
|
||||
bytes_read += size;
|
||||
|
||||
if(size == 0)
|
||||
{
|
||||
static char buf[BUFSIZE];
|
||||
|
||||
int cnt = source->Read(buf, sizeof(buf));
|
||||
|
||||
if(cnt == -1)
|
||||
{
|
||||
SetError(source->GetError());
|
||||
return -1;
|
||||
}
|
||||
if(cnt == 0)
|
||||
resamp.eof();
|
||||
else
|
||||
resamp.write(buf, cnt);
|
||||
}
|
||||
case RESAMP_FAST:
|
||||
return new RageSoundReader_Resample_Fast;
|
||||
case RESAMP_NORMAL:
|
||||
case RESAMP_HIGHQUALITY:
|
||||
{
|
||||
RageSoundReader_Resample_Good *ret = new RageSoundReader_Resample_Good;
|
||||
ret->SetHighQuality( q == RESAMP_HIGHQUALITY );
|
||||
return ret;
|
||||
}
|
||||
default:
|
||||
ASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return bytes_read;
|
||||
}
|
||||
|
||||
SoundReader *RageSoundReader_Resample::Copy() const
|
||||
{
|
||||
SoundReader *new_source = source->Copy();
|
||||
RageSoundReader_Resample *ret = new RageSoundReader_Resample;
|
||||
ret->Open(new_source);
|
||||
ret->SetSampleRate(samplerate);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (c) 2003 by the person(s) listed below. All rights reserved.
|
||||
* Glenn Maynard
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user