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

Commit 32eb3002 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 90d379ce on remote branch 

Change-Id: I26f853b601b3b9af23fa89c13c5f6b6c10618753
parents ac8065e9 90d379ce

hal/audio_extn/a2dp.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -187,6 +187,8 @@ int channel_map_array[] = { PCM_CHANNEL_L, PCM_CHANNEL_R, PCM_CHANNEL_C, PCM_CHA 
static void *vndk_fwk_lib_handle = NULL;

static void *vndk_fwk_lib_handle = NULL;

static int is_running_with_enhanced_fwk = UNINITIALIZED;

static int is_running_with_enhanced_fwk = UNINITIALIZED;





static char g_audio_framework[PROPERTY_VALUE_MAX];



typedef int (*vndk_fwk_isVendorEnhancedFwk_t)(void);

typedef int (*vndk_fwk_isVendorEnhancedFwk_t)(void);

static vndk_fwk_isVendorEnhancedFwk_t vndk_fwk_isVendorEnhancedFwk;

static vndk_fwk_isVendorEnhancedFwk_t vndk_fwk_isVendorEnhancedFwk;
@@ -935,9 +937,16 @@ typedef struct { 
static void update_offload_codec_capabilities()

static void update_offload_codec_capabilities()

{

{





    property_get("ro.boot.audio", g_audio_framework, NULL);



    if (strstr(g_audio_framework, "audioreach") != NULL) {

        a2dp.is_a2dp_offload_supported =

        a2dp.is_a2dp_offload_supported =

            property_get_bool(SYSPROP_A2DP_OFFLOAD_SUPPORTED, false) &&

            property_get_bool(SYSPROP_A2DP_OFFLOAD_SUPPORTED, false) &&

            !property_get_bool(SYSPROP_A2DP_OFFLOAD_DISABLED, false);

            !property_get_bool(SYSPROP_A2DP_OFFLOAD_DISABLED, false);

    } else {

        /*For Elite audio framework */

        a2dp.is_a2dp_offload_supported = true;

    }





    ALOGD("%s: A2DP offload supported = %d",__func__,

    ALOGD("%s: A2DP offload supported = %d",__func__,

          a2dp.is_a2dp_offload_supported);

          a2dp.is_a2dp_offload_supported);

post_proc/equalizer.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,11 @@ 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * limitations under the License.

 *

 * Changes from Qualcomm Innovation Center, Inc. are provided under the following license:

 * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * SPDX-License-Identifier: BSD-3-Clause-Clear

 *

 */

 */





#define LOG_TAG "offload_effect_equalizer"

#define LOG_TAG "offload_effect_equalizer"
@@ -425,7 +430,7 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p, 
        equalizer_set_preset(eq_ctxt, preset);

        equalizer_set_preset(eq_ctxt, preset);

        break;

        break;

    case EQ_PARAM_BAND_LEVEL:

    case EQ_PARAM_BAND_LEVEL:

        if (vsize < sizeof(int16_t)) {

        if (vsize < sizeof(int32_t)) {

            p->status = -EINVAL;

            p->status = -EINVAL;

            break;

            break;

        }

        }