Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunktags/n0.8
@@ -387,7 +387,7 @@ static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx, | |||||
* Calculate band thresholds as suggested in 3GPP TS26.403 | * Calculate band thresholds as suggested in 3GPP TS26.403 | ||||
*/ | */ | ||||
static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, | 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; | AacPsyContext *pctx = (AacPsyContext*) ctx->model_priv_data; | ||||
AacPsyChannel *pch = &pctx->ch[channel]; | AacPsyChannel *pch = &pctx->ch[channel]; | ||||
@@ -53,7 +53,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, | |||||
} | } | ||||
void ff_psy_set_band_info(FFPsyContext *ctx, int channel, | 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); | ctx->model->analyze(ctx, channel, coeffs, wi); | ||||
} | } | ||||
@@ -72,7 +72,7 @@ typedef struct FFPsyModel { | |||||
const char *name; | const char *name; | ||||
int (*init) (FFPsyContext *apc); | int (*init) (FFPsyContext *apc); | ||||
FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); | 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); | void (*end) (FFPsyContext *apc); | ||||
} FFPsyModel; | } FFPsyModel; | ||||
@@ -116,7 +116,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, | |||||
* @param wi window information | * @param wi window information | ||||
*/ | */ | ||||
void ff_psy_set_band_info(FFPsyContext *ctx, int channel, const float *coeffs, | void ff_psy_set_band_info(FFPsyContext *ctx, int channel, const float *coeffs, | ||||
FFPsyWindowInfo *wi); | |||||
const FFPsyWindowInfo *wi); | |||||
/** | /** | ||||
* Cleanup model context at the end. | * Cleanup model context at the end. | ||||