griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

# add support for streaming sounds, not just loading them entirely into memory (avoids stalls when switching music tracks)

Browse Source 
very belated revision/integration of Heron/Kyniker's patch (thanks!)

ogg fixes: ensure file remains open by holding a shared_ptr. avoid
returning 0 (success) when bytesRead==requestedSize.

closes #100

This was SVN commit r8322.
This commit is contained in:
janwas 2010-10-10 12:08:51 +00:00
parent c9cc7d9784
commit fecac5a7be
6 changed files with 365 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/res/sound/ogg.cpp
View File

@ -49,9 +49,9 @@ static LibError LibErrorFromVorbis(int err)
class VorbisFileAdapter
{
public:
VorbisFileAdapter(const File& openedFile)
VorbisFileAdapter(const PFile& openedFile)
: file(openedFile)
, size(fs::file_size(openedFile.Pathname()))
, size(fs::file_size(openedFile->Pathname()))
, offset(0)
{
}
@ -63,7 +63,7 @@ public:
const off_t sizeRemaining = adapter->size - adapter->offset;
const size_t sizeToRead = (size_t)std::min(sizeRequested, sizeRemaining);
if(adapter->file.Read(adapter->offset, (u8*)bufferToFill, sizeToRead) == INFO::OK)
if(adapter->file->Read(adapter->offset, (u8*)bufferToFill, sizeToRead) == INFO::OK)
{
adapter->offset += sizeToRead;
return sizeToRead;
@ -99,7 +99,7 @@ public:
static int Close(void* context)
{
VorbisFileAdapter* adapter = (VorbisFileAdapter*)context;
adapter->file.Close();
adapter->file.reset();
return 0; // return value is ignored
}
@ -110,7 +110,7 @@ public:
}
private:
File file;
PFile file;
off_t size;
off_t offset;
};
@ -121,7 +121,7 @@ private:
class OggStreamImpl : public OggStream
{
public:
OggStreamImpl(const File& openedFile)
OggStreamImpl(const PFile& openedFile)
: adapter(openedFile)
{
}
@ -175,7 +175,7 @@ public:
{
bytesRead += ret;
if(bytesRead == size)
return INFO::OK;
return (LibError)bytesRead;
}
}
}
@ -191,8 +191,8 @@ private:
LibError OpenOggStream(const fs::wpath& pathname, OggStreamPtr& stream)
{
File file;
RETURN_ERR(file.Open(pathname, L'r'));
PFile file(new File);
RETURN_ERR(file->Open(pathname, L'r'));
shared_ptr<OggStreamImpl> tmp(new OggStreamImpl(file));
RETURN_ERR(tmp->Open());

4
source/lib/res/sound/ogg.h
View File

@ -9,6 +9,10 @@ public:
virtual ~OggStream() { }
virtual ALenum Format() = 0;
virtual ALsizei SamplingRate() = 0;
/**
* @return bytes read (<= size) or a (negative) LibError
**/
virtual LibError GetNextChunk(u8* buffer, size_t size) = 0;
};

202
source/lib/res/sound/ogghack.cpp
View File

