diff options
author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/filter/af_equalizer.c | |
parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/filter/af_equalizer.c')
-rw-r--r-- | audio/filter/af_equalizer.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/audio/filter/af_equalizer.c b/audio/filter/af_equalizer.c index c488ffaeaf..6441b9b116 100644 --- a/audio/filter/af_equalizer.c +++ b/audio/filter/af_equalizer.c @@ -96,10 +96,8 @@ static int control(struct af_instance* af, int cmd, void* arg) // Sanity check if(!arg) return AF_ERROR; - af->data->rate = ((struct mp_audio*)arg)->rate; - af->data->nch = ((struct mp_audio*)arg)->nch; - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; + mp_audio_copy_config(af->data, (struct mp_audio*)arg); + mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE); // Calculate number of active filters s->K=KM; @@ -150,30 +148,6 @@ static int control(struct af_instance* af, int cmd, void* arg) } return AF_OK; } - case AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_SET:{ - float* gain = ((af_control_ext_t*)arg)->arg; - int ch = ((af_control_ext_t*)arg)->ch; - int k; - if(ch >= AF_NCH || ch < 0) - return AF_ERROR; - - for(k = 0 ; k<KM ; k++) - s->g[ch][k] = pow(10.0,clamp(gain[k],G_MIN,G_MAX)/20.0)-1.0; - - return AF_OK; - } - case AF_CONTROL_EQUALIZER_GAIN | AF_CONTROL_GET:{ - float* gain = ((af_control_ext_t*)arg)->arg; - int ch = ((af_control_ext_t*)arg)->ch; - int k; - if(ch >= AF_NCH || ch < 0) - return AF_ERROR; - - for(k = 0 ; k<KM ; k++) - gain[k] = log10(s->g[ch][k]+1.0) * 20.0; - - return AF_OK; - } } return AF_UNKNOWN; } |