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

Commit ce8b2734 authored by Dean Wheatley's avatar Dean Wheatley Committed by Mikhail Naganov
Browse files

Add 5.1.2, 5.1.4, 7.1.2, 7.1.4 output channel masks 

They were supposed to be added by the change with id
I2f488462614114e4c82149460b030585981ae15e
but actually were not.

Also, rename OUT_TOP_CENTER_... to OUT_TOP_SIDE_...
according to Dean's suggestion.

Bug: 38184704
Bug: 63901775
Test: make
Change-Id: Ib263b06e4f3aa84525c2255f7a52f9bb39dbebcd
parent 4f0aaea3

audio/common/4.0/types.hal

+14 −6
Original line number Original line Diff line number Diff line
@@ -373,21 +373,21 @@ enum AudioChannelMask : uint32_t { 
    OUT_TOP_BACK_LEFT         = 0x8000,

    OUT_TOP_BACK_LEFT         = 0x8000,

    OUT_TOP_BACK_CENTER       = 0x10000,

    OUT_TOP_BACK_CENTER       = 0x10000,

    OUT_TOP_BACK_RIGHT        = 0x20000,

    OUT_TOP_BACK_RIGHT        = 0x20000,

    OUT_TOP_CENTER_LEFT       = 0x40000,

    OUT_TOP_SIDE_LEFT         = 0x40000,

    OUT_TOP_CENTER_RIGHT      = 0x80000,

    OUT_TOP_SIDE_RIGHT        = 0x80000,





    OUT_MONO     = OUT_FRONT_LEFT,

    OUT_MONO     = OUT_FRONT_LEFT,

    OUT_STEREO   = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT),

    OUT_STEREO   = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT),

    OUT_2POINT1  = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_LOW_FREQUENCY),

    OUT_2POINT1  = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_LOW_FREQUENCY),

    OUT_2POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

    OUT_2POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT),

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_2POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

    OUT_2POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT |

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                         OUT_LOW_FREQUENCY),

                         OUT_LOW_FREQUENCY),

    OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

    OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT),

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_3POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

    OUT_3POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

                        OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT |

                        OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                        OUT_LOW_FREQUENCY),

                        OUT_LOW_FREQUENCY),

    OUT_QUAD     = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

    OUT_QUAD     = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_BACK_LEFT | OUT_BACK_RIGHT),

            OUT_BACK_LEFT | OUT_BACK_RIGHT),
@@ -406,6 +406,10 @@ enum AudioChannelMask : uint32_t { 
    OUT_5POINT1_SIDE = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

    OUT_5POINT1_SIDE = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

    OUT_5POINT1POINT2  = (OUT_5POINT1 | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_5POINT1POINT4  = (OUT_5POINT1 |

            OUT_TOP_FRONT_LEFT | OUT_TOP_FRONT_RIGHT |

            OUT_TOP_BACK_LEFT | OUT_TOP_BACK_RIGHT),

    OUT_6POINT1 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

    OUT_6POINT1 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |
@@ -415,6 +419,10 @@ enum AudioChannelMask : uint32_t { 
            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

    OUT_7POINT1POINT2  = (OUT_7POINT1 | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_7POINT1POINT4  = (OUT_7POINT1 |

            OUT_TOP_FRONT_LEFT | OUT_TOP_FRONT_RIGHT |

            OUT_TOP_BACK_LEFT | OUT_TOP_BACK_RIGHT),

    // Note that the 2.0 OUT_ALL* have been moved to helper functions

    // Note that the 2.0 OUT_ALL* have been moved to helper functions





    /* These are bits only, not complete values */

    /* These are bits only, not complete values */

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -268,7 +268,7 @@ d5de64e66b95f135dd42492250a309134b8227203ef3524440798c66b6f5a392 android.hardwar 
888ac906461327fa0bd93854d5109be8c292a33afdb467164826970a8bd5b789 android.hardware.audio@4.0::IStreamOut

888ac906461327fa0bd93854d5109be8c292a33afdb467164826970a8bd5b789 android.hardware.audio@4.0::IStreamOut

15f6ae78e73344c8e7d68847ef03caec64fcd9f951bbcf59957d1712c247fcff android.hardware.audio@4.0::IStreamOutCallback

15f6ae78e73344c8e7d68847ef03caec64fcd9f951bbcf59957d1712c247fcff android.hardware.audio@4.0::IStreamOutCallback

e8abfc73b7f3c2095ea4fad83b5f42bced4315de2abcc3199376af880dac451b android.hardware.audio@4.0::types

e8abfc73b7f3c2095ea4fad83b5f42bced4315de2abcc3199376af880dac451b android.hardware.audio@4.0::types

dac6018ece5af342708766287a2de2e7f3bd7e60f373dc2dddc4d4d1554e1b35 android.hardware.audio.common@4.0::types

5d47a2ad2c136b8aba067dd45bb10d0ad390dd76340764154f580658f98f4fe6 android.hardware.audio.common@4.0::types

b04b6b364938b80008e61fa2e318bc299622433e57c2e1f6cfba332a3f6e3f15 android.hardware.audio.effect@4.0::IAcousticEchoCancelerEffect

b04b6b364938b80008e61fa2e318bc299622433e57c2e1f6cfba332a3f6e3f15 android.hardware.audio.effect@4.0::IAcousticEchoCancelerEffect

1c17d4ece5c8ba3f7a646a305ee0dd109b0d51372e1bd585812e513cd40e1852 android.hardware.audio.effect@4.0::IAutomaticGainControlEffect

1c17d4ece5c8ba3f7a646a305ee0dd109b0d51372e1bd585812e513cd40e1852 android.hardware.audio.effect@4.0::IAutomaticGainControlEffect

34174259fe6fbb1bb14e7103e097f2f25529271a676687845b2f55d6d0d9d617 android.hardware.audio.effect@4.0::IBassBoostEffect

34174259fe6fbb1bb14e7103e097f2f25529271a676687845b2f55d6d0d9d617 android.hardware.audio.effect@4.0::IBassBoostEffect