zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioDeviceAndroidOpenSLES: NULL variables might be referenced in StopPlayout()

Browse Source 
BUG=1891
Test=ManualTest

R=fischman@webrtc.org, xians@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4200 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org
2013-06-10 08:09:05 +00:00
parent 569fdef732
commit 83a062cc5f
1 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1133,48 +1133,50 @@ int32_t AudioDeviceAndroidOpenSLES::StartPlayout() {
} }
int32_t AudioDeviceAndroidOpenSLES::StopPlayout() { int32_t AudioDeviceAndroidOpenSLES::StopPlayout() {
{
CriticalSectionScoped lock(&crit_sect_);
if (!is_play_initialized_) {
WEBRTC_OPENSL_TRACE(kTraceInfo, kTraceAudioDevice, id_,
" Playout is not initialized");
return 0;
}
if (!sles_player_itf_ && !sles_output_mixer_ && !sles_player_) { CriticalSectionScoped lock(&crit_sect_);
// Make sure player is stopped if (!is_play_initialized_) {
int32_t res = WEBRTC_OPENSL_TRACE(kTraceInfo, kTraceAudioDevice, id_,
(*sles_player_itf_)->SetPlayState(sles_player_itf_, " Playout is not initialized");
SL_PLAYSTATE_STOPPED); return 0;
if (res != SL_RESULT_SUCCESS) { }
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to stop playout");
return -1;
}
res = (*sles_player_sbq_itf_)->Clear(sles_player_sbq_itf_);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to clear player buffer queue");
return -1;
}
// Destroy the player if (sles_player_itf_) {
(*sles_player_)->Destroy(sles_player_); // Make sure player is stopped
// Destroy Output Mix object int32_t res = (*sles_player_itf_)->SetPlayState(sles_player_itf_,
(*sles_output_mixer_)->Destroy(sles_output_mixer_); SL_PLAYSTATE_STOPPED);
sles_player_ = NULL; if (res != SL_RESULT_SUCCESS) {
sles_player_itf_ = NULL; WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
sles_player_sbq_itf_ = NULL; " failed to stop playout");
sles_output_mixer_ = NULL;
} }
} }
CriticalSectionScoped lock(&crit_sect_); if (sles_player_sbq_itf_) {
int32_t res = (*sles_player_sbq_itf_)->Clear(sles_player_sbq_itf_);
if (res != SL_RESULT_SUCCESS) {
WEBRTC_OPENSL_TRACE(kTraceError, kTraceAudioDevice, id_,
" failed to clear player buffer queue");
}
}
if (sles_player_) {
// Destroy the player
(*sles_player_)->Destroy(sles_player_);
}
if (sles_output_mixer_) {
// Destroy Output Mix object
(*sles_output_mixer_)->Destroy(sles_output_mixer_);
}
is_play_initialized_ = false; is_play_initialized_ = false;
is_playing_ = false; is_playing_ = false;
play_warning_ = 0; play_warning_ = 0;
play_error_ = 0; play_error_ = 0;
sles_player_sbq_itf_ = NULL;
sles_player_itf_ = NULL;
sles_player_ = NULL;
sles_output_mixer_ = NULL;
return 0; return 0;
} }