ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WP8: Fix issue reported at https://groups.google.com/forum/#!topic/doubango/JkYR8tc6yrw

This commit is contained in:
bossiel 2013-09-11 11:08:35 +00:00
parent 3d44b20846
commit 3fce7e4040
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
branches/2.0/doubango/tinyDAV/src/audio/wasapi/tdav_consumer_wasapi.cxx
View File

@ -86,7 +86,6 @@ namespace Doubango
tsk_ssize_t leftBytes;
SpeexBuffer* buffer;
tsk_size_t size;
tsk_mutex_handle_t* mutex;
} m_ring;
bool m_bStarted;
@ -391,10 +390,6 @@ int Doubango::VoIP::AudioRender::Prepare(tdav_consumer_wasapi_t* wasapi, const t
TSK_DEBUG_ERROR("Failed to create a new ring buffer with size = %d", m_ring.size);
WASAPI_SET_ERROR(-17);
}
if(!m_ring.mutex && !(m_ring.mutex = tsk_mutex_create_2(tsk_false))){
TSK_DEBUG_ERROR("Failed to create mutex");
WASAPI_SET_ERROR(-18);
}
bail:
if (pwstrRenderId){
@ -437,9 +432,6 @@ int Doubango::VoIP::AudioRender::UnPrepare()
speex_buffer_destroy(m_ring.buffer);
m_ring.buffer = nullptr;
}
if(m_ring.mutex){
tsk_mutex_destroy(&m_ring.mutex);
}
m_pWrappedConsumer = nullptr;
@ -526,10 +518,7 @@ int Doubango::VoIP::AudioRender::Pause()
int Doubango::VoIP::AudioRender::Consume(const void* buffer, tsk_size_t size, const tsk_object_t* proto_hdr)
{
tsk_mutex_lock(m_ring.mutex);
speex_buffer_write(m_ring.buffer, (void*)buffer, size);
tsk_mutex_unlock(m_ring.mutex);
return 0;
return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(m_pWrappedConsumer), buffer, size, proto_hdr);
}
tsk_size_t Doubango::VoIP::AudioRender::Read(void* data, tsk_size_t size)