evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: Enable Media Format converter for all resampling usecases"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-27 15:49:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit dbcf7687b3
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
View file

@ -121,14 +121,14 @@ static int msm_routing_get_bit_width(unsigned int format)
return bit_width; return bit_width;
} }
static bool msm_is_fractional_resample_needed(int input_sr, int output_sr) static bool msm_is_resample_needed(int input_sr, int output_sr)
{ {
bool rc = false; bool rc = false;
if ((input_sr % output_sr != 0) && (output_sr % input_sr != 0)) if (input_sr != output_sr)
rc = true; rc = true;
pr_debug("performing fractional resample (%s) for copp rate (%d)afe rate (%d)", pr_debug("perform resampling (%s) for copp rate (%d)afe rate (%d)",
(rc ? "oh yes" : "not really"), (rc ? "oh yes" : "not really"),
input_sr, output_sr); input_sr, output_sr);
@ -901,7 +901,7 @@ int msm_pcm_routing_reg_phy_compr_stream(int fe_id, int perf_mode,
set_bit(copp_idx, set_bit(copp_idx,
&session_copp_map[fe_id][session_type][i]); &session_copp_map[fe_id][session_type][i]);
if (msm_is_fractional_resample_needed( if (msm_is_resample_needed(
sample_rate, sample_rate,
msm_bedais[i].sample_rate)) msm_bedais[i].sample_rate))
adm_copp_mfc_cfg( adm_copp_mfc_cfg(
@ -1057,7 +1057,7 @@ int msm_pcm_routing_reg_phy_stream(int fedai_id, int perf_mode,
set_bit(copp_idx, set_bit(copp_idx,
&session_copp_map[fedai_id][session_type][i]); &session_copp_map[fedai_id][session_type][i]);
if (msm_is_fractional_resample_needed( if (msm_is_resample_needed(
sample_rate, sample_rate,
msm_bedais[i].sample_rate)) msm_bedais[i].sample_rate))
adm_copp_mfc_cfg( adm_copp_mfc_cfg(
@ -1284,7 +1284,7 @@ static void msm_pcm_routing_process_audio(u16 reg, u16 val, int set)
set_bit(copp_idx, set_bit(copp_idx,
&session_copp_map[val][session_type][reg]); &session_copp_map[val][session_type][reg]);
if (msm_is_fractional_resample_needed( if (msm_is_resample_needed(
sample_rate, sample_rate,
msm_bedais[reg].sample_rate)) msm_bedais[reg].sample_rate))
adm_copp_mfc_cfg( adm_copp_mfc_cfg(
@ -10381,7 +10381,7 @@ static int msm_pcm_routing_prepare(struct snd_pcm_substream *substream)
set_bit(copp_idx, set_bit(copp_idx,
&session_copp_map[i][session_type][be_id]); &session_copp_map[i][session_type][be_id]);
if (msm_is_fractional_resample_needed( if (msm_is_resample_needed(
sample_rate, sample_rate,
bedai->sample_rate)) bedai->sample_rate))
adm_copp_mfc_cfg( adm_copp_mfc_cfg(

2
sound/soc/msm/qdsp6v2/q6adm.c
View file

@ -2508,8 +2508,6 @@ void adm_copp_mfc_cfg(int port_id, int copp_idx, int dst_sample_rate)
mfc_cfg.sampling_rate = dst_sample_rate; mfc_cfg.sampling_rate = dst_sample_rate;
mfc_cfg.bits_per_sample = mfc_cfg.bits_per_sample =
atomic_read(&this_adm.copp.bit_width[port_idx][copp_idx]); atomic_read(&this_adm.copp.bit_width[port_idx][copp_idx]);
if (24 == mfc_cfg.bits_per_sample)
mfc_cfg.bits_per_sample = 32;
open.dev_num_channel = mfc_cfg.num_channels = open.dev_num_channel = mfc_cfg.num_channels =
atomic_read(&this_adm.copp.channels[port_idx][copp_idx]); atomic_read(&this_adm.copp.channels[port_idx][copp_idx]);