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

Commit 7f80e86a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: update system property names with vendor prefix."

parents 8ff4db57 37e7c483

hal/audio_extn/hw_loopback.c

+2 −2
Original line number Diff line number Diff line 
/*

* Copyright (c) 2017, The Linux Foundation. All rights reserved.

* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

*

* Redistribution and use in source and binary forms, with or without

* modification, are permitted provided that the following conditions are
@@ -491,7 +491,7 @@ int create_loopback_session(loopback_patch_t *active_loopback_patch) 


    /* Do not alter the location of sending latency mode property */

    /* Mode set on any stream but before both streams are open */

    if(property_get("audio.transcode.latency.mode", prop_value, "")) {

    if(property_get("vendor.audio.transcode.latency.mode", prop_value, "")) {

        uint32_t latency_mode = atoi(prop_value);

        transcode_loopback_util_set_latency_mode(active_loopback_patch,

                                                 latency_mode);

hal/audio_extn/keep_alive.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void audio_extn_keep_alive_init(struct audio_device *adev) 
    ka.userdata = adev;

    ka.state = STATE_IDLE;

    ka.pcm = NULL;

    if (property_get_bool("audio.keep_alive.disabled", false)) {

    if (property_get_bool("vendor.audio.keep_alive.disabled", false)) {

        ALOGE("keep alive disabled");

        ka.state = STATE_DISABLED;

        return;

hal/audio_extn/passthru.c

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ int audio_extn_passthru_get_buffer_size(audio_offload_info_t* info) 


    if (((info->format == AUDIO_FORMAT_DOLBY_TRUEHD) ||

            (info->format == AUDIO_FORMAT_IEC61937)) &&

            property_get("audio.truehd.buffer.size.kb", value, "") &&

            property_get("vendor.audio.truehd.buffer.size.kb", value, "") &&

            atoi(value)) {

        fragment_size = atoi(value) * 1024;

        goto done;
@@ -520,7 +520,7 @@ int audio_extn_passthru_get_buffer_size(audio_offload_info_t* info) 
        goto done;

    } else if (info->format == AUDIO_FORMAT_E_AC3) {

        fragment_size = DDP_COMPRESS_PASSTHROUGH_FRAGMENT_SIZE;

        if(property_get("audio.ddp.buffer.size.kb", value, "") &&

        if(property_get("vendor.audio.ddp.buffer.size.kb", value, "") &&

                atoi(value)) {

            fragment_size = atoi(value) * 1024;

        }

hal/audio_extn/qaf.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are
@@ -3046,7 +3046,7 @@ int audio_extn_qaf_init(struct audio_device *adev) 
        DEBUG_MSG("DLOPEN successful for %s", lib_name);

#endif

        } else if (i == DTS_M8) {

            property_get("audio.qaf.m8.library", value, NULL);

            property_get("vendor.audio.qaf.m8.library", value, NULL);

            snprintf(lib_name, PROPERTY_VALUE_MAX, "%s", value);

            qaf_mod->qaf_lib = dlopen(lib_name, RTLD_NOW);

            if (qaf_mod->qaf_lib == NULL) {

hal/audio_hw.c

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -5625,7 +5625,7 @@ int adev_open_output_stream(struct audio_hw_device *dev, 
    out->dynamic_pm_qos_config_supported = 0;



    if ((flags & AUDIO_OUTPUT_FLAG_BD) &&

        (property_get_bool("audio.matrix.limiter.enable", false)))

        (property_get_bool("vendor.audio.matrix.limiter.enable", false)))

        platform_set_device_params(out, DEVICE_PARAM_LIMITER_ID, 1);



    if (audio_is_linear_pcm(out->format) &&