Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb4a9c1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "aidl-format android.media.audio.common.types AIDLs"

parents a164ab03 50e2404f

media/aidl/android/media/audio/common/AudioChannelLayout.aidl

+50 −85
Original line number Diff line number Diff line
@@ -114,95 +114,60 @@ union AudioChannelLayout { 
     * to be from the LSB to MSB for all the bits set to '1'.

     */

    const int LAYOUT_MONO = CHANNEL_FRONT_LEFT;

    const int LAYOUT_STEREO =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT;

    const int LAYOUT_2POINT1 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_TRI =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER;

    const int LAYOUT_TRI_BACK =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_CENTER;

    const int LAYOUT_STEREO = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT;

    const int LAYOUT_2POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_TRI = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER;

    const int LAYOUT_TRI_BACK = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_CENTER;

    const int LAYOUT_3POINT1 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER |

            CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_2POINT0POINT2 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_2POINT1POINT2 =

            LAYOUT_2POINT0POINT2 | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_3POINT0POINT2 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_3POINT1POINT2 =

            LAYOUT_3POINT0POINT2 | CHANNEL_LOW_FREQUENCY;

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_2POINT0POINT2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT

            | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_2POINT1POINT2 = LAYOUT_2POINT0POINT2 | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_3POINT0POINT2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER

            | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_3POINT1POINT2 = LAYOUT_3POINT0POINT2 | CHANNEL_LOW_FREQUENCY;

    const int LAYOUT_QUAD =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT;

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT;

    const int LAYOUT_QUAD_SIDE =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

    const int LAYOUT_SURROUND =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER;

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER;

    const int LAYOUT_PENTA = LAYOUT_QUAD | CHANNEL_FRONT_CENTER;

    const int LAYOUT_5POINT1 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY |

            CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT;

    const int LAYOUT_5POINT1_SIDE =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY |

            CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

    const int LAYOUT_5POINT1POINT2 = LAYOUT_5POINT1 |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_5POINT1POINT4 = LAYOUT_5POINT1 |

            CHANNEL_TOP_FRONT_LEFT | CHANNEL_TOP_FRONT_RIGHT |

            CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT;

    const int LAYOUT_6POINT1 =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY |

            CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT | CHANNEL_BACK_CENTER;

    const int LAYOUT_7POINT1 = LAYOUT_5POINT1 |

            CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

    const int LAYOUT_7POINT1POINT2 = LAYOUT_7POINT1 |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_7POINT1POINT4 = LAYOUT_7POINT1 |

            CHANNEL_TOP_FRONT_LEFT | CHANNEL_TOP_FRONT_RIGHT |

            CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT;

    const int LAYOUT_9POINT1POINT4 = LAYOUT_7POINT1POINT4 |

            CHANNEL_FRONT_WIDE_LEFT | CHANNEL_FRONT_WIDE_RIGHT;

    const int LAYOUT_9POINT1POINT6 = LAYOUT_9POINT1POINT4 |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_13POINT_360RA =

            CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |

            CHANNEL_FRONT_CENTER |

            CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT |

            CHANNEL_TOP_FRONT_LEFT | CHANNEL_TOP_FRONT_RIGHT |

            CHANNEL_TOP_FRONT_CENTER |

            CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT |

            CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT |

            CHANNEL_BOTTOM_FRONT_CENTER;

    const int LAYOUT_22POINT2 = LAYOUT_7POINT1POINT4 |

            CHANNEL_FRONT_LEFT_OF_CENTER | CHANNEL_FRONT_RIGHT_OF_CENTER |

            CHANNEL_BACK_CENTER | CHANNEL_TOP_CENTER |

            CHANNEL_TOP_FRONT_CENTER | CHANNEL_TOP_BACK_CENTER |

            CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT |

            CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT |

            CHANNEL_BOTTOM_FRONT_CENTER |

            CHANNEL_LOW_FREQUENCY_2;

    const int LAYOUT_MONO_HAPTIC_A =

            LAYOUT_MONO | CHANNEL_HAPTIC_A;

    const int LAYOUT_STEREO_HAPTIC_A =

            LAYOUT_STEREO | CHANNEL_HAPTIC_A;

    const int LAYOUT_HAPTIC_AB =

            CHANNEL_HAPTIC_A | CHANNEL_HAPTIC_B;

    const int LAYOUT_MONO_HAPTIC_AB =

            LAYOUT_MONO | LAYOUT_HAPTIC_AB;

    const int LAYOUT_STEREO_HAPTIC_AB =

            LAYOUT_STEREO | LAYOUT_HAPTIC_AB;

    const int LAYOUT_FRONT_BACK =

            CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER;

    const int LAYOUT_5POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER

            | CHANNEL_LOW_FREQUENCY | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT;

    const int LAYOUT_5POINT1_SIDE = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER

            | CHANNEL_LOW_FREQUENCY | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

    const int LAYOUT_5POINT1POINT2 =

            LAYOUT_5POINT1 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_5POINT1POINT4 = LAYOUT_5POINT1 | CHANNEL_TOP_FRONT_LEFT

            | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT;

    const int LAYOUT_6POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER

            | CHANNEL_LOW_FREQUENCY | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT | CHANNEL_BACK_CENTER;

    const int LAYOUT_7POINT1 = LAYOUT_5POINT1 | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;

    const int LAYOUT_7POINT1POINT2 =

            LAYOUT_7POINT1 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_7POINT1POINT4 = LAYOUT_7POINT1 | CHANNEL_TOP_FRONT_LEFT

            | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT;

    const int LAYOUT_9POINT1POINT4 =

            LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_WIDE_LEFT | CHANNEL_FRONT_WIDE_RIGHT;

    const int LAYOUT_9POINT1POINT6 =

            LAYOUT_9POINT1POINT4 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT;

    const int LAYOUT_13POINT_360RA = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER

            | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT | CHANNEL_TOP_FRONT_LEFT

            | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_FRONT_CENTER | CHANNEL_TOP_BACK_LEFT

            | CHANNEL_TOP_BACK_RIGHT | CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT

            | CHANNEL_BOTTOM_FRONT_CENTER;

    const int LAYOUT_22POINT2 = LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_LEFT_OF_CENTER

            | CHANNEL_FRONT_RIGHT_OF_CENTER | CHANNEL_BACK_CENTER | CHANNEL_TOP_CENTER

            | CHANNEL_TOP_FRONT_CENTER | CHANNEL_TOP_BACK_CENTER | CHANNEL_TOP_SIDE_LEFT

            | CHANNEL_TOP_SIDE_RIGHT | CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT

            | CHANNEL_BOTTOM_FRONT_CENTER | CHANNEL_LOW_FREQUENCY_2;

    const int LAYOUT_MONO_HAPTIC_A = LAYOUT_MONO | CHANNEL_HAPTIC_A;

    const int LAYOUT_STEREO_HAPTIC_A = LAYOUT_STEREO | CHANNEL_HAPTIC_A;

    const int LAYOUT_HAPTIC_AB = CHANNEL_HAPTIC_A | CHANNEL_HAPTIC_B;

    const int LAYOUT_MONO_HAPTIC_AB = LAYOUT_MONO | LAYOUT_HAPTIC_AB;

    const int LAYOUT_STEREO_HAPTIC_AB = LAYOUT_STEREO | LAYOUT_HAPTIC_AB;

    const int LAYOUT_FRONT_BACK = CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER;



    /**

     * Expresses the convention when stereo audio samples are stored interleaved

media/aidl/android/media/audio/common/AudioConfig.aidl

+1 −1

File changed.

Contains only whitespace changes.

media/aidl/android/media/audio/common/AudioConfigBase.aidl

+1 −1

File changed.

Contains only whitespace changes.

media/aidl/android/media/audio/common/AudioFormatDescription.aidl

+1 −1

File changed.

Contains only whitespace changes.

media/aidl/android/media/audio/common/AudioOffloadInfo.aidl

+1 −1

File changed.

Contains only whitespace changes.