From 5371803dd5d9f7bbc62d68274084d25f10a8dc61 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Tue, 5 Apr 2011 01:05:22 -0600 Subject: [PATCH] psymodel: extend API to include PE and bit allocation. Signed-off-by: Janne Grunau --- libavcodec/psymodel.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 296d1ab9e9..91eb9aeab9 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -26,6 +26,8 @@ /** maximum possible number of bands */ #define PSY_MAX_BANDS 128 +/** maximum number of channels */ +#define PSY_MAX_CHANS 20 /** * single band psychoacoustic information @@ -62,6 +64,13 @@ typedef struct FFPsyContext { int *num_bands; ///< number of scalefactor bands for possible frame sizes int num_lens; ///< number of scalefactor band sets + float pe[PSY_MAX_CHANS]; ///< total PE for each channel in the frame + + struct { + int size; ///< size of the bitresevoir in bits + int bits; ///< number of bits used in the bitresevoir + } bitres; + void* model_priv_data; ///< psychoacoustic model implementation private data } FFPsyContext;