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

Commit bd4ce465 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Fix Glitch issue during concurrent playback"

parents 0ee0d3d8 869ae49f

hal/msm8916/platform.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -6014,7 +6014,11 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
                            bit_width = out->bit_width;

                            bit_width = out->bit_width;

                        if (sample_rate < out->sample_rate)

                        if (sample_rate < out->sample_rate)

                            sample_rate = out->sample_rate;

                            sample_rate = out->sample_rate;

                        if (out->sample_rate < OUTPUT_SAMPLING_RATE_44100)

                        /*

                         * TODO: Add Support for Backend configuration for devices which support

                         * sample rate less than 44.1

                         */

                        if (sample_rate < OUTPUT_SAMPLING_RATE_44100)

                            sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;

                            sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;

                        if (channels < out_channels)

                        if (channels < out_channels)

                            channels = out_channels;

                            channels = out_channels;

hal/msm8974/platform.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -5970,7 +5970,11 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev, 
                            bit_width = out->bit_width;

                            bit_width = out->bit_width;

                        if (sample_rate < out->sample_rate)

                        if (sample_rate < out->sample_rate)

                            sample_rate = out->sample_rate;

                            sample_rate = out->sample_rate;

                        if (out->sample_rate < OUTPUT_SAMPLING_RATE_44100)

                        /*

                         * TODO: Add Support for Backend configuration for devices which support

                         * sample rate less than 44.1

                         */

                        if (sample_rate < OUTPUT_SAMPLING_RATE_44100)

                            sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;

                            sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;

                        if (channels < out_channels)

                        if (channels < out_channels)

                            channels = out_channels;

                            channels = out_channels;