# HG changeset patch # User alexc # Date 1283212115 0 # Node ID 94b578d0af101ba3294581afddc42a183bb67a91 # Parent a3aca8bcbaf43c81bfe16cdb1db25fcbe4073a79 psymodel: Const correct FFPsyWindowInfo. diff -r a3aca8bcbaf4 -r 94b578d0af10 aacpsy.c --- a/aacpsy.c Mon Aug 30 23:43:03 2010 +0000 +++ b/aacpsy.c Mon Aug 30 23:48:35 2010 +0000 @@ -387,7 +387,7 @@ * Calculate band thresholds as suggested in 3GPP TS26.403 */ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, - const float *coefs, FFPsyWindowInfo *wi) + const float *coefs, const FFPsyWindowInfo *wi) { AacPsyContext *pctx = (AacPsyContext*) ctx->model_priv_data; AacPsyChannel *pch = &pctx->ch[channel]; diff -r a3aca8bcbaf4 -r 94b578d0af10 psymodel.c --- a/psymodel.c Mon Aug 30 23:43:03 2010 +0000 +++ b/psymodel.c Mon Aug 30 23:48:35 2010 +0000 @@ -53,7 +53,7 @@ } void ff_psy_set_band_info(FFPsyContext *ctx, int channel, - const float *coeffs, FFPsyWindowInfo *wi) + const float *coeffs, const FFPsyWindowInfo *wi) { ctx->model->analyze(ctx, channel, coeffs, wi); } diff -r a3aca8bcbaf4 -r 94b578d0af10 psymodel.h --- a/psymodel.h Mon Aug 30 23:43:03 2010 +0000 +++ b/psymodel.h Mon Aug 30 23:48:35 2010 +0000 @@ -72,7 +72,7 @@ const char *name; int (*init) (FFPsyContext *apc); FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); - void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, FFPsyWindowInfo *wi); + void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, const FFPsyWindowInfo *wi); void (*end) (FFPsyContext *apc); } FFPsyModel; @@ -116,7 +116,7 @@ * @param wi window information */ void ff_psy_set_band_info(FFPsyContext *ctx, int channel, const float *coeffs, - FFPsyWindowInfo *wi); + const FFPsyWindowInfo *wi); /** * Cleanup model context at the end.