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

Commit 1aaaf86b authored by Ben Romberger's avatar Ben Romberger Committed by Gerrit - the friendly Code Review server
Browse files

hal: Add support for TrueHD HDMI pass-through 

Add TrueHD format for apq8098 compress pass-through.

Change-Id: Ica0e11aee535c6f7e21c26ab391e5e7bb71c6b02
parent 28718c54

hal/audio_extn/passthru.c

+5 −9
Original line number Diff line number Diff line 
/*

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

* Copyright (c) 2014-2017, 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
@@ -46,7 +46,8 @@ static const audio_format_t audio_passthru_formats[] = { 
    AUDIO_FORMAT_E_AC3,

    AUDIO_FORMAT_E_AC3_JOC,

    AUDIO_FORMAT_DTS,

    AUDIO_FORMAT_DTS_HD

    AUDIO_FORMAT_DTS_HD,

    AUDIO_FORMAT_DOLBY_TRUEHD

};



/*
@@ -216,6 +217,8 @@ bool audio_extn_passthru_is_passt_supported(struct audio_device *adev, 
    bool passt = false;

    switch (out->format) {

    case AUDIO_FORMAT_E_AC3:

    case AUDIO_FORMAT_DTS_HD:

    case AUDIO_FORMAT_DOLBY_TRUEHD:

        if (platform_is_edid_supported_format(adev->platform, out->format)) {

            ALOGV("%s:PASSTHROUGH supported for format %x",

                   __func__, out->format);
@@ -249,13 +252,6 @@ bool audio_extn_passthru_is_passt_supported(struct audio_device *adev, 
            passt = true;

        }

        break;

    case AUDIO_FORMAT_DTS_HD:

        if (platform_is_edid_supported_format(adev->platform, out->format)) {

            ALOGV("%s:PASSTHROUGH supported for format %x",

                   __func__, out->format);

            passt = true;

        }

        break;

    default:

        ALOGV("%s:Passthrough not supported", __func__);

    }

hal/audio_extn/qaf.c

+2 −1
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ static bool audio_extn_qaf_passthrough_enabled(struct stream_out *out) 
                case AUDIO_FORMAT_AC3:

                case AUDIO_FORMAT_E_AC3:

                case AUDIO_FORMAT_DTS:

                case AUDIO_FORMAT_DTS_HD: {

                case AUDIO_FORMAT_DTS_HD:

                case AUDIO_FORMAT_DOLBY_TRUEHD: {

                    is_enabled = true;

                    break;

                }

hal/audio_extn/utils.c

+10 −1
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ 
#define BASE_TABLE_SIZE 64

#define MAX_BASEINDEX_LEN 256



#ifndef SND_AUDIOCODEC_TRUEHD

#define SND_AUDIOCODEC_TRUEHD 0x00000023

#endif



#ifdef AUDIO_EXTERNAL_HDMI_ENABLED

#define PROFESSIONAL        (1<<0)      /* 0 = consumer, 1 = professional */

