Adopt CLAP in ChannelFormat

Author: sgretscher

Utilities/ARAChannelFormat.cpp

@@ -87,7 +87,7 @@ bool ChannelFormat::operator== (const ChannelFormat& other) const noexcept
     return (0 == std::memcmp (_channelArrangement, other._channelArrangement, size));
 }
 
-ARASize ChannelFormat::getChannelArrangementDataSize (const ARAChannelCount /*channelCount*/,
+ARASize ChannelFormat::getChannelArrangementDataSize (const ARAChannelCount channelCount,
                                                       const ARAChannelArrangementDataType channelArrangementDataType,
                                                       const void* const channelArrangement) noexcept
 {
@@ -121,6 +121,19 @@ ARASize ChannelFormat::getChannelArrangementDataSize (const ARAChannelCount /*ch
         {
             return sizeof (uint32_t);
         }
+        case kARAChannelArrangementCLAPChannelMap:
+        {
+            return static_cast<ARASize> (channelCount) * sizeof (uint8_t);
+        }
+        case kARAChannelArrangementCLAPAmbisonicInfo:
+        {
+            // copied from ambisonic.h to avoid dependency on VST3 SDK in this library
+            typedef struct clap_ambisonic_info {
+               uint32_t ordering;
+               uint32_t normalization;
+            } clap_ambisonic_info_t;
+            return sizeof (clap_ambisonic_info_t);
+        }
         default:
         {
             ARA_INTERNAL_ASSERT (false && "unknown channel arrangement data type");
@@ -169,6 +182,11 @@ ARAChannelCount ChannelFormat::_getImpliedChannelCount (const ARAChannelArrangem
             // copied from AAX_STEM_FORMAT_CHANNEL_COUNT() to avoid dependency on AAX SDK in this library
             return static_cast<uint16_t> (stemFormat & 0xFFFF);
         }
+        case kARAChannelArrangementCLAPChannelMap:
+        case kARAChannelArrangementCLAPAmbisonicInfo:
+        {
+            return 0;   // in CLAP, the format information does not encode the channel count
+        }
         default:
         {
             ARA_INTERNAL_ASSERT (false && "unknown channel arrangement data type");