Merge "audio: Add vendor tags handling for AIDL" am: a3a1c665 am: 431c0d4d

#include <algorithm>

#include <array>

#include <initializer_list>

#include <regex>

#include <type_traits>

#include <aidl/android/media/audio/common/AudioChannelLayout.h>

           kValidAudioModes.end();

}

static inline bool maybeVendorExtension(const std::string& s) {

    // Only checks whether the string starts with the "vendor prefix".

    static const std::string vendorPrefix = "VX_";

    return s.size() > vendorPrefix.size() && s.substr(0, vendorPrefix.size()) == vendorPrefix;

}

static inline bool isVendorExtension(const std::string& s) {

    // Must be the same as defined in {Playback|Record}TrackMetadata.aidl

    static const std::regex vendorExtension("VX_[A-Z0-9]{3,}_[_A-Z0-9]+");

    return std::regex_match(s.begin(), s.end(), vendorExtension);

}

// The helper functions defined below are only applicable to the case when an enum type

// specifies zero-based bit positions, not bit masks themselves. This is why instantiation

// is restricted to certain enum types.

#endif

#if MAJOR_VERSION >= 7

    static constexpr char sAudioTagSeparator = ';';

    static constexpr char sAudioTagSeparator = AUDIO_ATTRIBUTES_TAGS_SEPARATOR;

    static status_t audioChannelMaskFromHal(audio_channel_mask_t halChannelMask, bool isInput,

                                            AudioChannelMask* channelMask);