aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Caldwell <saintdev@gmail.com>2011-04-05 01:05:22 -0600
committerJanne Grunau <janne-libav@jannau.net>2011-04-05 22:21:04 +0200
commit5371803dd5d9f7bbc62d68274084d25f10a8dc61 (patch)
tree1ad14c3314e57bcfa4a0fb7ab8927aa29c6a6782
parent668438a31ef654a2836992879f9bcd23f4d3421e (diff)
downloadffmpeg-5371803dd5d9f7bbc62d68274084d25f10a8dc61.tar.gz
psymodel: extend API to include PE and bit allocation.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
-rw-r--r--libavcodec/psymodel.h9
1 files changed, 9 insertions, 0 deletions
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;