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

Commit ba79fb99 authored by Haofan Wang's avatar Haofan Wang Committed by Android (Google) Code Review
Browse files

Merge "Handle Dolby vision and DTS Virtual X for sound parameters" into main

parents 613d31be 76e6522b

services/core/java/com/android/server/media/quality/MediaQualityUtils.java

+88 −86
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ public final class MediaQualityUtils { 
            }

            params.remove(SoundQuality.PARAMETER_DIALOGUE_ENHANCER);

        }



        if (params.containsKey(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING)) {

            DolbyAudioProcessing dab = new DolbyAudioProcessing();

            if (params.containsKey(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_SOUND_MODE)) {

                String dolbySoundModeString = params.getString(
@@ -1385,8 +1385,8 @@ public final class MediaQualityUtils { 
                params.remove(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_SOUND_MODE);

            }

            if (params.containsKey(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_VOLUME_LEVELER)) {

            dab.volumeLeveler =

                    params.getBoolean(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_VOLUME_LEVELER);

                dab.volumeLeveler = params

                        .getBoolean(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_VOLUME_LEVELER);

                params.remove(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_VOLUME_LEVELER);

            }

            if (params.containsKey(
@@ -1396,12 +1396,14 @@ public final class MediaQualityUtils { 
                params.remove(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_SURROUND_VIRTUALIZER);

            }

            if (params.containsKey(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_DOLBY_ATMOS)) {

            dab.dolbyAtmos =

                    params.getBoolean(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_DOLBY_ATMOS);

                dab.dolbyAtmos = params

                        .getBoolean(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_DOLBY_ATMOS);

                params.remove(SoundQuality.PARAMETER_DOLBY_AUDIO_PROCESSING_DOLBY_ATMOS);

            }

            soundParams.add(SoundParameter.dolbyAudioProcessing(dab));

        }



        if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X)) {

            DtsVirtualX dts = new DtsVirtualX();

            if (params.containsKey(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TBHDX)) {

                dts.tbHdx = params.getBoolean(SoundQuality.PARAMETER_DTS_VIRTUAL_X_TBHDX);
@@ -1436,7 +1438,7 @@ public final class MediaQualityUtils { 
                params.remove(SoundQuality.PARAMETER_DTS_VIRTUAL_X_HEIGHT);

            }

            soundParams.add(SoundParameter.dtsVirtualX(dts));



        }

        return soundParams.toArray(new SoundParameter[0]);

    }