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

Commit 6da2c5a8 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "audio: add device constants for HDMI EARC" into sc-dev

parents 19bd4526 01a686b6

services/audiopolicy/common/include/policy.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -226,6 +226,8 @@ static inline audio_devices_t apm_extract_one_audio_device( 
            return AUDIO_DEVICE_OUT_SPEAKER_SAFE;

            return AUDIO_DEVICE_OUT_SPEAKER_SAFE;

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_HDMI_ARC) != 0) {

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_HDMI_ARC) != 0) {

            return AUDIO_DEVICE_OUT_HDMI_ARC;

            return AUDIO_DEVICE_OUT_HDMI_ARC;

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_HDMI_EARC) != 0) {

            return AUDIO_DEVICE_OUT_HDMI_EARC;

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_AUX_LINE) != 0) {

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_AUX_LINE) != 0) {

            return AUDIO_DEVICE_OUT_AUX_LINE;

            return AUDIO_DEVICE_OUT_AUX_LINE;

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_SPDIF) != 0) {

        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_SPDIF) != 0) {

services/audiopolicy/enginedefault/src/Engine.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ void Engine::filterOutputDevicesForStrategy(legacy_strategy strategy, 
            if (desc->isActive() && !audio_is_linear_pcm(desc->getFormat())) {

            if (desc->isActive() && !audio_is_linear_pcm(desc->getFormat())) {

                availableOutputDevices.remove(desc->devices().getDevicesFromTypes({

                availableOutputDevices.remove(desc->devices().getDevicesFromTypes({

                        AUDIO_DEVICE_OUT_HDMI, AUDIO_DEVICE_OUT_SPDIF,

                        AUDIO_DEVICE_OUT_HDMI, AUDIO_DEVICE_OUT_SPDIF,

                        AUDIO_DEVICE_OUT_HDMI_ARC}));

                        AUDIO_DEVICE_OUT_HDMI_ARC, AUDIO_DEVICE_OUT_HDMI_EARC}));

            }

            }

        }

        }

        } break;

        } break;
@@ -366,7 +366,9 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
        if (strategy == STRATEGY_MEDIA) {

        if (strategy == STRATEGY_MEDIA) {

            // ARC, SPDIF and AUX_LINE can co-exist with others.

            // ARC, SPDIF and AUX_LINE can co-exist with others.

            devices3 = availableOutputDevices.getDevicesFromTypes({

            devices3 = availableOutputDevices.getDevicesFromTypes({

                    AUDIO_DEVICE_OUT_HDMI_ARC, AUDIO_DEVICE_OUT_SPDIF, AUDIO_DEVICE_OUT_AUX_LINE});

                    AUDIO_DEVICE_OUT_HDMI_ARC, AUDIO_DEVICE_OUT_HDMI_EARC,

                    AUDIO_DEVICE_OUT_SPDIF, AUDIO_DEVICE_OUT_AUX_LINE,

                    });

        }

        }





        devices2.add(devices3);

        devices2.add(devices3);

services/mediametrics/AudioTypes.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ const std::unordered_map<std::string, int64_t>& getAudioDeviceInMap() { 
        {"AUDIO_DEVICE_IN_DEFAULT",                1LL << 28},

        {"AUDIO_DEVICE_IN_DEFAULT",                1LL << 28},

        // R values above.

        // R values above.

        {"AUDIO_DEVICE_IN_BLE_HEADSET",            1LL << 29},

        {"AUDIO_DEVICE_IN_BLE_HEADSET",            1LL << 29},

        {"AUDIO_DEVICE_IN_HDMI_EARC",              1LL << 30},

    };

    };

    return map;

    return map;

}

}
@@ -123,7 +124,8 @@ const std::unordered_map<std::string, int64_t>& getAudioDeviceOutMap() { 
        {"AUDIO_DEVICE_OUT_DEFAULT",                   1LL << 30},

        {"AUDIO_DEVICE_OUT_DEFAULT",                   1LL << 30},

        // R values above.

        // R values above.

        {"AUDIO_DEVICE_OUT_BLE_HEADSET",               1LL << 31},

        {"AUDIO_DEVICE_OUT_BLE_HEADSET",               1LL << 31},

        {"AUDIO_DEVICE_OUT_BLE_SPAEKER",               1LL << 32},

        {"AUDIO_DEVICE_OUT_BLE_SPEAKER",               1LL << 32},

        {"AUDIO_DEVICE_OUT_HDMI_EARC",                 1LL << 33},

    };

    };

    return map;

    return map;

}

}