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

Commit cadd5bb7 authored by Jungshik Jang's avatar Jungshik Jang
Browse files

Add force usage and config type for HDMI-CEC system audio mode. 

New Usage Type: AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO
New Config Type: AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED
When HDMI-CEC system audio mode is enabled, AudioService will
call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED);
in order to notify enabled system audio mode, so that
audio policy manager chooses proper output.
When it turns into off, AudioService will call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_NONE);

Along with it, add new audio output devic type,
AUDIO_DEVICE_OUT_AUX_LINE, in order to distinguish
line out for headphone and aux output of av device.

Bug: 16305986
Bug: 16002150
Change-Id: Idecdf626737f6635ea3cda638c343260b1661c77
parent e9f7361e

include/system/audio.h

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,8 @@ enum { 
    AUDIO_DEVICE_OUT_SPDIF                     = 0x80000,

    /* FM transmitter out */

    AUDIO_DEVICE_OUT_FM                        = 0x100000,

    /* Line out for av devices */

    AUDIO_DEVICE_OUT_AUX_LINE                  = 0x200000,

    AUDIO_DEVICE_OUT_DEFAULT                   = AUDIO_DEVICE_BIT_DEFAULT,

    AUDIO_DEVICE_OUT_ALL      = (AUDIO_DEVICE_OUT_EARPIECE |

                                 AUDIO_DEVICE_OUT_SPEAKER |
@@ -597,6 +599,7 @@ enum { 
                                 AUDIO_DEVICE_OUT_HDMI_ARC |

                                 AUDIO_DEVICE_OUT_SPDIF |

                                 AUDIO_DEVICE_OUT_FM |

                                 AUDIO_DEVICE_OUT_AUX_LINE |

                                 AUDIO_DEVICE_OUT_DEFAULT),

    AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP |

                                 AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

include/system/audio_policy.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ typedef enum { 
    AUDIO_POLICY_FORCE_DIGITAL_DOCK,

    AUDIO_POLICY_FORCE_NO_BT_A2DP, /* A2DP sink is not preferred to speaker or wired HS */

    AUDIO_POLICY_FORCE_SYSTEM_ENFORCED,

    AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED,



    AUDIO_POLICY_FORCE_CFG_CNT,

    AUDIO_POLICY_FORCE_CFG_MAX = AUDIO_POLICY_FORCE_CFG_CNT - 1,
@@ -58,6 +59,7 @@ typedef enum { 
    AUDIO_POLICY_FORCE_FOR_RECORD,

    AUDIO_POLICY_FORCE_FOR_DOCK,

    AUDIO_POLICY_FORCE_FOR_SYSTEM,

    AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,



    AUDIO_POLICY_FORCE_USE_CNT,

    AUDIO_POLICY_FORCE_USE_MAX = AUDIO_POLICY_FORCE_USE_CNT - 1,