Revision: 37748
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37748
Author: nexyon
Date: 2011-06-23 07:16:06 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
3D Audio GSoC:
- Fixes for MSVC compiling.
- Fix for ffmpeg audio export with timebase, which fixes vorbis encoding (the
only codec using this).
Modified Paths:
--------------
branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-pepper/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-pepper/source/blender/blenkernel/intern/writeffmpeg.c
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
2011-06-23 07:16:06 UTC (rev 37748)
@@ -73,8 +73,8 @@
EnvelopeParameters* param = new EnvelopeParameters();
param->arthreshold = m_arthreshold;
- param->attack = pow(m_arthreshold, 1.0f/(reader->getSpecs().rate *
m_attack));
- param->release = pow(m_arthreshold, 1.0f/(reader->getSpecs().rate *
m_release));
+ param->attack = pow(m_arthreshold,
1.0f/(static_cast<float>(reader->getSpecs().rate) * m_attack));
+ param->release = pow(m_arthreshold,
1.0f/(static_cast<float>(reader->getSpecs().rate) * m_release));
param->threshold = m_threshold;
return new AUD_CallbackIIRFilterReader(reader, 1, 2,
Modified: branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2011-06-23 07:16:06 UTC (rev 37748)
@@ -52,7 +52,6 @@
ALuint buffer;
};*/
-typedef std::list<AUD_Reference<AUD_OpenALDevice::AUD_OpenALHandle>
>::iterator AUD_HandleIterator;
//typedef std::list<AUD_OpenALBufferedFactory*>::iterator AUD_BFIterator;
Modified: branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/intern/audaspace/OpenAL/AUD_OpenALDevice.h
2011-06-23 07:16:06 UTC (rev 37748)
@@ -142,6 +142,7 @@
virtual bool setConeVolumeOuter(float volume);
};
+ typedef std::list<AUD_Reference<AUD_OpenALHandle> >::iterator
AUD_HandleIterator;
/**
* The OpenAL device handle.
Modified:
branches/soc-2011-pepper/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
===================================================================
---
branches/soc-2011-pepper/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
2011-06-23 07:14:37 UTC (rev 37747)
+++
branches/soc-2011-pepper/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
2011-06-23 07:16:06 UTC (rev 37748)
@@ -30,6 +30,14 @@
#include <cmath>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifndef M_PI_2
+#define M_PI_2 1.57079632679489661923
+#endif
+
#include "AUD_ChannelMapperReader.h"
AUD_ChannelMapperReader::AUD_ChannelMapperReader(AUD_Reference<AUD_IReader>
reader,
Modified:
branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.cpp
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.cpp
2011-06-23 07:16:06 UTC (rev 37748)
@@ -43,8 +43,6 @@
#include <cstring>
#include <limits>
-typedef std::list<AUD_Reference<AUD_SoftwareDevice::AUD_SoftwareHandle>
>::iterator AUD_HandleIterator;
-
AUD_SoftwareDevice::AUD_SoftwareHandle::AUD_SoftwareHandle(AUD_SoftwareDevice*
device, AUD_Reference<AUD_IReader> reader, AUD_Reference<AUD_PitchReader>
pitch, bool keep) :
m_reader(reader), m_pitch(pitch), m_keep(keep), m_volume(1.0f),
m_loopcount(0),
m_stop(NULL), m_stop_data(NULL), m_status(AUD_STATUS_PLAYING),
m_device(device)
Modified: branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.h
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/intern/audaspace/intern/AUD_SoftwareDevice.h
2011-06-23 07:16:06 UTC (rev 37748)
@@ -105,6 +105,8 @@
virtual bool setStopCallback(stopCallback callback = 0, void*
data = 0);
};
+ typedef std::list<AUD_Reference<AUD_SoftwareHandle> >::iterator
AUD_HandleIterator;
+
/**
* The specification of the device.
*/
Modified:
branches/soc-2011-pepper/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/writeffmpeg.c
2011-06-23 07:14:37 UTC (rev 37747)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/writeffmpeg.c
2011-06-23 07:16:06 UTC (rev 37748)
@@ -859,6 +859,10 @@
specs.format = AUD_FORMAT_S16;
specs.rate = rd->ffcodecdata.audio_mixrate;
audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra,
rd->ffcodecdata.audio_volume);
+#ifdef FFMPEG_CODEC_TIME_BASE
+ c->time_base.den = specs.rate;
+ c->time_base.num = 1;
+#endif
}
return success;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
