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

Commit bfa4664c authored by Dorin Drimus's avatar Dorin Drimus Committed by Gerrit Code Review
Browse files

Merge "Group additional DTS encodings under the surround sound settings"

parents bd526c26 b9cf377c

media/libaudioclient/AidlConversion.cpp

+9 −3
Original line number Diff line number Diff line
@@ -839,6 +839,15 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
        {

            AUDIO_FORMAT_DTS_HD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_HD)

        },

        {

            AUDIO_FORMAT_DTS_HD_MA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_HD_MA)

        },

        {

            AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD_P1)

        },

        {

            AUDIO_FORMAT_DTS_UHD_P2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD_P2)

        },

        // In the future, we would like to represent encapsulated bitstreams as

        // nested AudioFormatDescriptions. The legacy 'AUDIO_FORMAT_IEC61937' type doesn't

        // specify the format of the encapsulated bitstream.
@@ -1033,9 +1042,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_IEC60958,

            make_AudioFormatDescription(PcmType::INT_24_BIT, MEDIA_MIMETYPE_AUDIO_IEC60958)

        },

        {

            AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD)

        },

        {

            AUDIO_FORMAT_DRA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DRA)

        },

media/module/foundation/MediaDefs.cpp

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ const char *MEDIA_MIMETYPE_AUDIO_MS_ADPCM = "audio/x-adpcm-ms"; 
const char *MEDIA_MIMETYPE_AUDIO_DVI_IMA_ADPCM = "audio/x-adpcm-dvi-ima";

const char *MEDIA_MIMETYPE_AUDIO_DTS = "audio/vnd.dts";

const char *MEDIA_MIMETYPE_AUDIO_DTS_HD = "audio/vnd.dts.hd";

const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD = "audio/vnd.dts.uhd";

const char *MEDIA_MIMETYPE_AUDIO_DTS_HD_MA = "audio/vnd.dts.hd;profile=dtsma";

const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD_P1 = "audio/vnd.dts.uhd;profile=p1";

const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD_P2 = "audio/vnd.dts.uhd;profile=p2";

const char *MEDIA_MIMETYPE_AUDIO_EVRC = "audio/evrc";

const char *MEDIA_MIMETYPE_AUDIO_EVRCB = "audio/evrcb";

const char *MEDIA_MIMETYPE_AUDIO_EVRCWB = "audio/evrcwb";

media/module/foundation/include/media/stagefright/foundation/MediaDefs.h

+3 −1
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ extern const char *MEDIA_MIMETYPE_AUDIO_MS_ADPCM; 
extern const char *MEDIA_MIMETYPE_AUDIO_DVI_IMA_ADPCM;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS_HD;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS_HD_MA;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD_P1;

extern const char *MEDIA_MIMETYPE_AUDIO_DTS_UHD_P2;

extern const char *MEDIA_MIMETYPE_AUDIO_EVRC;

extern const char *MEDIA_MIMETYPE_AUDIO_EVRCB;

extern const char *MEDIA_MIMETYPE_AUDIO_EVRCWB;

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ public: 
            {AUDIO_FORMAT_AC3, {}},

            {AUDIO_FORMAT_E_AC3, {}},

            {AUDIO_FORMAT_DTS, {}},

            {AUDIO_FORMAT_DTS_HD, {}},

            {AUDIO_FORMAT_DTS_HD, {AUDIO_FORMAT_DTS_HD_MA}},

            {AUDIO_FORMAT_DTS_UHD, {AUDIO_FORMAT_DTS_UHD_P2}},

            {AUDIO_FORMAT_AAC_LC, {

                    AUDIO_FORMAT_AAC_HE_V1, AUDIO_FORMAT_AAC_HE_V2, AUDIO_FORMAT_AAC_ELD,

                    AUDIO_FORMAT_AAC_XHE}},