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

3D Audio GSoC:

Browse Source 
- Fixes for MSVC compiling.
- Fix for ffmpeg audio export with timebase, which fixes vorbis encoding (the only codec using this).
This commit is contained in:
Joerg Mueller
2011-06-23 07:16:06 +00:00
parent 2afa7e4944
commit cc246eaca7
7 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/audaspace/FX/AUD_EnvelopeFactory.cpp
View File

@@ -73,8 +73,8 @@ AUD_Reference<AUD_IReader> AUD_EnvelopeFactory::createReader()
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,

1
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
View File

@@ -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;

1
intern/audaspace/OpenAL/AUD_OpenALDevice.h
View File

@@ -142,6 +142,7 @@ private:
virtual bool setConeVolumeOuter(float volume);
};
typedef std::list<AUD_Reference<AUD_OpenALHandle> >::iterator AUD_HandleIterator;
/**
* The OpenAL device handle.

8
intern/audaspace/intern/AUD_ChannelMapperReader.cpp
View File

@@ -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,

2
intern/audaspace/intern/AUD_SoftwareDevice.cpp
View File

@@ -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)

2
intern/audaspace/intern/AUD_SoftwareDevice.h
View File

@@ -105,6 +105,8 @@ protected:
virtual bool setStopCallback(stopCallback callback = 0, void* data = 0);
};
typedef std::list<AUD_Reference<AUD_SoftwareHandle> >::iterator AUD_HandleIterator;
/**
* The specification of the device.
*/

4
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -859,6 +859,10 @@ int start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty, Repo
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;