From 0e107f7890338aad1190f23997562a6de3ca29e9 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Mon, 30 Aug 2010 23:48:35 +0000 Subject: [PATCH] psymodel: Const correct FFPsyWindowInfo. Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aacpsy.c | 2 +- libavcodec/psymodel.c | 2 +- libavcodec/psymodel.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index bcdbbd6..b1bfc7b 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -387,7 +387,7 @@ static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, * 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 --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index a85c29b..a2e469c 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -53,7 +53,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, } 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 --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index bc19d49..fc2f6d9 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -72,7 +72,7 @@ typedef struct FFPsyModel { 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 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, * @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. -- 2.7.4