diff options
| -rw-r--r-- | audio/filter/af_pan.c | 207 |
1 files changed, 104 insertions, 103 deletions
diff --git a/audio/filter/af_pan.c b/audio/filter/af_pan.c index 900d10cc74..ad4d31df29 100644 --- a/audio/filter/af_pan.c +++ b/audio/filter/af_pan.c @@ -28,12 +28,11 @@ #include "af.h" // Data for specific instances of this filter -typedef struct af_pan_s -{ - int nch; // Number of output channels; zero means same as input - float level[AF_NCH][AF_NCH]; // Gain level for each channel - char *matrixstr; -}af_pan_t; +typedef struct af_pan_s { + int nch; // Number of output channels; zero means same as input + float level[AF_NCH][AF_NCH]; // Gain level for each channel + char *matrixstr; +} af_pan_t; static void set_channels(struct mp_audio *mpa, int num) { @@ -45,128 +44,130 @@ static void set_channels(struct mp_audio *mpa, int num) } // Initialization and runtime control -static int control(struct af_instance* af, int cmd, void* arg) +static int control(struct af_instance *af, int cmd, void *arg) { - af_pan_t* s = af->priv; - - switch(cmd){ - case AF_CONTROL_REINIT: - // Sanity check - if(!arg) return AF_ERROR; - - af->data->rate = ((struct mp_audio*)arg)->rate; - mp_audio_set_format(af->data, AF_FORMAT_FLOAT); - set_channels(af->data, s->nch ? s->nch: ((struct mp_audio*)arg)->nch); - - if((af->data->format != ((struct mp_audio*)arg)->format) || - (af->data->bps != ((struct mp_audio*)arg)->bps)){ - mp_audio_set_format((struct mp_audio*)arg, af->data->format); - return AF_FALSE; + af_pan_t* s = af->priv; + + switch(cmd){ + case AF_CONTROL_REINIT: + // Sanity check + if (!arg) + return AF_ERROR; + + af->data->rate = ((struct mp_audio*)arg)->rate; + mp_audio_set_format(af->data, AF_FORMAT_FLOAT); + set_channels(af->data, s->nch ? s->nch : ((struct mp_audio*)arg)->nch); + + if ((af->data->format != ((struct mp_audio*)arg)->format) || + (af->data->bps != ((struct mp_audio*)arg)->bps)) { + mp_audio_set_format((struct mp_audio*)arg, af->data->format); + return AF_FALSE; + } + return AF_OK; + case AF_CONTROL_SET_PAN_LEVEL: { + int i; + int ch = ((af_control_ext_t*)arg)->ch; + float *level = ((af_control_ext_t*)arg)->arg; + if (ch >= AF_NCH) + return AF_FALSE; + for (i = 0; i < AF_NCH; i++) + s->level[ch][i] = level[i]; + return AF_OK; } - return AF_OK; - case AF_CONTROL_SET_PAN_LEVEL:{ - int i; - int ch = ((af_control_ext_t*)arg)->ch; - float* level = ((af_control_ext_t*)arg)->arg; - if (ch >= AF_NCH) - return AF_FALSE; - for(i=0;i<AF_NCH;i++) - s->level[ch][i] = level[i]; - return AF_OK; - } - case AF_CONTROL_SET_PAN_NOUT: - // Reinit must be called after this function has been called - - // Sanity check - if(((int*)arg)[0] <= 0 || ((int*)arg)[0] > AF_NCH){ - MP_ERR(af, "The number of output channels must be" - " between 1 and %i. Current value is %i\n",AF_NCH,((int*)arg)[0]); - return AF_ERROR; + case AF_CONTROL_SET_PAN_NOUT: + // Reinit must be called after this function has been called + // Sanity check + if (((int*)arg)[0] <= 0 || ((int*)arg)[0] > AF_NCH) { + MP_ERR(af, "The number of output channels must be" + " between 1 and %i. Current value is %i\n", + AF_NCH, ((int*)arg)[0]); + return AF_ERROR; + } + s->nch = ((int*)arg)[0]; + return AF_OK; + case AF_CONTROL_SET_PAN_BALANCE: { + float val = *(float*)arg; + if (s->nch) + return AF_ERROR; + if (af->data->nch >= 2) { + s->level[0][0] = MPMIN(1.f, 1.f - val); + s->level[0][1] = MPMAX(0.f, val); + s->level[1][0] = MPMAX(0.f, -val); + s->level[1][1] = MPMIN(1.f, 1.f + val); + } + return AF_OK; } - s->nch=((int*)arg)[0]; - return AF_OK; - case AF_CONTROL_SET_PAN_BALANCE:{ - float val = *(float*)arg; - if (s->nch) - return AF_ERROR; - if (af->data->nch >= 2) { - s->level[0][0] = MPMIN(1.f, 1.f - val); - s->level[0][1] = MPMAX(0.f, val); - s->level[1][0] = MPMAX(0.f, -val); - s->level[1][1] = MPMIN(1.f, 1.f + val); + case AF_CONTROL_GET_PAN_BALANCE: + if (s->nch) + return AF_ERROR; + *(float*)arg = s->level[0][1] - s->level[1][0]; + return AF_OK; } - return AF_OK; - } - case AF_CONTROL_GET_PAN_BALANCE: - if (s->nch) - return AF_ERROR; - *(float*)arg = s->level[0][1] - s->level[1][0]; - return AF_OK; - } - return AF_UNKNOWN; + return AF_UNKNOWN; } static int filter_frame(struct af_instance *af, struct mp_audio *c) { - if (!c) - return 0; - struct mp_audio *l = mp_audio_pool_get(af->out_pool, &af->fmt_out, c->samples); - if (!l) { - talloc_free(c); - return -1; - } - mp_audio_copy_attributes(l, c); - - af_pan_t* s = af->priv; // Setup for this instance - float* in = c->planes[0]; // Input audio data - float* out = NULL; // Output audio data - float* end = in+c->samples*c->nch; // End of loop - int nchi = c->nch; // Number of input channels - int ncho = l->nch; // Number of output channels - register int j,k; - - out = l->planes[0]; - // Execute panning - // FIXME: Too slow - while(in < end){ - for(j=0;j<ncho;j++){ - register float x = 0.0; - register float* tin = in; - for(k=0;k<nchi;k++) - x += tin[k] * s->level[j][k]; - out[j] = x; + if (!c) + return 0; + struct mp_audio *l = mp_audio_pool_get(af->out_pool, &af->fmt_out, c->samples); + if (!l) { + talloc_free(c); + return -1; + } + mp_audio_copy_attributes(l, c); + + af_pan_t* s = af->priv; // Setup for this instance + float *in = c->planes[0]; // Input audio data + float *out = NULL; // Output audio data + float *end = in+c->samples * c->nch; // End of loop + int nchi = c->nch; // Number of input channels + int ncho = l->nch; // Number of output channels + register int j, k; + + out = l->planes[0]; + // Execute panning + // FIXME: Too slow + while (in < end) { + for (j = 0; j < ncho; j++) { + register float x = 0.0; + register float *tin = in; + for (k = 0; k < nchi; k++) + x += tin[k] * s->level[j][k]; + out[j] = x; + } + out += ncho; + in += nchi; } - out+= ncho; - in+= nchi; - } - talloc_free(c); - af_add_output_frame(af, l); - return 0; + talloc_free(c); + af_add_output_frame(af, l); + return 0; } // Allocate memory and set function pointers -static int af_open(struct af_instance* af){ - af->control=control; +static int af_open(struct af_instance *af) +{ + af->control = control; af->filter_frame = filter_frame; af_pan_t *s = af->priv; - int n = 0; - int j,k; + int n = 0; + int j, k; int nch = s->nch; - if(nch && AF_OK != control(af,AF_CONTROL_SET_PAN_NOUT, &nch)) + if (nch && AF_OK != control(af, AF_CONTROL_SET_PAN_NOUT, &nch)) return AF_ERROR; // Read pan values char *cp = s->matrixstr; j = 0; k = 0; - while(cp && k < AF_NCH){ + while (cp && k < AF_NCH) { sscanf(cp, "%f%n" , &s->level[j][k], &n); MP_VERBOSE(af, "Pan level from channel %i to" - " channel %i = %f\n",k,j,s->level[j][k]); - cp =&cp[n]; + " channel %i = %f\n", k, j, s->level[j][k]); + cp = &cp[n]; j++; - if(j>=nch){ + if (j >= nch) { j = 0; k++; } |