Merge pull request #71 from google/openslerr

oboe: cleanup OpenSL ES input
google · Mar 27, 2018 · 2925aa7 · 2925aa7
2 parents dac7687 + 0cb67a6
commit 2925aa7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/include/oboe/AudioStream.h b/include/oboe/AudioStream.h
@@ -186,7 +186,6 @@ class AudioStream : public AudioStreamBase {
         return static_cast<int32_t>(Result::ErrorUnimplemented);
     }
 
-
     /**
      *
      * @return the API that this stream uses
@@ -228,8 +227,8 @@ class AudioStream : public AudioStreamBase {
      *   or ErrorTimeout.
      */
     virtual Result waitForStateTransition(StreamState startingState,
-                                              StreamState endingState,
-                                              int64_t timeoutNanoseconds);
+                                          StreamState endingState,
+                                          int64_t timeoutNanoseconds);
 
     /**
      * Override this to provide a default for when the application did not specify a callback.

diff --git a/src/common/AudioStream.cpp b/src/common/AudioStream.cpp
@@ -61,8 +61,8 @@ DataCallbackResult AudioStream::fireCallback(void *audioData, int32_t numFrames)
 }
 
 Result AudioStream::waitForStateTransition(StreamState startingState,
-                                               StreamState endingState,
-                                               int64_t timeoutNanoseconds)
+                                           StreamState endingState,
+                                           int64_t timeoutNanoseconds)
 {
     StreamState state = getState();
     StreamState nextState = state;

diff --git a/src/opensles/AudioInputStreamOpenSLES.cpp b/src/opensles/AudioInputStreamOpenSLES.cpp
@@ -156,12 +156,13 @@ Result AudioInputStreamOpenSLES::close() {
 Result AudioInputStreamOpenSLES::setRecordState(SLuint32 newState) {
     Result result = Result::OK;
     LOGD("AudioInputStreamOpenSLES::setRecordState(%d)", newState);
-    if (mRecordInterface == NULL) {
+    if (mRecordInterface == nullptr) {
+        LOGE("AudioInputStreamOpenSLES::SetRecordState() mRecordInterface is null");
         return Result::ErrorInvalidState;
     }
     SLresult slResult = (*mRecordInterface)->SetRecordState(mRecordInterface, newState);
     if(SL_RESULT_SUCCESS != slResult) {
-        LOGD("AudioInputStreamOpenSLES::setPlayState() returned %s", getSLErrStr(slResult));
+        LOGE("AudioInputStreamOpenSLES::SetRecordState() returned %s", getSLErrStr(slResult));
         result = Result::ErrorInvalidState; // TODO review
     } else {
         setState(StreamState::Pausing);
@@ -173,9 +174,7 @@ Result AudioInputStreamOpenSLES::requestStart()
 {
     LOGD("AudioInputStreamOpenSLES::requestStart()");
     Result result = setRecordState(SL_RECORDSTATE_RECORDING);
-    if(result != Result::OK) {
-        result = Result::ErrorInvalidState; // TODO review
-    } else {
+    if(result == Result::OK) {
         // Enqueue the first buffer so that we have data ready in the callback.
         enqueueCallbackBuffer(mSimpleBufferQueueInterface);
         setState(StreamState::Starting);

diff --git a/src/opensles/AudioInputStreamOpenSLES.h b/src/opensles/AudioInputStreamOpenSLES.h
@@ -55,7 +55,7 @@ class AudioInputStreamOpenSLES : public AudioStreamOpenSLES {
 
     Result setRecordState(SLuint32 newState);
 
-    SLRecordItf mRecordInterface;
+    SLRecordItf mRecordInterface = nullptr;
 };
 
 } // namespace oboe