Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sound should now work with OpenSL.

Browse source
This commit is contained in:
Jean-Philip Desjardins 2016-03-31 00:28:23 -04:00
parent 8c29211909
commit 9aa826d25e
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/ui_android/SH_OpenSL.cpp
View file

@ -54,7 +54,7 @@ void CSH_OpenSL::CreateAudioPlayer()
SLDataLocator_AndroidSimpleBufferQueue bufferQueueLocator = {}; SLDataLocator_AndroidSimpleBufferQueue bufferQueueLocator = {};
bufferQueueLocator.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; bufferQueueLocator.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
bufferQueueLocator.numBuffers = 2; bufferQueueLocator.numBuffers = BUFFER_COUNT;
SLDataFormat_PCM dataFormat = {}; SLDataFormat_PCM dataFormat = {};
dataFormat.formatType = SL_DATAFORMAT_PCM; dataFormat.formatType = SL_DATAFORMAT_PCM;
@ -90,6 +90,23 @@ void CSH_OpenSL::CreateAudioPlayer()
result = (*m_playerObject)->GetInterface(m_playerObject, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, &m_playerQueue); result = (*m_playerObject)->GetInterface(m_playerObject, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, &m_playerQueue);
assert(result == SL_RESULT_SUCCESS); assert(result == SL_RESULT_SUCCESS);
result = (*m_playerQueue)->RegisterCallback(m_playerQueue, &CSH_OpenSL::QueueCallback, this);
assert(result == SL_RESULT_SUCCESS);
result = (*m_playerPlay)->SetPlayState(m_playerPlay, SL_PLAYSTATE_PLAYING);
assert(result == SL_RESULT_SUCCESS);
}
void CSH_OpenSL::QueueCallback(SLAndroidSimpleBufferQueueItf, void* context)
{
reinterpret_cast<CSH_OpenSL*>(context)->QueueCallbackImpl();
}
void CSH_OpenSL::QueueCallbackImpl()
{
assert(m_bufferCount != BUFFER_COUNT);
m_bufferCount++;
} }
void CSH_OpenSL::Reset() void CSH_OpenSL::Reset()
@ -100,16 +117,22 @@ void CSH_OpenSL::Reset()
result = (*m_playerQueue)->Clear(m_playerQueue); result = (*m_playerQueue)->Clear(m_playerQueue);
assert(result == SL_RESULT_SUCCESS); assert(result == SL_RESULT_SUCCESS);
m_bufferCount = BUFFER_COUNT;
} }
void CSH_OpenSL::Write(int16* buffer, unsigned int sampleCount, unsigned int) void CSH_OpenSL::Write(int16* buffer, unsigned int sampleCount, unsigned int)
{ {
if(m_bufferCount == 0) return;
assert(m_playerQueue != nullptr); assert(m_playerQueue != nullptr);
SLresult result = SL_RESULT_SUCCESS; SLresult result = SL_RESULT_SUCCESS;
result = (*m_playerQueue)->Enqueue(m_playerQueue, buffer, sampleCount * sizeof(int16)); result = (*m_playerQueue)->Enqueue(m_playerQueue, buffer, sampleCount * sizeof(int16));
assert(result == SL_RESULT_SUCCESS); assert(result == SL_RESULT_SUCCESS);
m_bufferCount--;
} }
bool CSH_OpenSL::HasFreeBuffers() bool CSH_OpenSL::HasFreeBuffers()

10
Source/ui_android/SH_OpenSL.h
View file

@ -18,9 +18,17 @@ public:
void RecycleBuffers() override; void RecycleBuffers() override;
private: private:
enum
{
BUFFER_COUNT = 5,
};
void CreateOutputMix(); void CreateOutputMix();
void CreateAudioPlayer(); void CreateAudioPlayer();
static void QueueCallback(SLAndroidSimpleBufferQueueItf, void*);
void QueueCallbackImpl();
SLObjectItf m_engineObject = nullptr; SLObjectItf m_engineObject = nullptr;
SLEngineItf m_engine = nullptr; SLEngineItf m_engine = nullptr;
@ -29,4 +37,6 @@ private:
SLObjectItf m_playerObject = nullptr; SLObjectItf m_playerObject = nullptr;
SLPlayItf m_playerPlay = nullptr; SLPlayItf m_playerPlay = nullptr;
SLAndroidSimpleBufferQueueItf m_playerQueue = nullptr; SLAndroidSimpleBufferQueueItf m_playerQueue = nullptr;
uint32 m_bufferCount = BUFFER_COUNT;
}; };