From 174eccf07851c4e7f669b194cd8951ca98bc5c81 Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Fri, 1 Jan 2010 05:09:30 +0000 Subject: Huge new year audio commit! * 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. --- intern/audaspace/SRC/AUD_SRCResampleFactory.cpp | 8 ++++---- intern/audaspace/SRC/AUD_SRCResampleFactory.h | 7 +++---- intern/audaspace/SRC/AUD_SRCResampleReader.cpp | 25 ++++++++++--------------- intern/audaspace/SRC/AUD_SRCResampleReader.h | 8 +------- 4 files changed, 18 insertions(+), 30 deletions(-) (limited to 'intern/audaspace/SRC') diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp b/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp index bcace340b24..caafbd14327 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp @@ -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") } } diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.h b/intern/audaspace/SRC/AUD_SRCResampleFactory.h index c23c1d2c82e..4b16c70169c 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.h +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.h @@ -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(); }; diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp index f7564d3c010..940f4245316 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp @@ -26,9 +26,9 @@ #include "AUD_SRCResampleReader.h" #include "AUD_Buffer.h" -#include +#include #include -#include +#include 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); } diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h index 1bacdb3965c..4fe30b48c6e 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.h +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.h @@ -32,13 +32,7 @@ class AUD_Buffer; #include /** - * 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 { -- cgit v1.2.3