Merge branch 'issupported' of https://github.com/google/oboe

* 'issupported' of https://github.com/google/oboe:
  oboe: add easy way to query whether AAudio is supported

include/oboe/OboeStream.h

@@ -189,6 +189,13 @@ class OboeStream : public OboeStreamBase {
         return OBOE_ERROR_UNIMPLEMENTED;
     }
 
+    /**
+     *
+     * @return true if this stream is implemented using the AAudio API
+     */
+    virtual bool usesAAudio() const {
+        return false;
+    }
 
 protected:
 

include/oboe/OboeStreamBuilder.h

@@ -58,7 +58,6 @@ class OboeStreamBuilder : public OboeStreamBase {
         return this;
     }
 
-
     /**
      * Request the direction for a stream. The default is OBOE_DIRECTION_OUTPUT.
      *
@@ -142,6 +141,15 @@ class OboeStreamBuilder : public OboeStreamBase {
         return this;
     }
 
+    /**
+     * Is the AAudio API supported on this device?
+     *
+     * AAudio was introduced in the Oreo release.
+     *
+     * @return true if supported
+     */
+    static bool isAAudioSupported();
+
     /**
      * Request a mode for sharing the device.
      * The requested sharing mode may not be available.

src/aaudio/OboeStreamAAudio.cpp

@@ -118,6 +118,8 @@ oboe_result_t OboeStreamAAudio::open() {
         goto error2;
     }
 
+    // Query and cache the values that will not change.
+    mDeviceId = mLibLoader->stream_getDeviceId(mAAudioStream);
     mChannelCount = mLibLoader->stream_getChannelCount(mAAudioStream);
     mSampleRate = mLibLoader->stream_getSampleRate(mAAudioStream);
     mNativeFormat = mLibLoader->stream_getFormat(mAAudioStream);
@@ -130,6 +132,7 @@ oboe_result_t OboeStreamAAudio::open() {
 
     LOGD("OboeStreamAAudio.open() app    format = %d", (int) mFormat);
     LOGD("OboeStreamAAudio.open() native format = %d", (int) mNativeFormat);
+    LOGD("OboeStreamAAudio.open() sample rate   = %d", (int) mSampleRate);
 
 error2:
     mLibLoader->builder_delete(aaudioBuilder);

src/aaudio/OboeStreamAAudio.h

@@ -42,7 +42,7 @@ class OboeStreamAAudio : public OboeStream {
 
     /**
      *
-     * @return true is AAudio is supported on this device.
+     * @return true if AAudio is supported on this device.
      */
     static bool isSupported();
 
@@ -80,6 +80,10 @@ class OboeStreamAAudio : public OboeStream {
     oboe_stream_state_t getState() override;
 
 
+    bool usesAAudio() const override {
+        return true;
+    }
+
 public:
     aaudio_data_callback_result_t callOnAudioReady(AAudioStream *stream,
                                                    void *audioData,

src/common/OboeStreamBuilder.cpp

@@ -22,6 +22,10 @@
 #include "opensles/OboeStreamOpenSLES.h"
 #include "aaudio/OboeStreamAAudio.h"
 
+bool OboeStreamBuilder::isAAudioSupported() {
+    return OboeStreamAAudio::isSupported();
+}
+
 OboeStream *OboeStreamBuilder::build() {
     LOGD("OboeStreamBuilder.build(): mAudioApi %d, mChannelCount = %d, mFramesPerCallback = %d",
          mAudioApi, mChannelCount, mFramesPerCallback);

src/common/OboeUtilities.cpp

@@ -21,7 +21,6 @@
 
 #define OBOE_CASE_ENUM(name) case name: return #name
 
-
 void Oboe_convertFloatToPcm16(const float *source, int16_t *destination, int32_t numSamples) {
     for (int i = 0; i < numSamples; i++) {
         float fval = source[i];