oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mvp: pass audio_format struct to mvp_set_pcm_params()

Browse Source 
Pass a pointer to the audio_format struct instead of 3 separate
integers.
This commit is contained in:
Max Kellermann 2009-02-25 21:51:32 +01:00
parent 57a9e5605b
commit 84ed6d4701
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/output/mvp_plugin.c
View File

@ -119,26 +119,37 @@ mvp_output_finish(void *data)
} }
static int static int
mvp_set_pcm_params(struct mvp_data *md, unsigned long rate, int channels, mvp_set_pcm_params(struct mvp_data *md, struct audio_format *audio_format)
unsigned bits)
{ {
unsigned iloop; unsigned iloop;
unsigned mix[5]; unsigned mix[5];
if (channels == 1) switch (audio_format->channels) {
case 1:
mix[0] = 1; mix[0] = 1;
else if (channels == 2) break;
case 2:
mix[0] = 0; mix[0] = 0;
else break;
default:
return -1; return -1;
}
/* 0,1=24bit(24) , 2,3=16bit */ /* 0,1=24bit(24) , 2,3=16bit */
if (bits == 16) switch (audio_format->bits) {
case 16:
mix[1] = 2; mix[1] = 2;
else if (bits == 24) break;
case 24:
mix[1] = 0; mix[1] = 0;
else break;
default:
return -1; return -1;
}
mix[3] = 0; /* stream type? */ mix[3] = 0; /* stream type? */
mix[4] = G_BYTE_ORDER == G_LITTLE_ENDIAN; mix[4] = G_BYTE_ORDER == G_LITTLE_ENDIAN;
@ -147,15 +158,15 @@ mvp_set_pcm_params(struct mvp_data *md, unsigned long rate, int channels,
* if there is an exact match for the frequency, use it. * if there is an exact match for the frequency, use it.
*/ */
for (iloop = 0; iloop < G_N_ELEMENTS(mvp_sample_rates); iloop++) { for (iloop = 0; iloop < G_N_ELEMENTS(mvp_sample_rates); iloop++) {
if (rate == mvp_sample_rates[iloop][1]) { if (audio_format->sample_rate == mvp_sample_rates[iloop][1]) {
mix[2] = mvp_sample_rates[iloop][0]; mix[2] = mvp_sample_rates[iloop][0];
break; break;
} }
} }
if (iloop >= G_N_ELEMENTS(mvp_sample_rates)) { if (iloop >= G_N_ELEMENTS(mvp_sample_rates)) {
g_warning("Can not find suitable output frequency for %ld\n", g_warning("Can not find suitable output frequency for %u\n",
rate); audio_format->sample_rate);
return -1; return -1;
} }
@ -210,8 +221,7 @@ mvp_output_open(void *data, struct audio_format *audio_format)
strerror(errno)); strerror(errno));
return false; return false;
} }
mvp_set_pcm_params(md, audio_format->sample_rate, mvp_set_pcm_params(md, audio_format);
audio_format->channels, audio_format->bits);
md->audio_format = *audio_format; md->audio_format = *audio_format;
return true; return true;
} }