[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25643] trunk/blender: Huge new year audio commit!

Joerg Mueller nexyon at gmail.com
Fri Jan 1 06:09:31 CET 2010


Revision: 25643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25643
Author:   nexyon
Date:     2010-01-01 06:09:30 +0100 (Fri, 01 Jan 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_FaderReader.h
    trunk/blender/intern/audaspace/FX/AUD_LoopReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_RectifyReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_RectifyReader.h
    trunk/blender/intern/audaspace/FX/AUD_ReverseReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_VolumeReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_VolumeReader.h
    trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    trunk/blender/intern/audaspace/SDL/AUD_SDLDevice.cpp
    trunk/blender/intern/audaspace/SDL/AUD_SDLDevice.h
    trunk/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    trunk/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.h
    trunk/blender/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
    trunk/blender/intern/audaspace/SRC/AUD_SRCResampleReader.h
    trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    trunk/blender/intern/audaspace/fftw/AUD_BandPassFactory.cpp
    trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_Buffer.cpp
    trunk/blender/intern/audaspace/intern/AUD_Buffer.h
    trunk/blender/intern/audaspace/intern/AUD_BufferReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
    trunk/blender/intern/audaspace/intern/AUD_C-API.h
    trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.cpp
    trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.h
    trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
    trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.h
    trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_ConverterReader.h
    trunk/blender/intern/audaspace/intern/AUD_IDevice.h
    trunk/blender/intern/audaspace/intern/AUD_MixerFactory.cpp
    trunk/blender/intern/audaspace/intern/AUD_MixerFactory.h
    trunk/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
    trunk/blender/intern/audaspace/intern/AUD_NULLDevice.h
    trunk/blender/intern/audaspace/intern/AUD_ReadDevice.cpp
    trunk/blender/intern/audaspace/intern/AUD_ReadDevice.h
    trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.h
    trunk/blender/intern/audaspace/intern/AUD_Space.h
    trunk/blender/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    trunk/blender/intern/audaspace/jack/AUD_JackDevice.cpp
    trunk/blender/intern/audaspace/jack/AUD_JackDevice.h
    trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.h
    trunk/blender/source/blender/blenkernel/BKE_sound.h
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenkernel/intern/sound.c
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/editors/sound/sound_ops.c
    trunk/blender/source/blender/editors/space_graph/graph_edit.c
    trunk/blender/source/blender/editors/space_graph/graph_intern.h
    trunk/blender/source/blender/editors/space_graph/graph_ops.c

Added Paths:
-----------
    trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
    trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.h
    trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
    trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.h
    trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_EnvelopeReader.h
    trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
    trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h
    trunk/blender/intern/audaspace/FX/AUD_HighpassReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_HighpassReader.h
    trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.cpp
    trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h
    trunk/blender/intern/audaspace/FX/AUD_LowpassReader.cpp
    trunk/blender/intern/audaspace/FX/AUD_LowpassReader.h
    trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.h
    trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.h
    trunk/blender/intern/audaspace/intern/AUD_Mixer.cpp
    trunk/blender/intern/audaspace/intern/AUD_Mixer.h

Removed Paths:
-------------
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixer.cpp
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixer.h
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.h
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
    trunk/blender/intern/audaspace/SDL/AUD_SDLMixerReader.h
    trunk/blender/intern/audaspace/intern/AUD_FloatMixer.cpp
    trunk/blender/intern/audaspace/intern/AUD_FloatMixer.h
    trunk/blender/intern/audaspace/intern/AUD_IMixer.h

Added: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp	                        (rev 0)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp	2010-01-01 05:09:30 UTC (rev 25643)
@@ -0,0 +1,49 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_ButterworthFactory.h"
+#include "AUD_ButterworthReader.h"
+
+AUD_ButterworthFactory::AUD_ButterworthFactory(AUD_IFactory* factory,
+											   float frequency) :
+		AUD_EffectFactory(factory),
+		m_frequency(frequency) {}
+
+AUD_ButterworthFactory::AUD_ButterworthFactory(float frequency) :
+		AUD_EffectFactory(0),
+		m_frequency(frequency) {}
+
+AUD_IReader* AUD_ButterworthFactory::createReader()
+{
+	AUD_IReader* reader = getReader();
+
+	if(reader != 0)
+	{
+		reader = new AUD_ButterworthReader(reader, m_frequency);
+		AUD_NEW("reader")
+	}
+
+	return reader;
+}


Property changes on: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h	                        (rev 0)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h	2010-01-01 05:09:30 UTC (rev 25643)
@@ -0,0 +1,59 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_BUTTERWORTHFACTORY
+#define AUD_BUTTERWORTHFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory creates a butterworth filter reader.
+ */
+class AUD_ButterworthFactory : public AUD_EffectFactory
+{
+private:
+	/**
+	 * The attack value in seconds.
+	 */
+	float m_frequency;
+
+public:
+	/**
+	 * Creates a new butterworth factory.
+	 * \param factory The input factory.
+	 * \param frequency The cutoff frequency.
+	 */
+	AUD_ButterworthFactory(AUD_IFactory* factory, float frequency);
+
+	/**
+	 * Creates a new butterworth factory.
+	 * \param frequency The cutoff frequency.
+	 */
+	AUD_ButterworthFactory(float frequency);
+
+	virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_BUTTERWORTHFACTORY


Property changes on: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.cpp	                        (rev 0)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.cpp	2010-01-01 05:09:30 UTC (rev 25643)
@@ -0,0 +1,120 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_ButterworthReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+#include <cmath>
+
+#define BWPB41 0.76536686473
+#define BWPB42 1.84775906502
+#define CC channels + channel
+
+AUD_ButterworthReader::AUD_ButterworthReader(AUD_IReader* reader,
+											 float frequency) :
+		AUD_EffectReader(reader)
+{
+	AUD_Specs specs = reader->getSpecs();
+	int samplesize = AUD_SAMPLE_SIZE(specs);
+
+	m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+
+	m_outvalues = new AUD_Buffer(samplesize * 5); AUD_NEW("buffer")
+	memset(m_outvalues->getBuffer(), 0, samplesize * 5);
+
+	m_invalues = new AUD_Buffer(samplesize * 5); AUD_NEW("buffer")
+	memset(m_invalues->getBuffer(), 0, samplesize * 5);
+
+	m_position = 0;
+
+	// calculate coefficients
+	float omega = 2 * tan(frequency * M_PI / specs.rate);
+	float o2 = omega * omega;
+	float o4 = o2 * o2;
+	float x1 = o2 + 2 * BWPB41 * omega + 4;
+	float x2 = o2 + 2 * BWPB42 * omega + 4;
+	float y1 = o2 - 2 * BWPB41 * omega + 4;
+	float y2 = o2 - 2 * BWPB42 * omega + 4;
+	float o228 = 2 * o2 - 8;
+	float norm = x1 * x2;
+	m_coeff[0][0] = 0;
+	m_coeff[0][1] = (x1 + x2) * o228 / norm;
+	m_coeff[0][2] = (x1 * y2 + x2 * y1 + o228 * o228) / norm;
+	m_coeff[0][3] = (y1 + y2) * o228 / norm;
+	m_coeff[0][4] = y1 * y2 / norm;
+	m_coeff[1][4] = m_coeff[1][0] = o4 / norm;
+	m_coeff[1][3] = m_coeff[1][1] = 4 * o4 / norm;
+	m_coeff[1][2] = 6 * o4 / norm;
+}
+
+AUD_ButterworthReader::~AUD_ButterworthReader()
+{
+	delete m_buffer; AUD_DELETE("buffer")
+
+	delete m_outvalues; AUD_DELETE("buffer")
+	delete m_invalues; AUD_DELETE("buffer");
+}
+
+void AUD_ButterworthReader::read(int & length, sample_t* & buffer)
+{
+	sample_t* buf;
+	sample_t* outvalues;
+	sample_t* invalues;
+
+	outvalues = m_outvalues->getBuffer();
+	invalues = m_invalues->getBuffer();
+
+	AUD_Specs specs = m_reader->getSpecs();
+
+	m_reader->read(length, buf);
+
+	if(m_buffer->getSize() < length * AUD_SAMPLE_SIZE(specs))
+		m_buffer->resize(length * AUD_SAMPLE_SIZE(specs));
+
+	buffer = m_buffer->getBuffer();
+	int channels = specs.channels;
+
+	for(int channel = 0; channel < channels; channel++)
+	{
+		for(int i = 0; i < length; i++)
+		{
+			invalues[m_position * CC] = buf[i * CC];
+			outvalues[m_position * CC] = 0;
+
+			for(int j = 0; j < 4; j++)
+			{
+				outvalues[m_position * CC] += m_coeff[1][j] *
+									invalues[((m_position + j) % 5) * CC] -
+									m_coeff[0][j] *
+									outvalues[((m_position + j) % 5) * CC];
+			}
+
+			buffer[i * CC] = outvalues[m_position * CC];
+
+			m_position = (m_position + 4) % 5;
+		}
+	}
+}


Property changes on: trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.cpp
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.h	                        (rev 0)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthReader.h	2010-01-01 05:09:30 UTC (rev 25643)
@@ -0,0 +1,83 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_BUTTERWORTHREADER
+#define AUD_BUTTERWORTHREADER
+
+#include "AUD_EffectReader.h"
+class AUD_Buffer;
+
+/**
+ * This class represents a butterworth filter.
+ */
+class AUD_ButterworthReader : public AUD_EffectReader
+{
+private:
+	/**
+	 * The playback buffer.
+	 */
+	AUD_Buffer *m_buffer;
+
+	/**
+	 * The last out values buffer.
+	 */
+	AUD_Buffer *m_outvalues;
+
+	/**
+	 * The last in values buffer.
+	 */
+	AUD_Buffer *m_invalues;
+
+	/**
+	 * The position for buffer cycling.
+	 */
+	int m_position;
+
+	/**
+	 * Filter coefficients.
+	 */
+	float m_coeff[2][5];
+
+public:
+	/**
+	 * Creates a new butterworth reader.
+	 * \param reader The reader to read from.
+	 * \param attack The attack value in seconds.
+	 * \param release The release value in seconds.
+	 * \param threshold The threshold value.
+	 * \param arthreshold The attack/release threshold value.
+	 * \exception AUD_Exception Thrown if the reader specified is NULL.
+	 */
+	AUD_ButterworthReader(AUD_IReader* reader, float frequency);
+
+	/**
+	 * Destroys the reader.
+	 */
+	virtual ~AUD_ButterworthReader();
+

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list