From 83e618e44dbe96b15ba85de49b0c1160dcafecf1 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sun, 23 Nov 2014 12:32:45 -0500
Subject: [PATCH] Minor FMOD Ex Streaming audio fixes and cleanup
---
indra/llaudio/llstreamingaudio_fmodex.cpp | 44 +++++++++++++++--------
indra/llaudio/llstreamingaudio_fmodex.h | 1 +
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 9c9e85c00c..0b51b61314 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -70,14 +70,6 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
const U32 buffer_seconds = 10; //sec
const U32 estimated_bitrate = 128; //kbit/sec
mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES);
-
- // Here's where we set the size of the network buffer and some buffering
- // parameters. In this case we want a network buffer of 16k, we want it
- // to prebuffer 40% of that when we first connect, and we want it
- // to rebuffer 80% of that whenever we encounter a buffer underrun.
-
- // Leave the net buffer properties at the default.
- //FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
}
@@ -100,9 +92,17 @@ void LLStreamingAudio_FMODEX::start(const std::string& url)
if (!url.empty())
{
- LL_INFOS() << "Starting internet stream: " << url << LL_ENDL;
- mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,url);
- mURL = url;
+ if(mDeadStreams.empty())
+ {
+ LL_INFOS() << "Starting internet stream: " << url << LL_ENDL;
+ mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,url);
+ mURL = url;
+ }
+ else
+ {
+ LL_INFOS() << "Deferring stream load until buffer release: " << url << LL_ENDL;
+ mPendingURL = url;
+ }
}
else
{
@@ -131,6 +131,21 @@ void LLStreamingAudio_FMODEX::update()
}
}
+ if(!mDeadStreams.empty())
+ {
+ llassert_always(mCurrentInternetStreamp == NULL);
+ return;
+ }
+
+ if(!mPendingURL.empty())
+ {
+ llassert_always(mCurrentInternetStreamp == NULL);
+ LL_INFOS() << "Starting internet stream: " << mPendingURL << LL_ENDL;
+ mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,mPendingURL);
+ mURL = mPendingURL;
+ mPendingURL.clear();
+ }
+
// Don't do anything if there are no streams playing
if (!mCurrentInternetStreamp)
{
@@ -211,6 +226,8 @@ void LLStreamingAudio_FMODEX::update()
void LLStreamingAudio_FMODEX::stop()
{
+ mPendingURL.clear();
+
if (mFMODInternetStreamChannelp)
{
mFMODInternetStreamChannelp->setPaused(true);
@@ -264,7 +281,7 @@ int LLStreamingAudio_FMODEX::isPlaying()
{
return 1; // Active and playing
}
- else if (!mURL.empty())
+ else if (!mURL.empty() || !mPendingURL.empty())
{
return 2; // "Paused"
}
@@ -356,9 +373,8 @@ bool LLAudioStreamManagerFMODEX::stopStream()
close = true;
}
- if (close)
+ if (close && mInternetStream->release() == FMOD_OK)
{
- mInternetStream->release();
mStreamChannel = NULL;
mInternetStream = NULL;
return true;
diff --git a/indra/llaudio/llstreamingaudio_fmodex.h b/indra/llaudio/llstreamingaudio_fmodex.h
index 2787840ba1..e6fc460e9b 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.h
+++ b/indra/llaudio/llstreamingaudio_fmodex.h
@@ -66,6 +66,7 @@ private:
std::list<LLAudioStreamManagerFMODEX *> mDeadStreams;
std::string mURL;
+ std::string mPendingURL;
F32 mGain;
};
--
GitLab