generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android audio opensles: random deadlock in stopRecording().

Browse Source 
BUG=2201
Test=WebRTCDemo

R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2039004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4589 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org 2013-08-22 03:14:34 +00:00
parent 286fe0b04d
commit c028ee2bf2
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
webrtc/modules/audio_device/android/audio_device_opensles_android.cc
View File

@ -1000,40 +1000,8 @@ int32_t AudioDeviceAndroidOpenSLES::StartRecording() {
}
int32_t AudioDeviceAndroidOpenSLES::StopRecording() {
{
CriticalSectionScoped lock(&crit_sect_);
if (!is_rec_initialized_) {
WEBRTC_OPENSL_TRACE(kTraceInfo, kTraceAudioDevice, id_,
" Recording is not initialized");
return 0;
}
if ((sles_recorder_itf_ != NULL) && (sles_recorder_ != NULL)) {
int32_t res = (*sles_recorder_itf_)->SetRecordState(
sles_recorder_itf_,
SL_RECORDSTATE_STOPPED);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to stop recording");
return -1;
}
res = (*sles_recorder_sbq_itf_)->Clear(
sles_recorder_sbq_itf_);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to clear recorder buffer queue");
return -1;
}
// Destroy the recorder object
(*sles_recorder_)->Destroy(sles_recorder_);
sles_recorder_ = NULL;
sles_recorder_itf_ = NULL;
}
}
// Stop the playout thread
// Stop the recording thread
// Cannot be under lock, risk of deadlock
if (rec_thread_) {
if (rec_thread_->Stop()) {
delete rec_thread_;
@ -1041,15 +1009,41 @@ int32_t AudioDeviceAndroidOpenSLES::StopRecording() {
} else {
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, id_,
"Failed to stop recording thread ");
return -1;
}
}
CriticalSectionScoped lock(&crit_sect_);
if (!is_rec_initialized_) {
WEBRTC_OPENSL_TRACE(kTraceInfo, kTraceAudioDevice, id_,
" Recording is not initialized");
return 0;
}
int32_t res = (*sles_recorder_itf_)->SetRecordState(
sles_recorder_itf_,
SL_RECORDSTATE_STOPPED);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to stop recording");
}
res = (*sles_recorder_sbq_itf_)->Clear(sles_recorder_sbq_itf_);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to clear recorder buffer queue");
}
// Destroy the recorder object
(*sles_recorder_)->Destroy(sles_recorder_);
is_rec_initialized_ = false;
is_recording_ = false;
rec_warning_ = 0;
rec_error_ = 0;
sles_recorder_ = NULL;
sles_recorder_itf_ = NULL;
sles_recorder_sbq_itf_ = NULL;
return 0;
}