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

Commit 1229ae83 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 

am: f517d276

Change-Id: I9e210b1d143b01301c798dfe705a7493cc828be5
parents fa6c8ebc f517d276

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
@@ -132,6 +132,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),

};