#define NON_LPCM            (1<<1)      /* 0 = audio, 1 = non-audio */
@@ -130,6 +134,7 @@ const struct string_to_enum s_format_name_to_enum_table[] = { 
    STRING_TO_ENUM(AUDIO_FORMAT_E_AC3),

    STRING_TO_ENUM(AUDIO_FORMAT_DTS),

    STRING_TO_ENUM(AUDIO_FORMAT_DTS_HD),

    STRING_TO_ENUM(AUDIO_FORMAT_DOLBY_TRUEHD),

#ifdef AUDIO_EXTN_FORMATS_ENABLED

    STRING_TO_ENUM(AUDIO_FORMAT_E_AC3_JOC),

    STRING_TO_ENUM(AUDIO_FORMAT_WMA),
@@ -900,7 +905,8 @@ static int send_app_type_cfg_for_device(struct audio_device *adev, 
        app_type_cfg[len++] = app_type;

        app_type_cfg[len++] = acdb_dev_id;

        if (((usecase->stream.out->format == AUDIO_FORMAT_E_AC3) ||

            (usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC))

            (usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC) ||

            (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD))

            && audio_extn_passthru_is_passthrough_stream(usecase->stream.out)) {

            app_type_cfg[len++] = sample_rate * 4;

        } else {
@@ -1246,6 +1252,9 @@ int get_snd_codec_id(audio_format_t format) 
    case AUDIO_FORMAT_DTS_HD:

        id = SND_AUDIOCODEC_DTS;

        break;

    case AUDIO_FORMAT_DOLBY_TRUEHD:

        id = SND_AUDIOCODEC_TRUEHD;

        break;

    case AUDIO_FORMAT_DSD:

        id = SND_AUDIOCODEC_DSD;

        break;

hal/audio_hw.c

+7 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static const struct string_to_enum out_formats_name_to_enum_table[] = { 
    STRING_TO_ENUM(AUDIO_FORMAT_AC3),

    STRING_TO_ENUM(AUDIO_FORMAT_E_AC3),

    STRING_TO_ENUM(AUDIO_FORMAT_E_AC3_JOC),

    STRING_TO_ENUM(AUDIO_FORMAT_DOLBY_TRUEHD),

    STRING_TO_ENUM(AUDIO_FORMAT_DTS),

    STRING_TO_ENUM(AUDIO_FORMAT_DTS_HD),

};
@@ -511,6 +512,7 @@ static bool is_supported_format(audio_format_t format) 
        format == AUDIO_FORMAT_PCM_16_BIT ||

        format == AUDIO_FORMAT_AC3 ||

        format == AUDIO_FORMAT_E_AC3 ||

        format == AUDIO_FORMAT_DOLBY_TRUEHD ||

        format == AUDIO_FORMAT_DTS ||

        format == AUDIO_FORMAT_DTS_HD ||

        format == AUDIO_FORMAT_FLAC ||
@@ -1313,6 +1315,11 @@ static int read_hdmi_sink_caps(struct stream_out *out) 
        out->supported_formats[i++] = AUDIO_FORMAT_E_AC3_JOC;

    }



    if (platform_is_edid_supported_format(out->dev->platform, AUDIO_FORMAT_DOLBY_TRUEHD)) {

        ALOGV(":%s HDMI supports TRUE HD format", __func__);

        out->supported_formats[i++] = AUDIO_FORMAT_DOLBY_TRUEHD;

    }



    if (platform_is_edid_supported_format(out->dev->platform, AUDIO_FORMAT_DTS)) {

        ALOGV(":%s HDMI supports DTS format", __func__);

        out->supported_formats[i++] = AUDIO_FORMAT_DTS;

hal/msm8916/platform.c

+15 −3
Original line number Diff line number Diff line
@@ -5457,12 +5457,20 @@ static void platform_check_hdmi_backend_cfg(struct audio_device* adev, 
            channels = max_supported_channels;



    } else {

        /*During pass through set default bit width and channels*/

        /*During pass through set default bit width */

        if (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD)

            channels = 8;

        else

            channels = DEFAULT_HDMI_OUT_CHANNELS;



        if ((usecase->stream.out->format == AUDIO_FORMAT_E_AC3) ||

            (usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC))

            (usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC) ||

            (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD))

            sample_rate = sample_rate * 4 ;



        if (!edid_is_supported_sr(edid_info, sample_rate))

                sample_rate = edid_get_highest_supported_sr(edid_info);



        bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;

        /* We force route so that the BE format can be set to Compr */

    }
@@ -6301,6 +6309,10 @@ unsigned char platform_map_to_edid_format(int audio_format) 
        ALOGV("%s:E_AC3", __func__);

        format = DOLBY_DIGITAL_PLUS;

        break;

    case AUDIO_FORMAT_DOLBY_TRUEHD:

        ALOGV("%s:MAT", __func__);

        format = MAT;

        break;

    case AUDIO_FORMAT_DTS:

        ALOGV("%s:DTS", __func__);

        format = DTS;