RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cosmetics: Revert old dec_audio.c code uglification 

Revert 3 old code uglification changes that were done with the excuse
of gcc-2.95 support. The last reverted change was a fix to a bug
introduced in the middle change.

Revert "10l, len may change after initialization time"

This reverts commit ae9db277c7.

Revert "fix declaration after statement, take 2"

This reverts commit 4bceedee93.

Revert "fix declaration after statement"

This reverts commit aef0374c1c.
This commit is contained in:
Uoti Urpala 2009-12-28 22:01:00 +02:00
parent 8ee23f418f
commit d7d8babe61
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libmpcodecs/dec_audio.c
View File

@ -352,18 +352,10 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
static int filter_n_bytes(sh_audio_t *sh, int len)
{
int error = 0;
// Filter
af_data_t filter_input = {
.audio = sh->a_buffer,
.rate = sh->samplerate,
.nch = sh->channels,
.format = sh->sample_format
};
af_data_t *filter_output;
assert(len-1 + sh->audio_out_minsize <= sh->a_buffer_size);
int error = 0;
// Decode more bytes if needed
while (sh->a_buffer_len < len) {
unsigned char *buf = sh->a_buffer + sh->a_buffer_len;
@ -378,9 +370,16 @@ static int filter_n_bytes(sh_audio_t *sh, int len)
sh->a_buffer_len += ret;
}
filter_input.len = len;
// Filter
af_data_t filter_input = {
.audio = sh->a_buffer,
.len = len,
.rate = sh->samplerate,
.nch = sh->channels,
.format = sh->sample_format
};
af_fix_parameters(&filter_input);
filter_output = af_play(sh->afilter, &filter_input);
af_data_t *filter_output = af_play(sh->afilter, &filter_input);
if (!filter_output)
return -1;
if (sh->a_out_buffer_size < sh->a_out_buffer_len + filter_output->len) {