diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-06 21:57:20 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-06 21:57:20 +0400 |
commit | c334bf69a7282254bb80bb2896bd8716930a4adf (patch) | |
tree | 08291f87da9ba64b80c881d704cf251b884ba7c2 /intern/audaspace/sndfile | |
parent | e73cf35f4ad470d553540d6adbe89af5cc0c1f4f (diff) |
3D Audio GSoC:
Mixdown functionality.
* Mixdown possible via libsndfile and ffmpeg!
* Fixed some ffmpeg deprecation warnings
* Mixdown UI only shows working Container, Codec and Format combinations!
* Minor bugs and warnings fixed
Diffstat (limited to 'intern/audaspace/sndfile')
-rw-r--r-- | intern/audaspace/sndfile/AUD_SndFileWriter.cpp | 141 | ||||
-rw-r--r-- | intern/audaspace/sndfile/AUD_SndFileWriter.h | 87 |
2 files changed, 228 insertions, 0 deletions
diff --git a/intern/audaspace/sndfile/AUD_SndFileWriter.cpp b/intern/audaspace/sndfile/AUD_SndFileWriter.cpp new file mode 100644 index 00000000000..ba59cd3d9d7 --- /dev/null +++ b/intern/audaspace/sndfile/AUD_SndFileWriter.cpp @@ -0,0 +1,141 @@ +/* + * $Id$ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * Copyright 2009-2011 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 General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Audaspace; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file audaspace/sndfile/AUD_SndFileWriter.cpp + * \ingroup audsndfile + */ + + +#include "AUD_SndFileWriter.h" + +#include <cstring> + +static const char* fileopen_error = "AUD_SndFileWriter: File couldn't be written."; +static const char* format_error = "AUD_SndFileWriter: Unsupported format."; + +AUD_SndFileWriter::AUD_SndFileWriter(std::string filename, AUD_DeviceSpecs specs, + AUD_Container format, AUD_Codec codec, unsigned int bitrate) : + m_specs(specs) +{ + SF_INFO sfinfo; + + sfinfo.channels = specs.channels; + sfinfo.samplerate = int(specs.rate); + + switch(format) + { + case AUD_CONTAINER_FLAC: + sfinfo.format = SF_FORMAT_FLAC; + switch(specs.format) + { + case AUD_FORMAT_S16: + sfinfo.format |= SF_FORMAT_PCM_16; + break; + case AUD_FORMAT_S24: + sfinfo.format |= SF_FORMAT_PCM_24; + break; + case AUD_FORMAT_S32: + sfinfo.format |= SF_FORMAT_PCM_32; + break; + case AUD_FORMAT_FLOAT32: + sfinfo.format |= SF_FORMAT_FLOAT; + break; + case AUD_FORMAT_FLOAT64: + sfinfo.format |= SF_FORMAT_DOUBLE; + break; + default: + sfinfo.format = 0; + break; + } + break; + case AUD_CONTAINER_OGG: + if(codec == AUD_CODEC_VORBIS) + sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS; + else + sfinfo.format = 0; + break; + case AUD_CONTAINER_WAV: + sfinfo.format = SF_FORMAT_WAV; + switch(specs.format) + { + case AUD_FORMAT_U8: + sfinfo.format |= SF_FORMAT_PCM_U8; + break; + case AUD_FORMAT_S16: + sfinfo.format |= SF_FORMAT_PCM_16; + break; + case AUD_FORMAT_S24: + sfinfo.format |= SF_FORMAT_PCM_24; + break; + case AUD_FORMAT_S32: + sfinfo.format |= SF_FORMAT_PCM_32; + break; + case AUD_FORMAT_FLOAT32: + sfinfo.format |= SF_FORMAT_FLOAT; + break; + case AUD_FORMAT_FLOAT64: + sfinfo.format |= SF_FORMAT_DOUBLE; + break; + default: + sfinfo.format = 0; + break; + } + break; + default: + sfinfo.format = 0; + break; + } + + if(sfinfo.format == 0) + AUD_THROW(AUD_ERROR_SPECS, format_error); + + m_sndfile = sf_open(filename.c_str(), SFM_WRITE, &sfinfo); + + if(!m_sndfile) + AUD_THROW(AUD_ERROR_FILE, fileopen_error); +} + +AUD_SndFileWriter::~AUD_SndFileWriter() +{ + sf_close(m_sndfile); +} + +int AUD_SndFileWriter::getPosition() const +{ + return m_position; +} + +AUD_DeviceSpecs AUD_SndFileWriter::getSpecs() const +{ + return m_specs; +} + +void AUD_SndFileWriter::write(unsigned int length, sample_t* buffer) +{ + length = sf_writef_float(m_sndfile, buffer, length); + + m_position += length; +} diff --git a/intern/audaspace/sndfile/AUD_SndFileWriter.h b/intern/audaspace/sndfile/AUD_SndFileWriter.h new file mode 100644 index 00000000000..63f9e9e1371 --- /dev/null +++ b/intern/audaspace/sndfile/AUD_SndFileWriter.h @@ -0,0 +1,87 @@ +/* + * $Id$ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * Copyright 2009-2011 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 General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Audaspace; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file audaspace/sndfile/AUD_SndFileWriter.h + * \ingroup audsndfile + */ + + +#ifndef AUD_SNDFILEWRITER +#define AUD_SNDFILEWRITER + +#include "AUD_IWriter.h" +//#include "AUD_Buffer.h" + +#include <string> +#include <sndfile.h> + +typedef sf_count_t (*sf_read_f)(SNDFILE *sndfile, void *ptr, sf_count_t frames); + +/** + * This class writes a sound file via libsndfile. + */ +class AUD_SndFileWriter : public AUD_IWriter +{ +private: + /** + * The current position in samples. + */ + int m_position; + + /** + * The specification of the audio data. + */ + AUD_DeviceSpecs m_specs; + + /** + * The sndfile. + */ + SNDFILE* m_sndfile; + + // hide copy constructor and operator= + AUD_SndFileWriter(const AUD_SndFileWriter&); + AUD_SndFileWriter& operator=(const AUD_SndFileWriter&); + +public: + /** + * Creates a new writer. + * \param filename The path to the file to be read. + * \exception AUD_Exception Thrown if the file specified cannot be written + * with libsndfile. + */ + AUD_SndFileWriter(std::string filename, AUD_DeviceSpecs specs, AUD_Container format, AUD_Codec codec, unsigned int bitrate); + + /** + * Destroys the writer and closes the file. + */ + virtual ~AUD_SndFileWriter(); + + virtual int getPosition() const; + virtual AUD_DeviceSpecs getSpecs() const; + virtual void write(unsigned int length, sample_t* buffer); +}; + +#endif //AUD_SNDFILEWRITER |