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

Commit ce6f1cf4 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Fix and enhance channel mask enums 

Add AUDIO_CHANNEL_INDEX_MASK_{9..24}

Fix channel order for AUDIO_CHANNEL_OUT_3POINT{0,1}POINT2

Bug: 126455009
Test: make
Change-Id: I36a89c9903ad1702c5c0bdb0632c3f3234bb75d7
parent c5524a61

audio/common/5.0/types.hal

+19 −3
Original line number Diff line number Diff line
@@ -416,9 +416,9 @@ enum AudioChannelMask : uint32_t { 
    OUT_2POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                         OUT_LOW_FREQUENCY),

    OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

    OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_FRONT_CENTER |

                         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_RIGHT | OUT_FRONT_CENTER |

                        OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                        OUT_LOW_FREQUENCY),

    OUT_QUAD     = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |
@@ -517,7 +517,23 @@ enum AudioChannelMask : uint32_t { 
    INDEX_MASK_5 = INDEX_HDR | ((1 << 5) - 1),

    INDEX_MASK_6 = INDEX_HDR | ((1 << 6) - 1),

    INDEX_MASK_7 = INDEX_HDR | ((1 << 7) - 1),

    INDEX_MASK_8 = INDEX_HDR | ((1 << 8) - 1)

    INDEX_MASK_8 = INDEX_HDR | ((1 << 8) - 1),

    INDEX_MASK_9 = INDEX_HDR | ((1 << 9) - 1),

    INDEX_MASK_10 = INDEX_HDR | ((1 << 10) - 1),

    INDEX_MASK_11 = INDEX_HDR | ((1 << 11) - 1),

    INDEX_MASK_12 = INDEX_HDR | ((1 << 12) - 1),

    INDEX_MASK_13 = INDEX_HDR | ((1 << 13) - 1),

    INDEX_MASK_14 = INDEX_HDR | ((1 << 14) - 1),

    INDEX_MASK_15 = INDEX_HDR | ((1 << 15) - 1),

    INDEX_MASK_16 = INDEX_HDR | ((1 << 16) - 1),

    INDEX_MASK_17 = INDEX_HDR | ((1 << 17) - 1),

    INDEX_MASK_18 = INDEX_HDR | ((1 << 18) - 1),

    INDEX_MASK_19 = INDEX_HDR | ((1 << 19) - 1),

    INDEX_MASK_20 = INDEX_HDR | ((1 << 20) - 1),

    INDEX_MASK_21 = INDEX_HDR | ((1 << 21) - 1),

    INDEX_MASK_22 = INDEX_HDR | ((1 << 22) - 1),

    INDEX_MASK_23 = INDEX_HDR | ((1 << 23) - 1),

    INDEX_MASK_24 = INDEX_HDR | ((1 << 24) - 1),

};



/**

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ e05e48c583de14c1e5a6fa9d48ea50244e3e0924b76b342374e7471dc8007ba9 android.hardwar 
9471b12b1c255bb530695720bc4174bd74987b75b1f820854af8944bc8c215c9 android.hardware.audio@5.0::IStreamOut

1b0500367ed2b32a841667ac3200edf3d3a164e8004aca445ff1b085ac831e93 android.hardware.audio@5.0::IStreamOutCallback

83e365479cc77d8717c155e1787ee668cd2ae4c557b467cf75b8e7cd53697ad8 android.hardware.audio@5.0::types

894af04bebfe7da5b6791eefeb6eb3627da63d5efea735f16876d11d8ca4f61d android.hardware.audio.common@5.0::types

c25ae57a9197fdf83aa6f7b31ab1ac4922dea4f19f92cdb1f9013ad49fa56594 android.hardware.audio.common@5.0::types

f269297866765b95ddd1825676cc8a772f0c7c9863286df596fc302781a42ff5 android.hardware.audio.effect@5.0::IAcousticEchoCancelerEffect

fa187b602d8939644ef708ed7627f2e3deac97899a4bda1de07f2ff126abe243 android.hardware.audio.effect@5.0::IAutomaticGainControlEffect

e1bf864ccb8458c0da1dcc74a2e748b1dca8ac360df590591cf82d98292d7981 android.hardware.audio.effect@5.0::IBassBoostEffect