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

Commit f517d276 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge \"Add Dolby TrueHD audio format\" into nyc-mr1-dev 

am: 5cc2e814

Change-Id: Ib3561d806b00c949789f463c4609844399bb7095
parents 55943ae6 5cc2e814

services/audioflinger/AudioFlinger.cpp

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ const char *formatToString(audio_format_t format) { 
    case AUDIO_FORMAT_AC3: return "ac-3";

    case AUDIO_FORMAT_E_AC3: return "e-ac-3";

    case AUDIO_FORMAT_IEC61937: return "iec61937";

    case AUDIO_FORMAT_DTS: return "dts";

    case AUDIO_FORMAT_DTS_HD: return "dts-hd";

    case AUDIO_FORMAT_DOLBY_TRUEHD: return "dolby-truehd";

    default:

        break;

    }

services/audiopolicy/common/managerdefinitions/src/TypeConverter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS_HD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_IEC61937),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DOLBY_TRUEHD),

};

template<>

const size_t FormatConverter::mSize = sizeof(FormatConverter::mTable) /