[FFmpeg-cvslog] r24999 - in trunk/libavcodec: aacpsy.c psymodel.c psymodel.h

[alexc]

Author: alexc
Date: Tue Aug 31 01:48:35 2010
New Revision: 24999

Log:
psymodel: Const correct FFPsyWindowInfo.

Modified:
   trunk/libavcodec/aacpsy.c
   trunk/libavcodec/psymodel.c
   trunk/libavcodec/psymodel.h

Modified: trunk/libavcodec/aacpsy.c
==============================================================================
--- trunk/libavcodec/aacpsy.c	Tue Aug 31 01:43:03 2010	(r24998)
+++ trunk/libavcodec/aacpsy.c	Tue Aug 31 01:48:35 2010	(r24999)
@@ -387,7 +387,7 @@ static FFPsyWindowInfo psy_3gpp_window(F
  * 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];

Modified: trunk/libavcodec/psymodel.c
==============================================================================
--- trunk/libavcodec/psymodel.c	Tue Aug 31 01:43:03 2010	(r24998)
+++ trunk/libavcodec/psymodel.c	Tue Aug 31 01:48:35 2010	(r24999)
@@ -53,7 +53,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FF
 }
 
 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);
 }

Modified: trunk/libavcodec/psymodel.h
==============================================================================
--- trunk/libavcodec/psymodel.h	Tue Aug 31 01:43:03 2010	(r24998)
+++ trunk/libavcodec/psymodel.h	Tue Aug 31 01:48:35 2010	(r24999)
@@ -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(FF
  * @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.