Add IEC61937 for API 34

apps/OboeTester/app/src/main/cpp/FormatConverterBox.cpp

@@ -28,6 +28,7 @@ FormatConverterBox::FormatConverterBox(int32_t numSamples,
     mSource.reset();
     switch (mInputFormat) {
         case oboe::AudioFormat::I16:
+        case oboe::AudioFormat::IEC61937:
             mSource = std::make_unique<oboe::flowgraph::SourceI16>(1);
             break;
         case oboe::AudioFormat::I24:
@@ -46,6 +47,7 @@ FormatConverterBox::FormatConverterBox(int32_t numSamples,
     mSink.reset();
     switch (mOutputFormat) {
         case oboe::AudioFormat::I16:
+        case oboe::AudioFormat::IEC61937:
             mSink = std::make_unique<oboe::flowgraph::SinkI16>(1);
             break;
         case oboe::AudioFormat::I24:

apps/OboeTester/app/src/main/java/com/mobileer/oboetester/StreamConfiguration.java

@@ -45,6 +45,7 @@ public class StreamConfiguration {
     public static final int AUDIO_FORMAT_PCM_FLOAT = 2; // must match AAUDIO
     public static final int AUDIO_FORMAT_PCM_24 = 3; // must match AAUDIO
     public static final int AUDIO_FORMAT_PCM_32 = 4; // must match AAUDIO
+    public static final int AUDIO_FORMAT_IEC61937 = 5; // must match AAUDIO
 
     public static final int DIRECTION_OUTPUT = 0; // must match AAUDIO
     public static final int DIRECTION_INPUT = 1; // must match AAUDIO
@@ -493,6 +494,8 @@ public static String convertFormatToText(int format) {
                 return "I32";
             case AUDIO_FORMAT_PCM_FLOAT:
                 return "Float";
+            case AUDIO_FORMAT_IEC61937:
+                return "Float";
             default:
                 return "Invalid";
         }

apps/OboeTester/app/src/main/res/values/strings.xml

@@ -90,6 +90,7 @@
         <item>PCM_FLOAT</item>
         <item>PCM_I24</item>
         <item>PCM_I32</item>
+        <item>IEC61937</item>
     </string-array>
 
     <string name="input_preset_prompt">InPreset:</string>

include/oboe/AudioStreamBase.h

@@ -271,6 +271,7 @@ class AudioStreamBase {
             case AudioFormat::Float:
             case AudioFormat::I24:
             case AudioFormat::I32:
+            case AudioFormat::IEC61937:
                 break;
 
             default:

include/oboe/Definitions.h

@@ -139,6 +139,19 @@ namespace oboe {
          */
         I32 = 4, // AAUDIO_FORMAT_PCM_I32
 
+        /**
+        * This format is used for compressed audio wrapped in IEC61937 for HDMI
+        * or S/PDIF passthrough.
+        *
+        * Unlike PCM playback, the Android framework is not able to do format
+        * conversion for IEC61937. In that case, when IEC61937 is requested, sampling
+        * rate and channel count or channel mask must be specified. Otherwise, it may
+        * fail when opening the stream. Apps are able to get the correct configuration
+        * for the playback by calling AudioManager#getDevices(int).
+        *
+        * Available since API 34 (U).
+        */
+        IEC61937 = 5, // AAUDIO_FORMAT_IEC61937
     };
 
     /**

src/common/QuirksManager.cpp

@@ -200,6 +200,13 @@ bool QuirksManager::isConversionNeeded(
     const bool isLowLatency = builder.getPerformanceMode() == PerformanceMode::LowLatency;
     const bool isInput = builder.getDirection() == Direction::Input;
     const bool isFloat = builder.getFormat() == AudioFormat::Float;
+    const bool isIEC61937 = builder.getFormat() == AudioFormat::IEC61937;
+
+    // There should be no conversion for IEC61937. Sample rates and channel counts must be set explicitly.
+    if (isIEC61937) {
+        LOGI("QuirksManager::%s() conversion not needed for IEC61937", __func__);
+        return false;
+    }
 
     // There are multiple bugs involving using callback with a specified callback size.
     // Issue #778: O to Q had a problem with Legacy INPUT streams for FLOAT streams

src/common/Utilities.cpp

@@ -66,6 +66,9 @@ int32_t convertFormatToSizeInBytes(AudioFormat format) {
         case AudioFormat::I32:
             size = sizeof(int32_t);
             break;
+        case AudioFormat::IEC61937:
+            size = sizeof(int16_t);
+            break;
         default:
             break;
     }
@@ -106,6 +109,7 @@ const char *convertToText<AudioFormat>(AudioFormat format) {
         case AudioFormat::Float:        return "Float";
         case AudioFormat::I24:          return "I24";
         case AudioFormat::I32:          return "I32";
+        case AudioFormat::IEC61937:     return "IEC61937";
         default:                        return "Unrecognized format";
     }
 }

src/opensles/OpenSLESUtilities.cpp

@@ -85,6 +85,7 @@ SLuint32 OpenSLES_ConvertFormatToRepresentation(AudioFormat format) {
             return SL_ANDROID_PCM_REPRESENTATION_FLOAT;
         case AudioFormat::I24:
         case AudioFormat::I32:
+        case AudioFormat::IEC61937:
         case AudioFormat::Invalid:
         case AudioFormat::Unspecified:
         default: