Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Huge new year audio commit!

Browse Source 
* Refactored the whole audaspace library to use float as sample format over all readers.
* Added new Readers like the linear resampler, envelope, lowpass, highpass and butterworth.
* Note: The butterworth filter isn't working correctly, some bug in there... Maybe also true for the envelope.
* Added a sound to f-curve operator that behaves mostly like the soundtracker script of technoestupido.
This commit is contained in:
Joerg Mueller
2010-01-01 05:09:30 +00:00
parent 3fa927a42e
commit 174eccf078
86 changed files with 2162 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
View File

@@ -27,14 +27,14 @@
#include "AUD_SRCResampleReader.h"
AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_IReader* reader,
AUD_Specs specs) :
AUD_DeviceSpecs specs) :
AUD_ResampleFactory(reader, specs) {}
AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_IFactory* factory,
AUD_Specs specs) :
AUD_DeviceSpecs specs) :
AUD_ResampleFactory(factory, specs) {}
AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_Specs specs) :
AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_DeviceSpecs specs) :
AUD_ResampleFactory(specs) {}
AUD_IReader* AUD_SRCResampleFactory::createReader()
@@ -45,7 +45,7 @@ AUD_IReader* AUD_SRCResampleFactory::createReader()
{
if(reader->getSpecs().rate != m_specs.rate)
{
reader = new AUD_SRCResampleReader(reader, m_specs);
reader = new AUD_SRCResampleReader(reader, m_specs.specs);
AUD_NEW("reader")
}
}

7
intern/audaspace/SRC/AUD_SRCResampleFactory.h
View File

@@ -31,14 +31,13 @@
/**
* This factory creates a resampling reader that uses libsamplerate for
* resampling.
* \note The format of the input must be float.
*/
class AUD_SRCResampleFactory : public AUD_ResampleFactory
{
public:
AUD_SRCResampleFactory(AUD_IReader* reader, AUD_Specs specs);
AUD_SRCResampleFactory(AUD_IFactory* factory, AUD_Specs specs);
AUD_SRCResampleFactory(AUD_Specs specs);
AUD_SRCResampleFactory(AUD_IReader* reader, AUD_DeviceSpecs specs);
AUD_SRCResampleFactory(AUD_IFactory* factory, AUD_DeviceSpecs specs);
AUD_SRCResampleFactory(AUD_DeviceSpecs specs);
virtual AUD_IReader* createReader();
};

25
intern/audaspace/SRC/AUD_SRCResampleReader.cpp
View File

@@ -26,9 +26,9 @@
#include "AUD_SRCResampleReader.h"
#include "AUD_Buffer.h"
#include <math.h>
#include <cmath>
#include <cstring>
#include <stdio.h>
#include <cstdio>
static long src_callback(void *cb_data, float **data)
{
@@ -41,15 +41,8 @@ AUD_SRCResampleReader::AUD_SRCResampleReader(AUD_IReader* reader,
{
m_sspecs = reader->getSpecs();
if(m_sspecs.format != AUD_FORMAT_FLOAT32)
{
delete m_reader; AUD_DELETE("reader")
AUD_THROW(AUD_ERROR_READER);
}
m_tspecs = specs;
m_tspecs.channels = m_sspecs.channels;
m_tspecs.format = m_sspecs.format;
m_factor = (double)m_tspecs.rate / (double)m_sspecs.rate;
int error;
@@ -71,9 +64,9 @@ AUD_SRCResampleReader::AUD_SRCResampleReader(AUD_IReader* reader,
AUD_SRCResampleReader::~AUD_SRCResampleReader()
{
delete m_buffer; AUD_DELETE("buffer")
src_delete(m_src);
delete m_buffer; AUD_DELETE("buffer")
}
long AUD_SRCResampleReader::doCallback(float** data)
@@ -83,7 +76,7 @@ long AUD_SRCResampleReader::doCallback(float** data)
m_reader->read(length, buffer);
*data = (float*)buffer;
*data = buffer;
return length;
}
@@ -110,10 +103,12 @@ AUD_Specs AUD_SRCResampleReader::getSpecs()
void AUD_SRCResampleReader::read(int & length, sample_t* & buffer)
{
if(m_buffer->getSize() < length * m_tspecs.channels * 4)
m_buffer->resize(length * m_tspecs.channels * 4);
int size = length * AUD_SAMPLE_SIZE(m_tspecs);
if(m_buffer->getSize() < size)
m_buffer->resize(size);
buffer = m_buffer->getBuffer();
length = src_callback_read(m_src, m_factor, length, (float*)buffer);
length = src_callback_read(m_src, m_factor, length, buffer);
}

8
intern/audaspace/SRC/AUD_SRCResampleReader.h
View File

@@ -32,13 +32,7 @@ class AUD_Buffer;
#include <samplerate.h>
/**
* This class mixes a sound source with help of the SDL library.
* Unfortunately SDL is only capable of 8 and 16 bit audio, mono and stereo, as
* well as resampling only 2^n sample rate relationships where n is a natural
* number.
* \warning Although SDL can only resample 2^n sample rate relationships, this
* class doesn't check for compliance, so in case of other factors,
* the behaviour is undefined.
* This resampling reader uses libsamplerate for resampling.
*/
class AUD_SRCResampleReader : public AUD_EffectReader
{