@ -1,202 +0,0 @@
/* Copyright (c) 2010 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "precompiled.h"
#include <string>
#include <iostream>
#include <deque>
#include <algorithm>
#include <cassert>
#if OS_MACOSX
#include <OpenAL/al.h>
#else
#include <AL/al.h>
#endif
#include <vorbis/vorbisfile.h>
#include "ogghack.h" // HACK: must be included after al.h (bad interface)
#include "lib/sysdep/cpu.h"
#if MSC_VERSION
# ifdef NDEBUG
# pragma comment(lib, "vorbisfile.lib")
# else
# pragma comment(lib, "vorbisfile_d.lib")
# endif
#endif
#define BUFFER_SIZE (4096 * 4)
struct Buf
{
void* p;
size_t size;
size_t left;
size_t pos;
Buf(void* _p, size_t _size)
{
p = _p;
size = _size;
left = _size;
pos = 0;
}
};
typedef std::deque<Buf> IncomingBufs;
///////////////////////////////////////////////////////////////////////////////
//
// OGG CALLBACKS
//
///////////////////////////////////////////////////////////////////////////////
size_t read_func(void* ptr, size_t elements, size_t el_size, void* datasource)
{
IncomingBufs* incoming_bufs = (IncomingBufs*)datasource;
size_t size = elements*el_size;
size_t total_read = 0;
while(!incoming_bufs->empty())
{
Buf& b = incoming_bufs->front();
size_t copy_size = std::min(b.left, size);
cpu_memcpy(ptr, (char*)b.p+b.pos, copy_size);
total_read += copy_size;
b.pos += copy_size;
b.left -= copy_size;
if(b.left > 0)
break;
free(b.p);
incoming_bufs->pop_front();
}
return total_read;
}
int seek_func(void* UNUSED(datasource), ogg_int64_t UNUSED(offset), int UNUSED(whence))
{
return -1; // libvorbisfile: indicate "not implemented"
}
int close_func(void* UNUSED(datasource))
{
return 0;
}
struct Ogg
{
OggVorbis_File oggStream;
vorbis_info* vorbisInfo;
vorbis_comment* vorbisComment;
IncomingBufs incoming_bufs;
};
void ogg_give_raw(void* _o, void* p, size_t size)
{
Ogg* o = (Ogg*)_o;
IncomingBufs* incoming_bufs = &o->incoming_bufs;
void* copy = malloc(size);
cpu_memcpy(copy, p, size);
incoming_bufs->push_back(Buf(copy, size));
}
void* ogg_create()
{
return new Ogg;
}
void ogg_open(void* _o, ALenum& fmt, ALsizei& freq)
{
Ogg* o = (Ogg*)_o;
ov_callbacks cbs = { read_func, seek_func, close_func, 0 };
void* datasource = &o->incoming_bufs;
if(ov_open_callbacks(datasource, &o->oggStream, NULL, 0, cbs) < 0)
{
debug_assert(0); // ov_open failed
}
o->vorbisInfo = ov_info(&o->oggStream, -1);
o->vorbisComment = ov_comment(&o->oggStream, -1);
if(o->vorbisInfo->channels == 1)
fmt = AL_FORMAT_MONO16;
else
fmt = AL_FORMAT_STEREO16;
freq = o->vorbisInfo->rate;
}
void ogg_release(void* _o)
{
Ogg* o = (Ogg*)_o;
ov_clear(&o->oggStream);
delete o;
}
size_t ogg_read(void* _o, void* buf, size_t max_size)
{
Ogg* o = (Ogg*)_o;
size_t bytes_written = 0;
while(bytes_written < max_size)
{
int section; // unused
char* pos = (char*)buf + bytes_written;
size_t left_in_buf = max_size - bytes_written;
long result = ov_read(&o->oggStream, pos, (int)left_in_buf , 0,2,1, &section);
if(result > 0)
bytes_written += result;
else if(result < 0)
debug_assert(0); // ogg read error
// clean break - end of data
else
break;
}
return bytes_written;
}

36
source/lib/res/sound/ogghack.h
View File

@ -1,36 +0,0 @@
/* Copyright (c) 2010 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef INCLUDED_OGGHACK
#define INCLUDED_OGGHACK
void* ogg_create();
void ogg_give_raw(void* o, void* p, size_t size);
void ogg_open(void* o, ALenum& fmt, ALsizei& freq);
size_t ogg_read(void* o, void* buf, size_t max_size);
void ogg_release(void* o);
#endif // INCLUDED_OGGHACK

724
source/lib/res/sound/snd_mgr.cpp
View File

File diff suppressed because it is too large Load Diff

5
source/lib/res/sound/snd_mgr.h
View File

@ -176,12 +176,9 @@ extern LibError snd_set_master_gain(float gain);
* its gain (0.0 .. 1.0).
* Otherwise, it is taken to be the sound file name and
* gain is set to the default of 1.0 (no attenuation).
* @param is_stream (Default false) Set to true to forces the sound to be opened as a
* stream: opening is faster, it won't be kept in memory, but
* only one instance can be open at a time.
* @return Handle or LibError
**/
extern Handle snd_open(const PIVFS& vfs, const VfsPath& pathname, bool is_stream = false);
extern Handle snd_open(const PIVFS& vfs, const VfsPath& pathname);
/**
* Close the sound instance. If it was playing, it will be stopped.