Merge pull request #376 from google/state_l
oboe_opensles: add _l to function names called under lock
diff --git a/src/opensles/AudioInputStreamOpenSLES.cpp b/src/opensles/AudioInputStreamOpenSLES.cpp
index 7b820af..30a5128 100644
--- a/src/opensles/AudioInputStreamOpenSLES.cpp
+++ b/src/opensles/AudioInputStreamOpenSLES.cpp
@@ -223,17 +223,17 @@
return result;
}
-Result AudioInputStreamOpenSLES::setRecordState(SLuint32 newState) {
- LOGD("AudioInputStreamOpenSLES::setRecordState(%d)", newState);
+Result AudioInputStreamOpenSLES::setRecordState_l(SLuint32 newState) {
+ LOGD("AudioInputStreamOpenSLES::%s(%d)", __func__, newState);
Result result = Result::OK;
if (mRecordInterface == nullptr) {
- LOGE("AudioInputStreamOpenSLES::SetRecordState() mRecordInterface is null");
+ LOGE("AudioInputStreamOpenSLES::%s() mRecordInterface is null", __func__);
return Result::ErrorInvalidState;
}
SLresult slResult = (*mRecordInterface)->SetRecordState(mRecordInterface, newState);
if (SL_RESULT_SUCCESS != slResult) {
- LOGE("AudioInputStreamOpenSLES::SetRecordState() returned %s", getSLErrStr(slResult));
+ LOGE("AudioInputStreamOpenSLES::%s() returned %s", __func__, getSLErrStr(slResult));
result = Result::ErrorInternal; // TODO review
}
return result;
@@ -258,7 +258,7 @@
setDataCallbackEnabled(true);
setState(StreamState::Starting);
- Result result = setRecordState(SL_RECORDSTATE_RECORDING);
+ Result result = setRecordState_l(SL_RECORDSTATE_RECORDING);
if (result == Result::OK) {
setState(StreamState::Started);
// Enqueue the first buffer to start the streaming.
@@ -300,7 +300,7 @@
setState(StreamState::Stopping);
- Result result = setRecordState(SL_RECORDSTATE_STOPPED);
+ Result result = setRecordState_l(SL_RECORDSTATE_STOPPED);
if (result == Result::OK) {
mPositionMillis.reset32(); // OpenSL ES resets its millisecond position when stopped.
setState(StreamState::Stopped);
diff --git a/src/opensles/AudioInputStreamOpenSLES.h b/src/opensles/AudioInputStreamOpenSLES.h
index bf88ad9..2f81a8b 100644
--- a/src/opensles/AudioInputStreamOpenSLES.h
+++ b/src/opensles/AudioInputStreamOpenSLES.h
@@ -55,7 +55,7 @@
SLuint32 channelCountToChannelMask(int chanCount);
- Result setRecordState(SLuint32 newState);
+ Result setRecordState_l(SLuint32 newState);
SLRecordItf mRecordInterface = nullptr;
};
diff --git a/src/opensles/AudioOutputStreamOpenSLES.cpp b/src/opensles/AudioOutputStreamOpenSLES.cpp
index 87c1a8c..4bd73fd 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.cpp
+++ b/src/opensles/AudioOutputStreamOpenSLES.cpp
@@ -254,19 +254,19 @@
return result;
}
-Result AudioOutputStreamOpenSLES::setPlayState(SLuint32 newState) {
+Result AudioOutputStreamOpenSLES::setPlayState_l(SLuint32 newState) {
- LOGD("AudioOutputStreamOpenSLES(): setPlayState()");
+ LOGD("AudioOutputStreamOpenSLES(): %s() called", __func__);
Result result = Result::OK;
if (mPlayInterface == nullptr){
- LOGE("AudioOutputStreamOpenSLES::setPlayState() mPlayInterface is null");
+ LOGE("AudioOutputStreamOpenSLES::%s() mPlayInterface is null", __func__);
return Result::ErrorInvalidState;
}
SLresult slResult = (*mPlayInterface)->SetPlayState(mPlayInterface, newState);
if (SL_RESULT_SUCCESS != slResult) {
- LOGD("AudioOutputStreamOpenSLES(): setPlayState() returned %s", getSLErrStr(slResult));
+ LOGD("AudioOutputStreamOpenSLES(): %s() returned %s", __func__, getSLErrStr(slResult));
result = Result::ErrorInternal; // TODO convert slResult to Result::Error
}
return result;
@@ -294,7 +294,7 @@
setDataCallbackEnabled(true);
setState(StreamState::Starting);
- Result result = setPlayState(SL_PLAYSTATE_PLAYING);
+ Result result = setPlayState_l(SL_PLAYSTATE_PLAYING);
if (result == Result::OK) {
setState(StreamState::Started);
mLock.unlock();
@@ -325,7 +325,7 @@
}
setState(StreamState::Pausing);
- Result result = setPlayState(SL_PLAYSTATE_PAUSED);
+ Result result = setPlayState_l(SL_PLAYSTATE_PAUSED);
if (result == Result::OK) {
// Note that OpenSL ES does NOT reset its millisecond position when OUTPUT is paused.
int64_t framesWritten = getFramesWritten();
@@ -382,7 +382,7 @@
setState(StreamState::Stopping);
- Result result = setPlayState(SL_PLAYSTATE_STOPPED);
+ Result result = setPlayState_l(SL_PLAYSTATE_STOPPED);
if (result == Result::OK) {
// Also clear the buffer queue so the old data won't be played if the stream is restarted.
diff --git a/src/opensles/AudioOutputStreamOpenSLES.h b/src/opensles/AudioOutputStreamOpenSLES.h
index 4bdfcc6..999a80c 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.h
+++ b/src/opensles/AudioOutputStreamOpenSLES.h
@@ -66,7 +66,7 @@
* @param newState SL_PLAYSTATE_PAUSED, SL_PLAYSTATE_PLAYING, SL_PLAYSTATE_STOPPED
* @return
*/
- Result setPlayState(SLuint32 newState);
+ Result setPlayState_l(SLuint32 newState);
SLPlayItf mPlayInterface = nullptr;
