RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
Code Issues Releases Wiki Activity

actually output 2 channel audio (instead of 6 channel with 4 empty channels)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15385 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-05-09 19:46:49 +00:00
parent 5bf0f176bb
commit 313cc2c955
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libaf/af_hrtf.c
View File

@ -267,6 +267,7 @@ inline void update_ch(af_hrtf_t *s, short *in, const int k)
static int control(struct af_instance_s *af, int cmd, void* arg)
{
af_hrtf_t *s = af->setup;
int test_output_res;
char mode;
switch(cmd) {
@ -281,8 +282,6 @@ static int control(struct af_instance_s *af, int cmd, void* arg)
return AF_ERROR;
}
af->data->nch = ((af_data_t*)arg)->nch;
if(af->data->nch < 5) {
af->data->nch = 5;
if(af->data->nch == 2) {
/* 2 channel input */
if(s->decode_mode != HRTF_MIX_MATRIX2CH) {
@ -290,11 +289,17 @@ static int control(struct af_instance_s *af, int cmd, void* arg)
s->decode_mode = HRTF_MIX_STEREO;
}
}
}
else if (af->data->nch < 5)
af->data->nch = 5;
af->data->format = AF_FORMAT_S16_NE;
af->data->bps = 2;
test_output_res = af_test_output(af, (af_data_t*)arg);
af->mul.n = 2;
af->mul.d = af->data->nch;
// after testing input set the real output format
af->data->nch = 2;
s->print_flag = 1;
return af_test_output(af, (af_data_t*)arg);
return test_output_res;
case AF_CONTROL_COMMAND_LINE:
sscanf((char*)arg, "%c", &mode);
switch(mode) {
@ -516,9 +521,9 @@ static af_data_t* play(struct af_instance_s *af, af_data_t *data)
left += (1 - BASSCROSS) * left_b + BASSCROSS * right_b;
right += (1 - BASSCROSS) * right_b + BASSCROSS * left_b;
/* Also mix the LFE channel (if available) */
if(af->data->nch >= 6) {
left += out[5] * M3_01DB;
right += out[5] * M3_01DB;
if(data->nch >= 6) {
left += in[5] * M3_01DB;
right += in[5] * M3_01DB;
}
/* Amplitude renormalization. */
@ -545,11 +550,6 @@ static af_data_t* play(struct af_instance_s *af, af_data_t *data)
break;
}
/* The remaining channels are not needed any more */
out[2] = out[3] = out[4] = 0;
if(af->data->nch >= 6)
out[5] = 0;
/* Next sample... */
in = &in[data->nch];
out = &out[af->data->nch];
@ -561,7 +561,7 @@ static af_data_t* play(struct af_instance_s *af, af_data_t *data)
/* Set output data */
data->audio = af->data->audio;
data->len = (data->len * af->mul.n) / af->mul.d;
data->nch = af->data->nch;
data->nch = 2;
return data;
}