[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52859] tags/blender-2.65-release/blender: Merging r52851 through r52858 from trunk into blender-2.65-release
Sergey Sharybin
sergey.vfx at gmail.com
Mon Dec 10 18:05:40 CET 2012
Revision: 52859
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52859
Author: nazgul
Date: 2012-12-10 17:05:33 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Merging r52851 through r52858 from trunk into blender-2.65-release
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52851
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52858
Modified Paths:
--------------
tags/blender-2.65-release/blender/intern/audaspace/CMakeLists.txt
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_HighpassFactory.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_LowpassFactory.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_LowpassFactory.h
Added Paths:
-----------
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_HighpassCalculator.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_HighpassCalculator.h
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_LowpassCalculator.cpp
tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_LowpassCalculator.h
Property Changed:
----------------
tags/blender-2.65-release/blender/
tags/blender-2.65-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.65-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.65-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52850
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858
Modified: tags/blender-2.65-release/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/CMakeLists.txt 2012-12-10 16:58:47 UTC (rev 52858)
+++ tags/blender-2.65-release/blender/intern/audaspace/CMakeLists.txt 2012-12-10 17:05:33 UTC (rev 52859)
@@ -34,6 +34,7 @@
set(SRC
FX/AUD_AccumulatorFactory.cpp
FX/AUD_BaseIIRFilterReader.cpp
+ FX/AUD_ButterworthCalculator.cpp
FX/AUD_ButterworthFactory.cpp
FX/AUD_CallbackIIRFilterReader.cpp
FX/AUD_DelayFactory.cpp
@@ -47,6 +48,7 @@
FX/AUD_EnvelopeFactory.cpp
FX/AUD_FaderFactory.cpp
FX/AUD_FaderReader.cpp
+ FX/AUD_HighpassCalculator.cpp
FX/AUD_HighpassFactory.cpp
FX/AUD_IIRFilterFactory.cpp
FX/AUD_IIRFilterReader.cpp
@@ -54,6 +56,7 @@
FX/AUD_LimiterReader.cpp
FX/AUD_LoopFactory.cpp
FX/AUD_LoopReader.cpp
+ FX/AUD_LowpassCalculator.cpp
FX/AUD_LowpassFactory.cpp
FX/AUD_PingPongFactory.cpp
FX/AUD_PitchFactory.cpp
@@ -145,6 +148,7 @@
FX/AUD_AccumulatorFactory.h
FX/AUD_BaseIIRFilterReader.h
+ FX/AUD_ButterworthCalculator.h
FX/AUD_ButterworthFactory.h
FX/AUD_CallbackIIRFilterReader.h
FX/AUD_DelayFactory.h
@@ -159,6 +163,7 @@
FX/AUD_EnvelopeFactory.h
FX/AUD_FaderFactory.h
FX/AUD_FaderReader.h
+ FX/AUD_HighpassCalculator.h
FX/AUD_HighpassFactory.h
FX/AUD_IIRFilterFactory.h
FX/AUD_IIRFilterReader.h
@@ -166,6 +171,7 @@
FX/AUD_LimiterReader.h
FX/AUD_LoopFactory.h
FX/AUD_LoopReader.h
+ FX/AUD_LowpassCalculator.h
FX/AUD_LowpassFactory.h
FX/AUD_PingPongFactory.h
FX/AUD_PitchFactory.h
Copied: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp)
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp (rev 0)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.cpp 2012-12-10 17:05:33 UTC (rev 52859)
@@ -0,0 +1,5 @@
+#include "AUD_BandpassCalculator.h"
+
+AUD_BandpassCalculator::AUD_BandpassCalculator()
+{
+}
Copied: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.h (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_BandpassCalculator.h)
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.h (rev 0)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_BandpassCalculator.h 2012-12-10 17:05:33 UTC (rev 52859)
@@ -0,0 +1,10 @@
+#ifndef AUD_BANDPASSCALCULATOR_H
+#define AUD_BANDPASSCALCULATOR_H
+
+class AUD_BandpassCalculator
+{
+public:
+ AUD_BandpassCalculator();
+};
+
+#endif // AUD_BANDPASSCALCULATOR_H
Copied: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.cpp (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_ButterworthCalculator.cpp)
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.cpp (rev 0)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.cpp 2012-12-10 17:05:33 UTC (rev 52859)
@@ -0,0 +1,38 @@
+#include "AUD_ButterworthCalculator.h"
+
+#include <cmath>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#define BWPB41 0.76536686473
+#define BWPB42 1.84775906502
+
+AUD_ButterworthCalculator::AUD_ButterworthCalculator(float frequency) :
+ m_frequency(frequency)
+{
+}
+
+void AUD_ButterworthCalculator::recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a)
+{
+ float omega = 2 * tan(m_frequency * M_PI / rate);
+ float o2 = omega * omega;
+ float o4 = o2 * o2;
+ float x1 = o2 + 2.0f * (float)BWPB41 * omega + 4.0f;
+ float x2 = o2 + 2.0f * (float)BWPB42 * omega + 4.0f;
+ float y1 = o2 - 2.0f * (float)BWPB41 * omega + 4.0f;
+ float y2 = o2 - 2.0f * (float)BWPB42 * omega + 4.0f;
+ float o228 = 2.0f * o2 - 8.0f;
+ float norm = x1 * x2;
+ a.push_back(1);
+ a.push_back((x1 + x2) * o228 / norm);
+ a.push_back((x1 * y2 + x2 * y1 + o228 * o228) / norm);
+ a.push_back((y1 + y2) * o228 / norm);
+ a.push_back(y1 * y2 / norm);
+ b.push_back(o4 / norm);
+ b.push_back(4 * o4 / norm);
+ b.push_back(6 * o4 / norm);
+ b.push_back(b[1]);
+ b.push_back(b[0]);
+}
Copied: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.h (from rev 52858, trunk/blender/intern/audaspace/FX/AUD_ButterworthCalculator.h)
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.h (rev 0)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthCalculator.h 2012-12-10 17:05:33 UTC (rev 52859)
@@ -0,0 +1,20 @@
+#ifndef AUD_BUTTERWORTHCALCULATOR_H
+#define AUD_BUTTERWORTHCALCULATOR_H
+
+#include "AUD_IDynamicIIRFilterCalculator.h"
+
+class AUD_ButterworthCalculator : public AUD_IDynamicIIRFilterCalculator
+{
+private:
+ /**
+ * The attack value in seconds.
+ */
+ const float m_frequency;
+
+public:
+ AUD_ButterworthCalculator(float frequency);
+
+ virtual void recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a);
+};
+
+#endif // AUD_BUTTERWORTHCALCULATOR_H
Modified: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-12-10 16:58:47 UTC (rev 52858)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-12-10 17:05:33 UTC (rev 52859)
@@ -29,44 +29,11 @@
#include "AUD_ButterworthFactory.h"
#include "AUD_IIRFilterReader.h"
+#include "AUD_ButterworthCalculator.h"
-#include <cmath>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#define BWPB41 0.76536686473
-#define BWPB42 1.84775906502
-
AUD_ButterworthFactory::AUD_ButterworthFactory(boost::shared_ptr<AUD_IFactory> factory,
float frequency) :
- AUD_DynamicIIRFilterFactory(factory),
- m_frequency(frequency)
+ AUD_DynamicIIRFilterFactory(factory, boost::shared_ptr<AUD_IDynamicIIRFilterCalculator>(new AUD_ButterworthCalculator(frequency)))
{
}
-void AUD_ButterworthFactory::recalculateCoefficients(AUD_SampleRate rate,
- std::vector<float> &b,
- std::vector<float> &a)
-{
- float omega = 2 * tan(m_frequency * M_PI / rate);
- float o2 = omega * omega;
- float o4 = o2 * o2;
- float x1 = o2 + 2.0f * (float)BWPB41 * omega + 4.0f;
- float x2 = o2 + 2.0f * (float)BWPB42 * omega + 4.0f;
- float y1 = o2 - 2.0f * (float)BWPB41 * omega + 4.0f;
- float y2 = o2 - 2.0f * (float)BWPB42 * omega + 4.0f;
- float o228 = 2.0f * o2 - 8.0f;
- float norm = x1 * x2;
- a.push_back(1);
- a.push_back((x1 + x2) * o228 / norm);
- a.push_back((x1 * y2 + x2 * y1 + o228 * o228) / norm);
- a.push_back((y1 + y2) * o228 / norm);
- a.push_back(y1 * y2 / norm);
- b.push_back(o4 / norm);
- b.push_back(4 * o4 / norm);
- b.push_back(6 * o4 / norm);
- b.push_back(b[1]);
- b.push_back(b[0]);
-}
Modified: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-12-10 16:58:47 UTC (rev 52858)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-12-10 17:05:33 UTC (rev 52859)
@@ -38,11 +38,6 @@
class AUD_ButterworthFactory : public AUD_DynamicIIRFilterFactory
{
private:
- /**
- * The attack value in seconds.
- */
- const float m_frequency;
-
// hide copy constructor and operator=
AUD_ButterworthFactory(const AUD_ButterworthFactory&);
AUD_ButterworthFactory& operator=(const AUD_ButterworthFactory&);
@@ -54,10 +49,6 @@
* \param frequency The cutoff frequency.
*/
AUD_ButterworthFactory(boost::shared_ptr<AUD_IFactory> factory, float frequency);
-
- virtual void recalculateCoefficients(AUD_SampleRate rate,
- std::vector<float>& b,
- std::vector<float>& a);
};
#endif //__AUD_BUTTERWORTHFACTORY_H__
Modified: tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
===================================================================
--- tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp 2012-12-10 16:58:47 UTC (rev 52858)
+++ tags/blender-2.65-release/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp 2012-12-10 17:05:33 UTC (rev 52859)
@@ -30,8 +30,10 @@
#include "AUD_DynamicIIRFilterReader.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list