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

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

Merge "hal: Enable logs for EDID messages."

parents 308c5896 957440f1

hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_EDID)),true)

    LOCAL_SRC_FILES += edid.c

    LOCAL_CFLAGS := -DHDMI_EDID_ENABLED

    LOCAL_CFLAGS += -DHDMI_EDID

endif



ifeq ($(strip $(AUDIO_USE_LL_AS_PRIMARY_OUTPUT)),true)

hal/edid.c

+2 −2
Original line number Diff line number Diff line
@@ -662,12 +662,12 @@ bool edid_get_sink_caps(edid_audio_info* info, char *edid_data) 
        ALOGV("AUDIO DESC BLOCK # %d\n",i);



        info->audio_blocks_array[i].channels = channels[i];

        ALOGV("info->audio_blocks_array[i].channels %d\n",

        ALOGD("info->audio_blocks_array[i].channels %d\n",

              info->audio_blocks_array[i].channels);



        ALOGV("Format Byte %d\n", formats[i]);

        info->audio_blocks_array[i].format_id = (edid_audio_format_id)formats[i];

        ALOGV("info->audio_blocks_array[i].format_id %s",

        ALOGD("info->audio_blocks_array[i].format_id %s",

              edid_format_to_str(formats[i]));



        ALOGV("Frequency Byte %d\n", frequency[i]);

hal/edid.h

+5 −0
Original line number Diff line number Diff line
@@ -92,5 +92,10 @@ typedef struct edid_audio_info { 
    int  channel_allocation;

} edid_audio_info;





#ifndef HDMI_EDID

#define edid_get_sink_caps(info, edid_data) (0)

#else

bool edid_get_sink_caps(edid_audio_info* info, char *edid_data);

#endif

#endif /* EDID_H */

hal/msm8916/platform.c

+0 −2
Original line number Diff line number Diff line
@@ -4211,12 +4211,10 @@ int platform_get_edid_info(void *platform) 
    edid_data[0] = count;

    memcpy(&edid_data[1], block, count);



#ifdef HDMI_EDID_ENABLED

    if (!edid_get_sink_caps(info, edid_data)) {

        ALOGE("%s: Failed to get HDMI sink capabilities", __func__);

        goto fail;

    }

#endif



    my_data->edid_valid = true;

    return 0;