commit 7c662ba6332459b233ae2526a7b350ad5268c122
author Phil Burk <philburk@google.com> Fri Jun 29 17:54:03 2018 -0700
committer Don Turner <dturner@users.noreply.github.com> Mon Jul 02 15:54:18 2018 +0100
tree 1e26272ee8f9c3e761c66004da990f307a80a7b2
parent d5a156b7e5d82dc5ae843b60483ca54dc5c551cc

opensles: rename methods, cleanup constants

src/opensles/AudioInputStreamOpenSLES.cpp

diff --git a/src/opensles/AudioInputStreamOpenSLES.cpp b/src/opensles/AudioInputStreamOpenSLES.cpp
index ec47ed2..469f002 100644
--- a/src/opensles/AudioInputStreamOpenSLES.cpp
+++ b/src/opensles/AudioInputStreamOpenSLES.cpp
@@ -57,15 +57,19 @@
 AudioInputStreamOpenSLES::~AudioInputStreamOpenSLES() {
 }
 
-int AudioInputStreamOpenSLES::chanCountToChanMask(int channelCount) {
-    // from internal sles_channel_in_mask_from_count(chanCount);
+// Calculate masks specific to INPUT streams.
+SLuint32 AudioInputStreamOpenSLES::channelCountToChannelMask(int channelCount) {
+    // Derived from internal sles_channel_in_mask_from_count(chanCount);
+    // in "frameworks/wilhelm/src/android/channels.cpp".
+    // Yes, it seems strange to use SPEAKER constants to describe inputs.
+    // But that is how OpenSL ES does it internally.
     switch (channelCount) {
         case 1:
             return SL_SPEAKER_FRONT_LEFT;
         case 2:
             return SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
         default:
-            return chanCountToChanMaskDefault(channelCount);
+            return channelCountToChannelMaskDefault(channelCount);
     }
 }
 
@@ -88,7 +92,7 @@
             (SLuint32) (mSampleRate * kMillisPerSecond),    // milliSamplesPerSec
             bitsPerSample,                      // bitsPerSample
             bitsPerSample,                      // containerSize;
-            (SLuint32) chanCountToChanMask(mChannelCount), // channelMask
+            channelCountToChannelMask(mChannelCount), // channelMask
             getDefaultByteOrder(),
     };
 

src/opensles/AudioInputStreamOpenSLES.h

diff --git a/src/opensles/AudioInputStreamOpenSLES.h b/src/opensles/AudioInputStreamOpenSLES.h
index f27b8c4..0cd95e4 100644
--- a/src/opensles/AudioInputStreamOpenSLES.h
+++ b/src/opensles/AudioInputStreamOpenSLES.h
@@ -49,8 +49,6 @@
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount);
-
     int64_t getFramesWritten() const override;
 
 protected:
@@ -59,6 +57,8 @@
 
 private:
 
+    SLuint32 channelCountToChannelMask(int chanCount);
+
     Result setRecordState(SLuint32 newState);
 
     SLRecordItf mRecordInterface = nullptr;

src/opensles/AudioOutputStreamOpenSLES.cpp

diff --git a/src/opensles/AudioOutputStreamOpenSLES.cpp b/src/opensles/AudioOutputStreamOpenSLES.cpp
index cf0edaf..ebeacf9 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.cpp
+++ b/src/opensles/AudioOutputStreamOpenSLES.cpp
@@ -46,8 +46,8 @@
 constexpr int SL_ANDROID_SPEAKER_7DOT1 = (SL_ANDROID_SPEAKER_5DOT1 | SL_SPEAKER_SIDE_LEFT
         | SL_SPEAKER_SIDE_RIGHT);
 
-int AudioOutputStreamOpenSLES::chanCountToChanMask(int channelCount) {
-    int channelMask = 0;
+SLuint32 AudioOutputStreamOpenSLES::channelCountToChannelMask(int channelCount) {
+    SLuint32 channelMask = 0;
 
     switch (channelCount) {
         case  1:
@@ -71,7 +71,7 @@
             break;
 
         default:
-            channelMask = chanCountToChanMaskDefault(channelCount);
+            channelMask = channelCountToChannelMaskDefault(channelCount);
             break;
     }
     return channelMask;
@@ -101,7 +101,7 @@
             (SLuint32) (mSampleRate * kMillisPerSecond),    // milliSamplesPerSec
             bitsPerSample,                      // bitsPerSample
             bitsPerSample,                      // containerSize;
-            (SLuint32) chanCountToChanMask(mChannelCount), // channelMask
+            channelCountToChannelMask(mChannelCount), // channelMask
             getDefaultByteOrder(),
     };
 

src/opensles/AudioOutputStreamOpenSLES.h

diff --git a/src/opensles/AudioOutputStreamOpenSLES.h b/src/opensles/AudioOutputStreamOpenSLES.h
index a0db5ee..58222da 100644
--- a/src/opensles/AudioOutputStreamOpenSLES.h
+++ b/src/opensles/AudioOutputStreamOpenSLES.h
@@ -48,7 +48,6 @@
                               StreamState *nextState,
                               int64_t timeoutNanoseconds) override;
 
-    int chanCountToChanMask(int chanCount);
 
     int64_t getFramesRead() const override;
 
@@ -60,6 +59,8 @@
 
 private:
 
+    SLuint32 channelCountToChannelMask(int chanCount);
+
     Result onAfterDestroy() override;
 
     /**

src/opensles/AudioStreamOpenSLES.cpp

diff --git a/src/opensles/AudioStreamOpenSLES.cpp b/src/opensles/AudioStreamOpenSLES.cpp
index 4a69760..3e7789f 100644
--- a/src/opensles/AudioStreamOpenSLES.cpp
+++ b/src/opensles/AudioStreamOpenSLES.cpp
@@ -49,11 +49,11 @@
     delete[] mCallbackBuffer;
 }
 
-#define AUDIO_CHANNEL_COUNT_MAX          30u
-#define SL_ANDROID_UNKNOWN_CHANNELMASK   0
+constexpr uint      kAudioChannelCountMax = 30u;
+constexpr SLuint32  SL_ANDROID_UNKNOWN_CHANNELMASK  = 0; // Matches name used internally.
 
-int AudioStreamOpenSLES::chanCountToChanMaskDefault(int channelCount) {
-    if (channelCount > AUDIO_CHANNEL_COUNT_MAX) {
+SLuint32 AudioStreamOpenSLES::channelCountToChannelMaskDefault(int channelCount) {
+    if (channelCount > kAudioChannelCountMax) {
         return SL_ANDROID_UNKNOWN_CHANNELMASK;
     } else {
         SLuint32 bitfield = (1 << channelCount) - 1;

src/opensles/AudioStreamOpenSLES.h

diff --git a/src/opensles/AudioStreamOpenSLES.h b/src/opensles/AudioStreamOpenSLES.h
index be9a332..e7dd1d4 100644
--- a/src/opensles/AudioStreamOpenSLES.h
+++ b/src/opensles/AudioStreamOpenSLES.h
@@ -74,7 +74,7 @@
 
 protected:
 
-    int chanCountToChanMaskDefault(int channelCount);
+    SLuint32 channelCountToChannelMaskDefault(int channelCount);
 
     virtual Result onBeforeDestroy() { return Result::OK; };
     virtual Result onAfterDestroy() { return Result::OK; };