Merge "Fix bug 4319552 Use commonly defined channel mask values in native"

                                        AUDIO_FORMAT_PCM_SUB_8_24_BIT),

} audio_format_t;

/* Channel mask definitions must be kept in sync with JAVA values in

 * frameworks/base/media/java/android/media/AudioFormat.java */

typedef enum {

    /* output channels */

    AUDIO_CHANNEL_OUT_FRONT_LEFT            = 0x4,

    AUDIO_CHANNEL_OUT_FRONT_RIGHT           = 0x8,

    AUDIO_CHANNEL_OUT_FRONT_CENTER          = 0x10,

    AUDIO_CHANNEL_OUT_LOW_FREQUENCY         = 0x20,

    AUDIO_CHANNEL_OUT_BACK_LEFT             = 0x40,

    AUDIO_CHANNEL_OUT_BACK_RIGHT            = 0x80,

    AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER  = 0x100,

    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200,

    AUDIO_CHANNEL_OUT_BACK_CENTER           = 0x400,

    AUDIO_CHANNEL_OUT_SIDE_LEFT             = 0x800,

    AUDIO_CHANNEL_OUT_SIDE_RIGHT            = 0x1000,

    AUDIO_CHANNEL_OUT_TOP_CENTER            = 0x2000,

    AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT        = 0x4000,

    AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER      = 0x8000,

    AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT       = 0x10000,

    AUDIO_CHANNEL_OUT_TOP_BACK_LEFT         = 0x20000,

    AUDIO_CHANNEL_OUT_TOP_BACK_CENTER       = 0x40000,

    AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT        = 0x80000,

    AUDIO_CHANNEL_OUT_FRONT_LEFT            = 0x1,

    AUDIO_CHANNEL_OUT_FRONT_RIGHT           = 0x2,

    AUDIO_CHANNEL_OUT_FRONT_CENTER          = 0x4,

    AUDIO_CHANNEL_OUT_LOW_FREQUENCY         = 0x8,

    AUDIO_CHANNEL_OUT_BACK_LEFT             = 0x10,

    AUDIO_CHANNEL_OUT_BACK_RIGHT            = 0x20,

    AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER  = 0x40,

    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80,

    AUDIO_CHANNEL_OUT_BACK_CENTER           = 0x100,

    AUDIO_CHANNEL_OUT_SIDE_LEFT             = 0x200,

    AUDIO_CHANNEL_OUT_SIDE_RIGHT            = 0x400,

    AUDIO_CHANNEL_OUT_TOP_CENTER            = 0x800,

    AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT        = 0x1000,

    AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER      = 0x2000,

    AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT       = 0x4000,

    AUDIO_CHANNEL_OUT_TOP_BACK_LEFT         = 0x8000,

    AUDIO_CHANNEL_OUT_TOP_BACK_CENTER       = 0x10000,

    AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT        = 0x20000,

    AUDIO_CHANNEL_OUT_MONO     = AUDIO_CHANNEL_OUT_FRONT_LEFT,

    AUDIO_CHANNEL_OUT_STEREO   = (AUDIO_CHANNEL_OUT_FRONT_LEFT |